show correct message when running configure for the switches which are on by default (such as --enable-compat22)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dc1f566f6a
commit
5005acfef5
@ -336,10 +336,15 @@ AC_DEFUN([WX_ARG_WITH],
|
||||
])
|
||||
|
||||
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
|
||||
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
|
||||
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
|
||||
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
|
||||
AC_DEFUN([WX_ARG_ENABLE],
|
||||
[
|
||||
AC_MSG_CHECKING([for --enable-$1])
|
||||
enablestring=$4
|
||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||
no_cache=0
|
||||
AC_ARG_ENABLE($1, [$2],
|
||||
[
|
||||
|
5
aclocal.m4
vendored
5
aclocal.m4
vendored
@ -348,10 +348,11 @@ AC_DEFUN([WX_ARG_WITH],
|
||||
])
|
||||
|
||||
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
|
||||
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name)
|
||||
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
|
||||
AC_DEFUN([WX_ARG_ENABLE],
|
||||
[
|
||||
AC_MSG_CHECKING([for --enable-$1])
|
||||
enablestring=$4
|
||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||
no_cache=0
|
||||
AC_ARG_ENABLE($1, [$2],
|
||||
[
|
||||
|
@ -738,7 +738,7 @@ WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregardin
|
||||
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
|
||||
|
||||
WX_ARG_ENABLE(compat20, [ --enable-compat20 enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
|
||||
WX_ARG_ENABLE(compat22, [ --disable-compat22 disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
|
||||
WX_ARG_ENABLE(compat22, [ --disable-compat22 disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2, disable)
|
||||
|
||||
AC_ARG_ENABLE(rpath, [ --enable-rpath=DIR output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user