Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only check for lib directory for architectures which have multiple ABIs (Solaris, IRIX, Linux)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-19 10:28:55 +00:00
parent 7ea07c5342
commit c687b303a5
2 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
configure vendored
View File

@@ -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 echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
if test "${wx_cv_std_libpath+set}" = set; then if test "${wx_cv_std_libpath+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
for e in a so sl dylib dll.a; do for e in a so sl dylib dll.a; do
libc="$d/libc.$e" libc="$d/libc.$e"
if test -f $libc; then if test -f $libc; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS="$libc" LIBS="$libc"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
int main() { return 0; } int main() { return 0; }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22575,21 +22577,27 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test "x$wx_cv_std_libpath" != "x"; then if test "x$wx_cv_std_libpath" != "x"; then
break 2 break 2
fi 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 fi
echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5 echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
echo "${ECHO_T}$wx_cv_std_libpath" >&6 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`

55
configure.in
View File

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