Rewrote configure --enable/with options handling:

1. There is no more need to set DEFAULT_wxUSE_XXX for all options (although
   it's still taken into account if it is set), use WX_ARG_DISABLE/WITHOUT for
   the options which are enabled by default instead (and WX_ARG_ENABLE/WITH
   for those which are disabled): this makes configure messages more
   understandable (this closes bug 1038676)
2. Added --disable-all-features option which allows to disable everything
   which can be disabled at once in order to build the absolutely minimal
   wx library
3. General cleanup 



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-11 20:03:11 +00:00
parent 8577d8c34d
commit 6e198e97ec
3 changed files with 6399 additions and 4349 deletions

View File

@@ -353,6 +353,10 @@ AC_DEFUN([WX_ARG_CACHE_FLUSH],
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)
dnl
dnl the default value (used if the option is not specified at all) is the value
dnl of wxUSE_ALL_FEATURES (which is "yes" by default but can be changed by
dnl giving configure --disable-all-features option)
AC_DEFUN([WX_ARG_SYS_WITH],
[
AC_MSG_CHECKING([for --with-$1])
@@ -379,7 +383,7 @@ AC_DEFUN([WX_ARG_SYS_WITH],
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
ac_cv_use_$1='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
])
eval "$ac_cv_use_$1"
@@ -423,7 +427,7 @@ AC_DEFUN([WX_ARG_WITH],
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
ac_cv_use_$1='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
])
eval "$ac_cv_use_$1"
@@ -431,22 +435,44 @@ AC_DEFUN([WX_ARG_WITH],
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
if test x"$withstring" = xwithout; then
if test $$3 = yes; then
result=no
else
result=yes
fi
else
AC_MSG_RESULT(no)
result=$$3
fi
AC_MSG_RESULT($result)
])
dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
AC_DEFUN([WX_ARG_WITHOUT], [WX_ARG_WITH($1, [$2], $3, without)])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl usage: WX_ARG_ENABLE(option, helpmessage, var, [enablestring], [default])
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
dnl enablestring can be omitted or a literal string "disable" and allows to
dnl show "checking for --disable-foo" message when running configure instead of
dnl the default "checking for --enable-foo" one whih is useful for the options
dnl enabled by default
dnl
dnl the "default" argument can be omitted or contain the default value to use
dnl for the option if it's unspecified
AC_DEFUN([WX_ARG_ENABLE],
[
enablestring=$4
defaultval=$5
if test -z"$defaultval"; then
if test x"$enablestring" = xdisable; then
defaultval=yes
else
defaultval=no
fi
fi
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
@@ -465,7 +491,7 @@ AC_DEFUN([WX_ARG_ENABLE],
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
ac_cv_use_$1='$3=${'DEFAULT_$3":-$defaultval}"
])
eval "$ac_cv_use_$1"
@@ -473,13 +499,25 @@ AC_DEFUN([WX_ARG_ENABLE],
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
if test x"$enablestring" = xdisable; then
if test $$3 = yes; then
result=no
else
result=yes
fi
else
AC_MSG_RESULT(no)
result=$$3
fi
AC_MSG_RESULT($result)
])
dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
dnl enabled by default
AC_DEFUN([WX_ARG_DISABLE], [WX_ARG_ENABLE($1, [$2], $3, disable)])
dnl same as WX_ARG_ENABLE but defaults to wxUSE_ALL_FEATURES instead of "yes"
AC_DEFUN([WX_ARG_FEATURE], [WX_ARG_ENABLE($1, [$2], $3,, $wxUSE_ALL_FEATURES)])
dnl Like WX_ARG_ENABLE but accepts a parameter.
dnl
@@ -511,7 +549,7 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
else
no_cache=1
fi
wx_cv_use_$1='$3='$DEFAULT_$3
])

9734
configure vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff