summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-30 01:15:04 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-30 01:15:04 +0000
commit2317e04c9584f708997780f4c2b1c5457bb8073d (patch)
tree678e01b341148e1c78564dd348f9891cf42dfb10
parent11c1b82dcfe6668448c10bc790a325e968f9e110 (diff)
downloadadmin-2317e04c9584f708997780f4c2b1c5457bb8073d.tar.gz
admin-2317e04c9584f708997780f4c2b1c5457bb8073d.zip
Fix admin-based Autotools configure check failures
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1234189 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--acinclude.m4.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index aee3f3d..b35aaea 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -4956,7 +4956,11 @@ AC_DEFUN([KDE_CHECK_STL],
AC_LANG_CPLUSPLUS
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ if test -z "$PKG_CONFIG"; then
+ CXXFLAGS="$CXXFLAGS"
+ else
+ CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ fi
AC_MSG_CHECKING([if C++ programs can be compiled])
AC_CACHE_VAL(kde_cv_stl_works,