semaphore with count of 1 is not exactly the same as mutex

[wxWidgets.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 347b68a40830c403f040549c459d76dbab10910b..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
       :
@@ -382,7 +382,10 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                       [
                         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}"
@@ -432,14 +435,17 @@ AC_DEFUN([WX_ARG_WITH],
                       [
                         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}"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -494,7 +500,10 @@ AC_DEFUN([WX_ARG_ENABLE],
                         [
                           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,6 +561,9 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
                           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