Don't show checks for command line options to make configure less verbose
The results of the checks for the command line options are not useful to show as presumably the user already knows which options were used for invoking configure, and so the results of these checks are known as well (with the only exception of --with-xxx options when configure detects whether to use the system or the built-in version of the library on its own, but we already summarize the results of these checks at the end anyhow). Just don't flood the user with all the messages about checking this and do our job silently.
This commit is contained in:
parent
95abaa1f23
commit
81d7f56986
42
acinclude.m4
42
acinclude.m4
@ -379,7 +379,6 @@ dnl 4. Otherwise the default value is "yes", meaning that either the system
|
|||||||
dnl (preferred) or builtin version of the library will be used.
|
dnl (preferred) or builtin version of the library will be used.
|
||||||
AC_DEFUN([WX_ARG_SYS_WITH],
|
AC_DEFUN([WX_ARG_SYS_WITH],
|
||||||
[
|
[
|
||||||
AC_MSG_CHECKING([for --with-$1])
|
|
||||||
AC_ARG_WITH($1, [$2],
|
AC_ARG_WITH($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$withval" = yes; then
|
if test "$withval" = yes; then
|
||||||
@ -409,18 +408,6 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
|||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
|
|
||||||
if test "$$3" = yes; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
elif test "$$3" = no; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
elif test "$$3" = sys; then
|
|
||||||
AC_MSG_RESULT([system version])
|
|
||||||
elif test "$$3" = builtin; then
|
|
||||||
AC_MSG_RESULT([builtin version])
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
|
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl this macro simply checks for a command line argument
|
dnl this macro simply checks for a command line argument
|
||||||
@ -436,7 +423,6 @@ AC_DEFUN([WX_ARG_WITH],
|
|||||||
defaultval=no
|
defaultval=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AC_MSG_CHECKING([for --${withstring:-with}-$1])
|
|
||||||
AC_ARG_WITH($1, [$2],
|
AC_ARG_WITH($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$withval" = yes; then
|
if test "$withval" = yes; then
|
||||||
@ -450,18 +436,6 @@ AC_DEFUN([WX_ARG_WITH],
|
|||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
|
|
||||||
if test x"$withstring" = xwithout; then
|
|
||||||
if test $$3 = yes; then
|
|
||||||
result=no
|
|
||||||
else
|
|
||||||
result=yes
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$$3
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_RESULT($result)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
|
dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
|
||||||
@ -489,7 +463,6 @@ AC_DEFUN([WX_ARG_ENABLE],
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
|
||||||
AC_ARG_ENABLE($1, [$2],
|
AC_ARG_ENABLE($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$enableval" = yes; then
|
if test "$enableval" = yes; then
|
||||||
@ -503,18 +476,6 @@ AC_DEFUN([WX_ARG_ENABLE],
|
|||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $$3 = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$$3
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_RESULT($result)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
|
dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
|
||||||
@ -540,7 +501,6 @@ dnl
|
|||||||
AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
||||||
[
|
[
|
||||||
enablestring=$4
|
enablestring=$4
|
||||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
|
||||||
AC_ARG_ENABLE($1, [$2],
|
AC_ARG_ENABLE($1, [$2],
|
||||||
[
|
[
|
||||||
wx_cv_use_$1="$3='$enableval'"
|
wx_cv_use_$1="$3='$enableval'"
|
||||||
@ -550,8 +510,6 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
|||||||
])
|
])
|
||||||
|
|
||||||
eval "$wx_cv_use_$1"
|
eval "$wx_cv_use_$1"
|
||||||
|
|
||||||
AC_MSG_RESULT([$$3])
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl ===========================================================================
|
dnl ===========================================================================
|
||||||
|
@ -553,19 +553,15 @@ WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx
|
|||||||
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
|
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
|
||||||
WX_ARG_SYS_WITH(expat, [ --with-expat enable XML support using expat parser], wxUSE_EXPAT)
|
WX_ARG_SYS_WITH(expat, [ --with-expat enable XML support using expat parser], wxUSE_EXPAT)
|
||||||
|
|
||||||
AC_MSG_CHECKING([for --with-macosx-sdk])
|
|
||||||
AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=PATH use an OS X SDK at PATH], [
|
AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=PATH use an OS X SDK at PATH], [
|
||||||
wxUSE_MACOSX_SDK=$withval
|
wxUSE_MACOSX_SDK=$withval
|
||||||
wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
|
wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
|
||||||
])
|
])
|
||||||
AC_MSG_RESULT([$wxUSE_MACOSX_SDK])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for --with-macosx-version-min])
|
|
||||||
AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version], [
|
AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version], [
|
||||||
wxUSE_MACOSX_VERSION_MIN=$withval
|
wxUSE_MACOSX_VERSION_MIN=$withval
|
||||||
wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
|
wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
|
||||||
])
|
])
|
||||||
AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
|
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl debugging options
|
dnl debugging options
|
||||||
@ -573,7 +569,6 @@ dnl ---------------------------------------------------------------------------
|
|||||||
|
|
||||||
dnl don't use WX_ARG_ENABLE as it just gets in the way instead of helping with
|
dnl don't use WX_ARG_ENABLE as it just gets in the way instead of helping with
|
||||||
dnl this rather unusual option
|
dnl this rather unusual option
|
||||||
AC_MSG_CHECKING([for --enable-debug])
|
|
||||||
AC_ARG_ENABLE(debug, [ --enable-debug build library for debugging],
|
AC_ARG_ENABLE(debug, [ --enable-debug build library for debugging],
|
||||||
[
|
[
|
||||||
if test "$enableval" = yes; then
|
if test "$enableval" = yes; then
|
||||||
@ -589,7 +584,6 @@ AC_ARG_ENABLE(debug, [ --enable-debug build library for debuggin
|
|||||||
],
|
],
|
||||||
wxUSE_DEBUG=default
|
wxUSE_DEBUG=default
|
||||||
)
|
)
|
||||||
AC_MSG_RESULT([${enable_debug-default}])
|
|
||||||
|
|
||||||
case "$wxUSE_DEBUG" in
|
case "$wxUSE_DEBUG" in
|
||||||
yes)
|
yes)
|
||||||
|
Loading…
Reference in New Issue
Block a user