search for X11 headers in paths under /usr/local before those under /usr (#9477)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6f292345cf
commit
235cdc6dd7
30
configure
vendored
30
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 54169 2008-06-12 18:43:41Z VZ .
|
||||
# From configure.in Id: configure.in 54171 2008-06-12 18:51:50Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -25242,6 +25242,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
SEARCH_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-1.2/include \
|
||||
@ -25254,29 +25258,25 @@ SEARCH_INCLUDE="\
|
||||
\
|
||||
/usr/X11R6/include \
|
||||
/usr/X11R6.4/include \
|
||||
/usr/X11R5/include \
|
||||
/usr/X11R4/include \
|
||||
\
|
||||
/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/include/X11 \
|
||||
/usr/local/X11/include \
|
||||
/usr/local/include/X11 \
|
||||
\
|
||||
/usr/XFree86/include/X11 \
|
||||
/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"
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for libraries directory" >&5
|
||||
|
28
configure.in
28
configure.in
@ -2022,6 +2022,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)
|
||||
SEARCH_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-1.2/include \
|
||||
@ -2034,29 +2038,25 @@ SEARCH_INCLUDE="\
|
||||
\
|
||||
/usr/X11R6/include \
|
||||
/usr/X11R6.4/include \
|
||||
/usr/X11R5/include \
|
||||
/usr/X11R4/include \
|
||||
\
|
||||
/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/include/X11 \
|
||||
/usr/local/X11/include \
|
||||
/usr/local/include/X11 \
|
||||
\
|
||||
/usr/XFree86/include/X11 \
|
||||
/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"
|
||||
|
||||
dnl try to find out the standard lib locations for the systems with multiple
|
||||
|
Loading…
Reference in New Issue
Block a user