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

reremoved /usr/include from SEARCH_INCLUDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-17 15:20:08 +00:00
parent bf99a7849d
commit c4c97ccbd6
2 changed files with 442 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

866
configure vendored
View File

File diff suppressed because it is too large Load Diff

19
configure.in
View File

@@ -1501,13 +1501,9 @@ dnl Define search path for includes and libraries: all headers and libs will be
dnl looked for in all directories of this path dnl looked for in all directories of this path
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl notice that /usr/include should not be in this list, otherwise it breaks dnl Notice that /usr/include should *not* be in this list, otherwise it breaks
dnl compilation on Solaris/gcc because standard headers are included instead dnl compilation on Solaris/AIX/... with gcc because standard (non ANSI C)
dnl of the gcc ones. (recorrection.. sadly much depends on this since it was dnl headers are included instead of the "fixed" (ANSI-fied) gcc ones.
dnl first created and then 'corrected'.. removing /usr/include means system
dnl GL and Xpm libs will dnl not be found on linux and probably other platforms
dnl now. We need to correct that first before removing /usr/include again.
dnl see the various (ab)uses of WX_PATH_FIND_LIBRARIES below )
dnl dnl
dnl Also try to put all directories which may contain X11R6 before those which dnl Also try to put all directories which may contain X11R6 before those which
dnl may contain X11R5/4 - we want to use R6 on machines which have both! dnl may contain X11R5/4 - we want to use R6 on machines which have both!
@@ -1574,8 +1570,7 @@ SEARCH_INCLUDE="\
/usr/local/x11r5/include \ /usr/local/x11r5/include \
/usr/lpp/Xamples/include \ /usr/lpp/Xamples/include \
\ \
/usr/openwin/share/include \ /usr/openwin/share/include"
/usr/include"
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
@@ -2233,8 +2228,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
fi fi
GUI_TK_LIBRARY="$X_LIBS" dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to
TOOLKIT_INCLUDE="$X_CFLAGS" dnl X_LIBS and X_CFLAGS respectively -- what for??
GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
AFMINSTALL=afminstall AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0 COMPILED_X_PROGRAM=0