AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change so that WX_PATH_FIND_LIBRARIES doesn't always check /usr/lib, /usr/lib32, /usr/lib/64 and /usr/lib64

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-09-19 19:50:01 +00:00
parent 0aaa804e70
commit c5044ee808
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
acinclude.m4
View File

@ -43,9 +43,10 @@ for ac_dir in $1 /usr/include;
]) ])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl WX_PATH_FIND_LIBRARIES helper dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES_IN_PATH], AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[ [
ac_find_libraries= ac_find_libraries=
for ac_dir in $1; for ac_dir in $1;
@ -72,21 +73,6 @@ dnl NB: if any of directories in the list is not a subdir of /usr, code setting
dnl wx_cv_std_libpath needs to be updated dnl wx_cv_std_libpath needs to be updated
AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64]) AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
WX_PATH_FIND_LIBRARIES_IN_PATH($1, $2)
if test "x$ac_find_libraries" = "x" ; then
WX_PATH_FIND_LIBRARIES_IN_PATH(WX_STD_LIBPATH(), $2)
if test "x$ac_find_libraries" != "x" ; then
ac_find_libraries="default location"
fi
fi
])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Path to include, already defined dnl Path to include, already defined
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------