only check for lib directory for architectures which have multiple ABIs (Solaris...

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

diff --git a/configure b/configure
index 15045fd730c6e4428229e504d34f7fb1f7b1e2e0..778ceb4fd67775330fae84c8b28bd107f8ba0f38 100755 (executable)
--- a/configure
+++ b/configure
@@ -22531,19 +22531,21 @@ SEARCH_INCLUDE="\
                               \
     /usr/openwin/share/include"
 
                               \
     /usr/openwin/share/include"
 

-echo "$as_me:$LINENO: checking for libraries directory" >&5
+case "${host}" in
+    *-*-linux* | *-*-irix6* | *-*-solaris2* )
+        echo "$as_me:$LINENO: checking for libraries directory" >&5

 echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
 if test "${wx_cv_std_libpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
 if test "${wx_cv_std_libpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-        for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
-            for e in a so sl dylib dll.a; do
-                libc="$d/libc.$e"
-                if test -f $libc; then
-                    save_LIBS="$LIBS"
-                    LIBS="$libc"
-                    cat >conftest.$ac_ext <<_ACEOF
+                for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
+                    for e in a so sl dylib dll.a; do
+                        libc="$d/libc.$e"
+                        if test -f $libc; then
+                            save_LIBS="$LIBS"
+                            LIBS="$libc"
+                            cat >conftest.$ac_ext <<_ACEOF

 int main() { return 0; }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 int main() { return 0; }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext


@@ -22575,21 +22577,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext

-                    LIBS="$save_LIBS"
-                    if test "x$wx_cv_std_libpath" != "x"; then
-                        break 2
-                    fi
+                            LIBS="$save_LIBS"
+                            if test "x$wx_cv_std_libpath" != "x"; then
+                                break 2
+                            fi
+                        fi
+                    done
+                done
+                if test "x$wx_cv_std_libpath" = "x"; then
+                    wx_cv_std_libpath="lib"

                 fi
                 fi

-            done
-        done
-        if test "x$wx_cv_std_libpath" = "x"; then
-            wx_cv_std_libpath="lib"
-        fi

 
 
 fi
 echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
 echo "${ECHO_T}$wx_cv_std_libpath" >&6
 
 
 fi
 echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
 echo "${ECHO_T}$wx_cv_std_libpath" >&6

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

 
 SEARCH_LIB=`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g`
 
 
 SEARCH_LIB=`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g`
 

diff --git a/configure.in b/configure.in
index 1f4a71bb139777f850c18d5947cf9eafe602b141..9dec117684bb4531db486537a52fbd75afcc629e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2124,30 +2124,39 @@ SEARCH_INCLUDE="\
                               \
     /usr/openwin/share/include"
 
                               \
     /usr/openwin/share/include"
 

-dnl try to find out the standard lib locations
-AC_CACHE_CHECK([for libraries directory],
-    wx_cv_std_libpath,
-    [
-        for d in WX_STD_LIBPATH(); do
-            for e in a so sl dylib dll.a; do
-                libc="$d/libc.$e"
-                if test -f $libc; then
-                    save_LIBS="$LIBS"
-                    LIBS="$libc"
-                    AC_LINK_IFELSE([int main() { return 0; }],
-                        wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
-                    LIBS="$save_LIBS"
-                    if test "x$wx_cv_std_libpath" != "x"; then
-                        break 2
-                    fi
+dnl try to find out the standard lib locations for the systems with multiple
+dnl ABIs
+case "${host}" in
+    *-*-linux* | *-*-irix6* | *-*-solaris2* )
+        AC_CACHE_CHECK([for libraries directory],
+            wx_cv_std_libpath,
+            [
+                for d in WX_STD_LIBPATH(); do
+                    for e in a so sl dylib dll.a; do
+                        libc="$d/libc.$e"
+                        if test -f $libc; then
+                            save_LIBS="$LIBS"
+                            LIBS="$libc"
+                            AC_LINK_IFELSE([int main() { return 0; }],
+                                wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
+                            LIBS="$save_LIBS"
+                            if test "x$wx_cv_std_libpath" != "x"; then
+                                break 2
+                            fi
+                        fi
+                    done
+                done
+                if test "x$wx_cv_std_libpath" = "x"; then
+                    wx_cv_std_libpath="lib"

                 fi
                 fi

-            done
-        done
-        if test "x$wx_cv_std_libpath" = "x"; then
-            wx_cv_std_libpath="lib"
-        fi
-    ]
-)
+            ]
+        )
+        ;;
+
+    *)
+        wx_cv_std_libpath="lib";
+        ;;
+esac

 
 SEARCH_LIB=`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g`
 
 
 SEARCH_LIB=`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g`