in wxAuiNotebook, code to reduce flicker on page close

[wxWidgets.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 6a27a120d7f9dfe11859a5bf771c14eb38d943bf..204c5fb2388428cc707e29edac6ef45eab16988a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADERS(iostream)
+    AC_CHECK_HEADER(iostream,,, [ ])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
@@ -372,7 +372,7 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         fi
                       ],
                       [
-                        LINE=`grep "$3" ${wx_arg_cache_file}`
+                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         else
@@ -416,7 +416,7 @@ AC_DEFUN([WX_ARG_WITH],
                         fi
                       ],
                       [
-                        LINE=`grep "$3" ${wx_arg_cache_file}`
+                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         else
@@ -458,7 +458,7 @@ AC_DEFUN([WX_ARG_ENABLE],
                           fi
                         ],
                         [
-                          LINE=`grep "$3" ${wx_arg_cache_file}`
+                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
@@ -492,7 +492,8 @@ dnl
 dnl  --enable-foo       wxUSE_FOO=yes
 dnl  --disable-foo      wxUSE_FOO=no
 dnl  --enable-foo=bar   wxUSE_FOO=bar
-dnl  <not given>        value from configarg.cache or wxUSE_FOO=no
+dnl  <not given>        value from configarg.cache or
+dnl                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
 dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
@@ -504,14 +505,14 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
                           wx_cv_use_$1="$3='$enableval'"
                         ],
                         [
-                          LINE=`grep "$3" ${wx_arg_cache_file}`
+                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                            wx_cv_use_$1='$3='$DEFAULT_$3
                           else
                             no_cache=1
-                            wx_cv_use_$1="$3=no"
                           fi
+                            
+                          wx_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
           eval "$wx_cv_use_$1"