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

sorry, removing /usr/include breaks the macros we use to detect -lGL and co.

Browse Source 
They'll need to be fixed first if this really is the right fix.  (and I'm not
sure what the original problem was, so...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2002-09-03 04:43:37 +00:00
parent 0c0cee1ed3
commit a85030bd90
2 changed files with 475 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

928
configure vendored
View File

File diff suppressed because it is too large Load Diff

9
configure.in
View File

@@ -1495,7 +1495,11 @@ 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/gcc because standard headers are included instead
dnl of the gcc ones. dnl of the gcc ones. (recorrection.. sadly much depends on this since it was
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!
@@ -1562,7 +1566,8 @@ 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` "