fix for SEARCH_LIB so libs can still be found in the non-lib64 locations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-02-04 20:04:15 +00:00
parent 2ece66cf55
commit 5a60a58a73
2 changed files with 8 additions and 9 deletions

10
configure vendored
View File

@ -10782,6 +10782,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@ -10795,8 +10796,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_declaration
#include <stdlib.h>
$ac_declaration
int
main ()
{
@ -11422,6 +11423,7 @@ else
fi
for ac_declaration in \
''\
'#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@ -11435,8 +11437,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_declaration
#include <stdlib.h>
$ac_declaration
int
main ()
{
@ -18039,8 +18041,7 @@ SEARCH_INCLUDE="\
\
/usr/openwin/share/include"
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " \
/usr/lib64 /usr/X11R6/lib64
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64"
cat >confcache <<\_ACEOF
@ -36535,7 +36536,6 @@ EOF
COND_WXUSE_ZLIB_BUILTIN=""
fi
USE_ZLIB_BUILTIN)

View File

@ -1812,8 +1812,7 @@ SEARCH_INCLUDE="\
/usr/openwin/share/include"
dnl add 64 bit versions for Linux on AMD (this is not perfect but well...)
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " \
/usr/lib64 /usr/X11R6/lib64
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64"
dnl ------------------------------------------------------------------------
dnl Check for libraries