From c5044ee8089f346d13af0762b0aa83cdf34516d5 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 19 Sep 2005 19:50:01 +0000 Subject: [PATCH] Change so that WX_PATH_FIND_LIBRARIES doesn't always check /usr/lib, /usr/lib32, /usr/lib/64 and /usr/lib64 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- acinclude.m4 | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 708e54862d..51cd13f6a3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -43,9 +43,10 @@ for ac_dir in $1 /usr/include; ]) 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 --------------------------------------------------------------------------- -AC_DEFUN([WX_PATH_FIND_LIBRARIES_IN_PATH], +AC_DEFUN([WX_PATH_FIND_LIBRARIES], [ ac_find_libraries= 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 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 Path to include, already defined dnl --------------------------------------------------------------------------- -- 2.47.2