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

search for X11 headers in paths under /usr/local before those under /usr (#9477)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-13 22:19:24 +00:00
parent e81695562e
commit 94ac42a3e1
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 53897 2008-06-01 13:15:22Z VZ . # From configure.in Id: configure.in 53975 2008-06-04 10:52:33Z SN .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8.
# #
@@ -24127,6 +24127,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SEARCH_INCLUDE="\ SEARCH_INCLUDE="\
/usr/local/include \ /usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
/usr/local/X11R6/include \
/usr/local/include/X11R6 \
\ \
/usr/Motif-2.1/include \ /usr/Motif-2.1/include \
/usr/Motif-1.2/include \ /usr/Motif-1.2/include \
@@ -24139,29 +24143,25 @@ SEARCH_INCLUDE="\
\ \
/usr/X11R6/include \ /usr/X11R6/include \
/usr/X11R6.4/include \ /usr/X11R6.4/include \
/usr/X11R5/include \
/usr/X11R4/include \
\ \
/usr/include/X11R6 \ /usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
\
/usr/local/X11R6/include \
/usr/local/X11R5/include \
/usr/local/X11R4/include \
\
/usr/local/include/X11R6 \
/usr/local/include/X11R5 \
/usr/local/include/X11R4 \
\ \
/usr/X11/include \ /usr/X11/include \
/usr/include/X11 \ /usr/include/X11 \
/usr/local/X11/include \
/usr/local/include/X11 \
\ \
/usr/XFree86/include/X11 \ /usr/XFree86/include/X11 \
/usr/pkg/include \ /usr/pkg/include \
\ \
/usr/local/X1R5/include \
/usr/local/include/X11R5 \
/usr/X11R5/include \
/usr/include/X11R5 \
\
/usr/local/X11R4/include \
/usr/local/include/X11R4 \
/usr/X11R4/include \
/usr/include/X11R4 \
\
/usr/openwin/share/include" /usr/openwin/share/include"
echo "$as_me:$LINENO: checking for libraries directory" >&5 echo "$as_me:$LINENO: checking for libraries directory" >&5

28
configure.in
View File

@@ -2561,6 +2561,10 @@ dnl In the same vein. Motif 2.1 should be tried before Motif 1.2 for the
dnl systems which have both (AIX 4.x does) dnl systems which have both (AIX 4.x does)
SEARCH_INCLUDE="\ SEARCH_INCLUDE="\
/usr/local/include \ /usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
/usr/local/X11R6/include \
/usr/local/include/X11R6 \
\ \
/usr/Motif-2.1/include \ /usr/Motif-2.1/include \
/usr/Motif-1.2/include \ /usr/Motif-1.2/include \
@@ -2573,29 +2577,25 @@ SEARCH_INCLUDE="\
\ \
/usr/X11R6/include \ /usr/X11R6/include \
/usr/X11R6.4/include \ /usr/X11R6.4/include \
/usr/X11R5/include \
/usr/X11R4/include \
\ \
/usr/include/X11R6 \ /usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
\
/usr/local/X11R6/include \
/usr/local/X11R5/include \
/usr/local/X11R4/include \
\
/usr/local/include/X11R6 \
/usr/local/include/X11R5 \
/usr/local/include/X11R4 \
\ \
/usr/X11/include \ /usr/X11/include \
/usr/include/X11 \ /usr/include/X11 \
/usr/local/X11/include \
/usr/local/include/X11 \
\ \
/usr/XFree86/include/X11 \ /usr/XFree86/include/X11 \
/usr/pkg/include \ /usr/pkg/include \
\ \
/usr/local/X1R5/include \
/usr/local/include/X11R5 \
/usr/X11R5/include \
/usr/include/X11R5 \
\
/usr/local/X11R4/include \
/usr/local/include/X11R4 \
/usr/X11R4/include \
/usr/include/X11R4 \
\
/usr/openwin/share/include" /usr/openwin/share/include"
dnl try to find out the standard lib locations for the systems with multiple dnl try to find out the standard lib locations for the systems with multiple