fix caching of configure arguments broken by one of the previous commits (all options got saved in the cache file, not just the ones explicitly specified)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-23 21:59:56 +00:00
parent 6b65e37304
commit 1c2aa6f237
2 changed files with 247 additions and 10 deletions

View File

@@ -380,6 +380,7 @@ 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"
@@ -430,6 +431,7 @@ 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"
@@ -439,7 +441,7 @@ AC_DEFUN([WX_ARG_WITH],
])
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
@@ -492,6 +494,7 @@ 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"
@@ -549,6 +552,7 @@ 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"

251
configure vendored

File diff suppressed because it is too large Load Diff