simplified message catalog search code using the new wxStandardPaths::GetLocalizedRes...

[wxWidgets.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 83e577c1f9a616d7fed5351feb5ddb4be4860fb5..4f4ecb9682151821e5cc7eb2ee7862134db23318 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -35,8 +35,7 @@ AC_DEFUN([WX_PATH_FIND_INCLUDES],
 ac_find_includes=
 for ac_dir in $1 /usr/include;
   do
 ac_find_includes=
 for ac_dir in $1 /usr/include;
   do

-    wx_ac_hdr="$ac_dir/$2"
-    if test -f "$wx_ac_hdr" -o -h "$wx_ac_hdr"; then
+    if test -f "$ac_dir/$2"; then

       ac_find_includes=$ac_dir
       break
     fi
       ac_find_includes=$ac_dir
       break
     fi


@@ -53,8 +52,7 @@ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
   for ac_dir in $1;
   do
     for ac_extension in a so sl dylib dll.a; do
   for ac_dir in $1;
   do
     for ac_extension in a so sl dylib dll.a; do

-      wx_ac_lib="$ac_dir/lib$2.$ac_extension"
-      if test -f "$wx_ac_lib" -o -h "$wx_ac_lib"; then
+      if test -f "$ac_dir/lib$2.$ac_extension"; then

         ac_find_libraries=$ac_dir
         break 2
       fi
         ac_find_libraries=$ac_dir
         break 2
       fi


@@ -337,10 +335,11 @@ AC_DEFUN([WX_ARG_SYS_WITH],
         ])
 
 dnl this macro checks for a command line argument and caches the result
         ])
 
 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_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],
                       [
           no_cache=0
           AC_ARG_WITH($1, [$2],
                       [