Do a configure test whether or not to include -I/usr/local/include in

        wx-config --c*flags instead of never doing it for gcc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index b602ea4417c2cd3de1de38b6439e01ce38ef9353..7082f352a66dca92d99fe795e7be93e0228fc188 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1347,6 +1347,18 @@ AC_PROG_CXX
 
 AC_LANG_RESTORE
 
 
 AC_LANG_RESTORE
 

+dnl check if compiler includes /usr/local/include in
+dnl default include files search path.
+AC_MSG_CHECKING([for /usr/local/include in default include path])
+GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
+if test "$GCC" = "yes" ; then
+  echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
+       sed -n '1,/End of search list\./p' | \
+        grep '^ */usr/local/include$' 2>&1 /dev/null \
+  && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
+fi
+AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
+

 dnl ranlib command
 dnl   defines RANLIB with the appropriate command
 AC_PROG_RANLIB
 dnl ranlib command
 dnl   defines RANLIB with the appropriate command
 AC_PROG_RANLIB


@@ -6021,6 +6033,7 @@ AC_SUBST(MACRESWXCONFIG)
 
 dnl other tools
 AC_SUBST(GCC)
 
 dnl other tools
 AC_SUBST(GCC)

+AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)

 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)
 AC_SUBST(DLLTOOL)
 AC_SUBST(AS)
 AC_SUBST(NM)

diff --git a/wx-config.in b/wx-config.in
index 5416e5f4196e21d19fe9f4cd93499a734698a1e6..04b677a1937777802dd67c655b85bc88ad88095c 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -29,6 +29,7 @@ update_prefixes
 
 CC="@CC@"
 GCC="@GCC@"
 
 CC="@CC@"
 GCC="@GCC@"

+GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@"

 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir="@top_srcdir@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir="@top_srcdir@"


@@ -205,10 +206,13 @@ cppflags()
     # the ANSI-fied versions of them in its private directory which is searched
     # after all the directories on the cmd line.
     #
     # the ANSI-fied versions of them in its private directory which is searched
     # after all the directories on the cmd line.
     #

-    # the situation is a bit more complicated with -I/usr/local/include: again,
-    # it shouldn't be specified with gcc which looks there by default anyhow
-    # and gives warnings (at least 3.1 does) if it is specified explicitly --
-    # but this -I switch *is* needed for the other compilers
+    # the situation is a bit more complicated with -I/usr/local/include:
+    # it shouldn't be specified with some gcc installations which look there
+    # by default anyhow and give warnings (at least 3.1 does) if it is
+    # specified explicitly --
+    # but this -I switch *is* needed for other gcc installation and for
+    # the other compilers.
+    # So I put a suitable test into configure.in and reuse the result here.

     #
     # note that we assume that if we use GNU cc we also use GNU c++ and vice
     # versa, i.e. this won't work (either for --cflags or --cxxflags) if GNU C
     #
     # note that we assume that if we use GNU cc we also use GNU c++ and vice
     # versa, i.e. this won't work (either for --cflags or --cxxflags) if GNU C


@@ -216,7 +220,7 @@ cppflags()
     # this when/if anybody complains about it
     if test "${includedir}" != "/usr/include" \
             -a "${includedir}" != "/usr/include/c++" \
     # this when/if anybody complains about it
     if test "${includedir}" != "/usr/include" \
             -a "${includedir}" != "/usr/include/c++" \

-            -a \( "${GCC}" != "yes" \
+            -a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \

                   -o "${includedir}" != "/usr/local/include" \) \
             -a \( "${cross_compiling}" != "yes" \
                   -o "${includedir}" != "/usr/${target}/include" \) ;
                   -o "${includedir}" != "/usr/local/include" \) \
             -a \( "${cross_compiling}" != "yes" \
                   -o "${includedir}" != "/usr/${target}/include" \) ;