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

don't put default library paths in SEARCH_LIB

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-17 22:14:05 +00:00
parent 2296fe5018
commit a8793ff9ce
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.in
View File

@@ -2138,14 +2138,9 @@ SEARCH_INCLUDE="\
\ \
/usr/openwin/share/include" /usr/openwin/share/include"
dnl prepend lib and lib32 for IRIX where the files in these directories should dnl add 64 bit X11 libs for Linux on AMD, they must come before the usual
dnl be found before the ones in lib64 for 32bit compilation -- of course, this
dnl probably/surely breaks 64bit compilation... IMO the only real solution is to
dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead
dnl
dnl also put 64 bit versions for Linux on AMD, they must come before the usual
dnl locations or 64 bit compilation failed dnl locations or 64 bit compilation failed
SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" SEARCH_LIB="/usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
dnl Cross compiling with gcc? dnl Cross compiling with gcc?
if test "$build" != "$host" -a "$GCC" = yes; then if test "$build" != "$host" -a "$GCC" = yes; then
@@ -2839,7 +2834,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl we guess its path from the prefix dnl we guess its path from the prefix
GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY" GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
WXGPE=1 WXGPE=1
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT([found in $ac_find_libraries])
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
fi fi
@@ -2849,7 +2844,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl if test "$ac_find_libraries" != "" ; then dnl if test "$ac_find_libraries" != "" ; then
dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe" dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
dnl AC_MSG_RESULT(found at $ac_find_libraries) dnl AC_MSG_RESULT(found in $ac_find_libraries)
dnl else dnl else
dnl AC_MSG_RESULT(not found) dnl AC_MSG_RESULT(not found)
dnl fi dnl fi
@@ -3077,7 +3072,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
AC_MSG_CHECKING(for Motif/Lesstif library) AC_MSG_CHECKING(for Motif/Lesstif library)
WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found in $ac_find_libraries)
WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
@@ -3212,7 +3207,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
AC_MSG_RESULT(found at $ac_find_libraries) AC_MSG_RESULT(found in $ac_find_libraries)
AC_CACHE_CHECK([for X11/xpm.h], AC_CACHE_CHECK([for X11/xpm.h],
wx_cv_x11_xpm_h, wx_cv_x11_xpm_h,