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

diff --git a/configure b/configure
index 1191289a8b6a9e88f9f2fec53ffa9b4f31b98ef4..f071f2c2a825520601ffa594891d0dfca7d2d3ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -10781,7 +10781,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
   echo "$as_me:$LINENO: \$? = $ac_status" >&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 ();' \
    '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.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -11421,7 +11422,8 @@ else
   fi
 fi
 for ac_declaration in \
   fi
 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 ();' \
    '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.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-$ac_declaration

 #include <stdlib.h>
 #include <stdlib.h>

+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {


@@ -18039,8 +18041,7 @@ SEARCH_INCLUDE="\
                               \
     /usr/openwin/share/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
 
 
 cat >confcache <<\_ACEOF


@@ -36535,7 +36536,6 @@ EOF
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 

-USE_ZLIB_BUILTIN)

 
 
 
 
 
 

diff --git a/configure.in b/configure.in
index 23132b77a97f5a8c4d920cde1c06fbb080f47221..560b2679781b33e4fb1e4d8972af1ec3285da487 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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...)
     /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
 
 dnl ------------------------------------------------------------------------
 dnl Check for libraries