another DMC build fix

[wxWidgets.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 38171cc2bd5fde1cd97848e3fecc2edd7785a1be..f1b9dff20dfe6661099a89c239b39b81bfc19516 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -284,7 +284,7 @@ AC_DEFUN([WX_CHECK_FUNCS],
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
-      AC_DEFINE_UNQUOTED([HAVE_`echo $wx_func | tr 'a-z' 'A-Z'`])
+      AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])])
       $2
     else
       :
@@ -380,10 +380,12 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         cache=yes
                       ],
                       [
-                        cache=no
                         LINE=`grep "^$3=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
@@ -431,10 +433,12 @@ AC_DEFUN([WX_ARG_WITH],
                         cache=yes
                       ],
                       [
-                        cache=no
                         LINE=`grep "^$3=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
@@ -494,10 +498,12 @@ AC_DEFUN([WX_ARG_ENABLE],
                           cache=yes
                         ],
                         [
-                          cache=no
                           LINE=`grep "^$3=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
@@ -552,10 +558,12 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
                           cache=yes
                         ],
                         [
-                          cache=no
                           LINE=`grep "^$3=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
+                            cache=yes
+                          else
+                            cache=no
                           fi
 
                           wx_cv_use_$1='$3='$DEFAULT_$3