summaryrefslogtreecommitdiffstats
path: root/admin/acinclude.m4.in
diff options
context:
space:
mode:
Diffstat (limited to 'admin/acinclude.m4.in')
-rw-r--r--admin/acinclude.m4.in9
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