Use lib64 for 64-bit builds on some kinds of linux and lib/64 on solaris

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 82dd3cb4d0fc295e983b0be6e7f120effd0a8b8d..d2ba94165642dd1afb404e2fab5a137578b6a7a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2126,9 +2126,11 @@ SEARCH_INCLUDE="\
 
 dnl try to find out the standard lib locations for the systems with multiple
 dnl ABIs
 
 dnl try to find out the standard lib locations for the systems with multiple
 dnl ABIs

+AC_MSG_CHECKING([for libraries directory])
+

 case "${host}" in
 case "${host}" in

-    *-*-linux* | *-*-irix6* | *-*-solaris2* )
-        AC_CACHE_CHECK([for libraries directory],
+    *-*-irix6* )
+        AC_CACHE_VAL(

             wx_cv_std_libpath,
             [
                 for d in WX_STD_LIBPATH(); do
             wx_cv_std_libpath,
             [
                 for d in WX_STD_LIBPATH(); do


@@ -2153,12 +2155,33 @@ case "${host}" in
         )
         ;;
 
         )
         ;;
 

+    *-*-solaris2* )
+        dnl use ../lib or ../lib/64 depending on the size of void*
+        if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
+            wx_cv_std_libpath="lib/64"
+        else
+            wx_cv_std_libpath="lib"
+        fi
+        ;;
+
+    *-*-linux* )
+        dnl use ../lib or ../lib64 depending on the size of void*
+        if test "$ac_cv_sizeof_void_p" = 8 -a \
+                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+            wx_cv_std_libpath="lib64"
+        else
+            wx_cv_std_libpath="lib"
+        fi
+        ;;
+

     *)
         wx_cv_std_libpath="lib";
         ;;
 esac
 
     *)
         wx_cv_std_libpath="lib";
         ;;
 esac
 

-SEARCH_LIB=`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g`
+AC_MSG_RESULT($wx_cv_std_libpath)
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"

 
 dnl Cross compiling with gcc?
 if test "$build" != "$host" -a "$GCC" = yes; then
 
 dnl Cross compiling with gcc?
 if test "$build" != "$host" -a "$GCC" = yes; then