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

10
configure vendored
View File

@@ -22531,7 +22531,9 @@ 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
@@ -22590,6 +22592,12 @@ rm -f conftest.err conftest.$ac_objext \
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`

15
configure.in
View File

@@ -2124,8 +2124,11 @@ 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
case "${host}" in
*-*-linux* | *-*-irix6* | *-*-solaris2* )
AC_CACHE_CHECK([for libraries directory],
wx_cv_std_libpath, wx_cv_std_libpath,
[ [
for d in WX_STD_LIBPATH(); do for d in WX_STD_LIBPATH(); do
@@ -2147,7 +2150,13 @@ AC_CACHE_CHECK([for libraries directory],
wx_cv_std_libpath="lib" wx_cv_std_libpath="lib"
fi 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`