diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 19:22:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 19:22:15 +0000 |
| commit | 1a728579ee726fe5a6b509929534baf672d211fb (patch) | |
| tree | 04e980290c51528a83982f02836ff67e59381d26 | |
| parent | 63a69990d35dadbc6c071e898c91ab243cfee680 (diff) | |
| download | other-1a728579ee726fe5a6b509929534baf672d211fb.tar.gz other-1a728579ee726fe5a6b509929534baf672d211fb.zip | |
Fix KDE_CHECK_HEADER in the Autotools admin/ directory
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1236345 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | admin/acinclude.m4.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in index f0bdaa0..51eb845 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -2364,6 +2364,11 @@ LIBS="$LIBS $X_EXTRA_LIBS" if test "$GXX" = "yes"; then CXXFLAGS="$CXXFLAGS -pedantic-errors" fi +if test -z "$qt_includes"; then + CXXFLAGS="$CXXFLAGS" +else + CXXFLAGS="$CXXFLAGS -I$qt_includes" +fi AC_TRY_COMPILE([ $2 ], @@ -5298,7 +5303,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX AC_DEFUN([KDE_CHECK_HEADER], [ kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes -I/usr/include/tqt" + CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/kde -I/usr/include/tqt" AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_CHECK_HEADER([$1], [$2], [$3], [$4]) @@ -5311,7 +5316,7 @@ AC_DEFUN([KDE_CHECK_HEADERS], AH_CHECK_HEADERS([$1]) AC_LANG_SAVE kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes -I/usr/include/tqt" + CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/kde -I/usr/include/tqt" AC_LANG_CPLUSPLUS AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) CPPFLAGS=$kde_safe_cppflags |