diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-30 01:15:04 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-30 01:15:04 +0000 |
| commit | 538030e8fd3b58297a5d26d394033d079716a7de (patch) | |
| tree | 6deaddb233cee3638d3d44eab9da1752fa0dfdaf | |
| parent | 827b76f93f8deacb1268167a870e0b7dab93068a (diff) | |
| download | other-538030e8fd3b58297a5d26d394033d079716a7de.tar.gz other-538030e8fd3b58297a5d26d394033d079716a7de.zip | |
Fix admin-based Autotools configure check failures
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1234189 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | admin/acinclude.m4.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index aee3f3d..b35aaea 100644 --- a/admin/acinclude.m4.in +++ b/admin/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, |