X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47124ca667df7b2728fe31f25ba501ecaae5cf5c..93dcd337cd6941ce33f2dfdeaa61d9ad1e2ff79f:/acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 8ba0973699..bd3e379f7f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
 
-    AC_CHECK_HEADER(iostream,,, [ ])
+    AC_CHECK_HEADERS([iostream],,, [ ])
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       ifelse([$1], , :, [$1])
@@ -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
       :
@@ -332,28 +332,9 @@ fi
 ])
 
 dnl ---------------------------------------------------------------------------
-dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
+dnl override AC_ARG_ENABLE/WITH to handle options defaults
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([WX_ARG_CACHE_INIT],
-        [
-          wx_arg_cache_file="configarg.cache"
-          echo "loading argument cache $wx_arg_cache_file"
-          rm -f ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}
-        ])
-
-AC_DEFUN([WX_ARG_CACHE_FLUSH],
-        [
-          echo "saving argument cache $wx_arg_cache_file"
-          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
-        ])
-
-dnl return the name of the variable to store the value of the given
-dnl WX_ARG_WITH/ENABLE option
-AC_DEFUN([WX_ARG_CACHE_NAME],)
-
 dnl this macro checks for a three-valued command line --with argument:
 dnl   possible arguments are 'yes', 'no', 'sys', or 'builtin'
 dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
@@ -364,7 +345,6 @@ dnl giving configure --disable-all-features option)
 AC_DEFUN([WX_ARG_SYS_WITH],
         [
           AC_MSG_CHECKING([for --with-$1])
-          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -380,20 +360,10 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         fi
                       ],
                       [
-                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$$3" = yes; then
             AC_MSG_RESULT(yes)
@@ -408,7 +378,7 @@ AC_DEFUN([WX_ARG_SYS_WITH],
           fi
         ])
 
-dnl this macro checks for a command line argument and caches the result
+dnl this macro simply checks for a command line argument
 dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
 AC_DEFUN([WX_ARG_WITH],
         [
@@ -422,7 +392,6 @@ AC_DEFUN([WX_ARG_WITH],
               fi
           fi
           AC_MSG_CHECKING([for --${withstring:-with}-$1])
-          no_cache=0
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -432,20 +401,10 @@ AC_DEFUN([WX_ARG_WITH],
                         fi
                       ],
                       [
-                        LINE=`grep "^$3=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $$3 = yes; then
@@ -486,7 +445,6 @@ AC_DEFUN([WX_ARG_ENABLE],
           fi
 
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
-          no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           if test "$enableval" = yes; then
@@ -496,20 +454,10 @@ AC_DEFUN([WX_ARG_ENABLE],
                           fi
                         ],
                         [
-                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
                         ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
-          if test "$no_cache" != 1; then
-            echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $$3 = yes; then
@@ -542,33 +490,21 @@ 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
-dnl                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
+dnl  <not given>        wxUSE_FOO=$DEFAULT_wxUSE_FOO
 dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
           enablestring=$4
           AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
-          no_cache=0
           AC_ARG_ENABLE($1, [$2],
                         [
                           wx_cv_use_$1="$3='$enableval'"
                         ],
                         [
-                          LINE=`grep "^$3=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
           eval "$wx_cv_use_$1"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
-          fi
 
           AC_MSG_RESULT([$$3])
         ])