Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Stefan Neis
2004-02-15 14:14:03 +00:00
parent a36036203f
commit 31414f4c19
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.in
View File

@@ -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 ranlib command
dnl defines RANLIB with the appropriate command dnl defines RANLIB with the appropriate command
AC_PROG_RANLIB AC_PROG_RANLIB
@@ -6021,6 +6033,7 @@ AC_SUBST(MACRESWXCONFIG)
dnl other tools dnl other tools
AC_SUBST(GCC) AC_SUBST(GCC)
AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
AC_SUBST(DLLTOOL) AC_SUBST(DLLTOOL)
AC_SUBST(AS) AC_SUBST(AS)
AC_SUBST(NM) AC_SUBST(NM)

14
wx-config.in
View File

@@ -29,6 +29,7 @@ update_prefixes
CC="@CC@" CC="@CC@"
GCC="@GCC@" GCC="@GCC@"
GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@"
CXX="@CXX@" CXX="@CXX@"
LD="@SHARED_LD@" LD="@SHARED_LD@"
srcdir="@top_srcdir@" srcdir="@top_srcdir@"
@@ -205,10 +206,13 @@ cppflags()
# the ANSI-fied versions of them in its private directory which is searched # the ANSI-fied versions of them in its private directory which is searched
# after all the directories on the cmd line. # after all the directories on the cmd line.
# #
# the situation is a bit more complicated with -I/usr/local/include: again, # the situation is a bit more complicated with -I/usr/local/include:
# it shouldn't be specified with gcc which looks there by default anyhow # it shouldn't be specified with some gcc installations which look there
# and gives warnings (at least 3.1 does) if it is specified explicitly -- # by default anyhow and give warnings (at least 3.1 does) if it is
# but this -I switch *is* needed for the other compilers # 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 # 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 # 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 # this when/if anybody complains about it
if test "${includedir}" != "/usr/include" \ if test "${includedir}" != "/usr/include" \
-a "${includedir}" != "/usr/include/c++" \ -a "${includedir}" != "/usr/include/c++" \
-a \( "${GCC}" != "yes" \ -a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \
-o "${includedir}" != "/usr/local/include" \) \ -o "${includedir}" != "/usr/local/include" \) \
-a \( "${cross_compiling}" != "yes" \ -a \( "${cross_compiling}" != "yes" \
-o "${includedir}" != "/usr/${target}/include" \) ; -o "${includedir}" != "/usr/${target}/include" \) ;