[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kde-common/admin
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-06-12 19:22:15
Message-ID: 20110612192215.DD1DAAC7BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1236345 by tpearson:

Fix KDE_CHECK_HEADER in the Autotools admin/ directory


 M  +7 -2      acinclude.m4.in  


--- branches/trinity/kde-common/admin/acinclude.m4.in #1236344:1236345
@@ -2364,6 +2364,11 @@
 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_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 @@
    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
[prev in list] [next in list] [prev in thread] [next in thread]