X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7272c085692e058092e3d9cc20103f9110de15b..76e4be8e183279dfcf4054e216bda5f3e67f378b:/acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 708e54862d..4f4ecb9682 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 ---------------------------------------------------------------------------
@@ -349,10 +335,11 @@ AC_DEFUN([WX_ARG_SYS_WITH],
         ])
 
 dnl this macro checks for a command line argument and caches the result
-dnl usage: WX_ARG_WITH(option, helpmessage, variable-name)
+dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
 AC_DEFUN([WX_ARG_WITH],
         [
-          AC_MSG_CHECKING([for --with-$1])
+	  withstring=$4
+          AC_MSG_CHECKING([for --${withstring:-with}-$1])
           no_cache=0
           AC_ARG_WITH($1, [$2],
                       [