preserve the arguments read from configarg.cache in it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
22
acinclude.m4
22
acinclude.m4
@@ -380,10 +380,12 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
|||||||
cache=yes
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
cache=no
|
|
||||||
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
|
else
|
||||||
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
|
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=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
cache=no
|
|
||||||
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
|
else
|
||||||
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
||||||
@@ -494,10 +498,12 @@ AC_DEFUN([WX_ARG_ENABLE],
|
|||||||
cache=yes
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
cache=no
|
|
||||||
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
|
else
|
||||||
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
||||||
@@ -552,10 +558,12 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
|||||||
cache=yes
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
cache=no
|
|
||||||
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
|
else
|
||||||
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wx_cv_use_$1='$3='$DEFAULT_$3
|
wx_cv_use_$1='$3='$DEFAULT_$3
|
||||||
|
Reference in New Issue
Block a user