traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39160 Align the verbs, grammar and defaults for `./configure --help` (GH-17747)

This commit is contained in:
Anthony Shaw 2020-01-14 17:40:10 +11:00 committed by Ned Deily
parent a190e2ade1
commit 2de064e630
4 changed files with 135 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2019-12-30-03-54-24.bpo-39160.aBmj13.rst Normal file
View File

@ -0,0 +1 @@
Updated the documentation in `./configure --help` to show default values, reference documentation where required and add additional explanation where needed.

126
configure vendored
View File

@ -1483,80 +1483,102 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-universalsdk[=SDKDIR] --enable-universalsdk[=SDKDIR]
Build fat binary against Mac OS X SDK create a universal binary build. SDKDIR specifies
which macOS SDK should be used to perform the build,
see Mac/README.rst. (default is no)
--enable-framework[=INSTALLDIR] --enable-framework[=INSTALLDIR]
Build (MacOSX|Darwin) framework create a Python.framework rather than a traditional
--enable-shared disable/enable building shared python library Unix install. optional INSTALLDIR specifies the
--enable-profiling enable C-level code profiling installation path. see Mac/README.rst (default is
--enable-optimizations Enable expensive, stable optimizations (PGO, etc). no)
Disabled by default. --enable-shared enable building a shared Python library (default is
no)
--enable-profiling enable C-level code profiling with gprof (default is
no)
--enable-optimizations enable expensive, stable optimizations (PGO, etc.)
(default is no)
--enable-loadable-sqlite-extensions --enable-loadable-sqlite-extensions
support loadable extensions in _sqlite module support loadable extensions in _sqlite module, see
--enable-ipv6 Enable ipv6 (with ipv4) support Doc/library/sqlite3.rst (default is no)
--disable-ipv6 Disable ipv6 support --enable-ipv6 enable ipv6 (with ipv4) support, see
--enable-big-digits[=BITS] Doc/library/socket.rst (default is yes if supported)
use big digits for Python longs [[BITS=30]] --enable-big-digits[=15|30]
use big digits (30 or 15 bits) for Python longs
(default is system-dependent)]
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-universal-archs=ARCH --with-universal-archs=ARCH
select architectures for universal build ("32-bit", specify the kind of universal binary that should be
"64-bit", "3-way", "intel", "intel-32", "intel-64", created. this option is only valid when
or "all") --enable-universalsdk is set; options are:
("32-bit", "64-bit", "3-way", "intel", "intel-32",
"intel-64", or "all") see Mac/README.rst
--with-framework-name=FRAMEWORK --with-framework-name=FRAMEWORK
specify an alternate name of the framework built specify the name for the python framework on macOS
with --enable-framework only valid when --enable-framework is set. see
--with-cxx-main=<compiler> Mac/README.rst (default is 'Python')
compile main() and link python executable with C++ --with-cxx-main[=COMPILER]
compiler compile main() and link Python executable with C++
--with-suffix=.exe set executable suffix compiler specified in COMPILER (default is $CXX)
--with-pydebug build with Py_DEBUG defined --with-suffix=SUFFIX set executable suffix to SUFFIX (default is '.exe')
--with-pydebug build with Py_DEBUG defined (default is no)
--with-trace-refs enable tracing references for debugging purpose --with-trace-refs enable tracing references for debugging purpose
--with-assertions build with C assertions enabled (default is no)
--with-lto Enable Link Time Optimization in any build. Disabled --with-assertions build with C assertions enabled (default is no)
by default. --with-lto enable Link-Time-Optimization in any build (default
is no)
--with-hash-algorithm=[fnv|siphash24] --with-hash-algorithm=[fnv|siphash24]
select hash algorithm select hash algorithm for use in Python/pyhash.c
(default is SipHash24)
--with-address-sanitizer --with-address-sanitizer
enable AddressSanitizer (asan) enable AddressSanitizer memory error detector,
--with-memory-sanitizer enable MemorySanitizer (msan) 'asan' (default is no)
--with-memory-sanitizer enable MemorySanitizer allocation error detector,
'msan' (default is no)
--with-undefined-behavior-sanitizer --with-undefined-behavior-sanitizer
enable UndefinedBehaviorSanitizer (ubsan) enable UndefinedBehaviorSanitizer undefined
--with-libs='lib1 ...' link against additional libs behaviour detector, 'ubsan' (default is no)
--with-libs='lib1 ...' link against additional libs (default is no)
--with-system-expat build pyexpat module using an installed expat --with-system-expat build pyexpat module using an installed expat
library library, see Doc/library/pyexpat.rst (default is no)
--with-system-ffi build _ctypes module using an installed ffi library --with-system-ffi build _ctypes module using an installed ffi library,
see Doc/library/ctypes.rst (default is
system-dependent)
--with-system-libmpdec build _decimal module using an installed libmpdec --with-system-libmpdec build _decimal module using an installed libmpdec
library library, see Doc/library/decimal.rst (default is no)
--with-tcltk-includes='-I...' --with-tcltk-includes='-I...'
override search for Tcl and Tk include files override search for Tcl and Tk include files
--with-tcltk-libs='-L...' --with-tcltk-libs='-L...'
override search for Tcl and Tk libs override search for Tcl and Tk libs
--with-dbmliborder=db1:db2:... --with-dbmliborder=db1:db2:...
order to check db backends for dbm. Valid value is a override order to check db backends for dbm; a valid
colon separated string with the backend names value is a colon separated string with the backend
`ndbm', `gdbm' and `bdb'. names `ndbm', `gdbm' and `bdb'.
--with(out)-doc-strings disable/enable documentation strings --with-doc-strings enable documentation strings (default is yes)
--with(out)-pymalloc disable/enable specialized mallocs --with-pymalloc enable specialized mallocs (default is yes)
--with(out)-c-locale-coercion --with-c-locale-coercion
disable/enable C locale coercion to a UTF-8 based enable C locale coercion to a UTF-8 based locale
locale (default is yes)
--with-valgrind Enable Valgrind support --with-valgrind enable Valgrind support (default is no)
--with(out)-dtrace disable/enable DTrace support --with-dtrace enable DTrace support (default is no)
--with-libm=STRING math library --with-libm=STRING override libm math library to STRING (default is
--with-libc=STRING C library system-dependent)
--with(out)-computed-gotos --with-libc=STRING override libc C library to STRING (default is
Use computed gotos in evaluation loop (enabled by system-dependent)
--with-computed-gotos enable computed gotos in evaluation loop (enabled by
default on supported compilers) default on supported compilers)
--with(out)-ensurepip=[=upgrade] --with-ensurepip[=install|upgrade|no]
"install" or "upgrade" using bundled pip "install" or "upgrade" using bundled pip (default is
--with-openssl=DIR root of the OpenSSL directory upgrade)
--with-openssl=DIR override root of the OpenSSL directory to DIR
--with-ssl-default-suites=[python|openssl|STRING] --with-ssl-default-suites=[python|openssl|STRING]
Override default cipher suites string, python: use override default cipher suites string, python: use
Python's preferred selection (default), openssl: Python's preferred selection (default), openssl:
leave OpenSSL's defaults untouched, STRING: use a leave OpenSSL's defaults untouched, STRING: use a
custom string, PROTOCOL_SSLv2 ignores the setting custom string, PROTOCOL_SSLv2 ignores the setting,
see Doc/library/ssl.rst
Some influential environment variables: Some influential environment variables:
MACHDEP name for machine-dependent library files MACHDEP name for machine-dependent library files
@ -3248,7 +3270,7 @@ _ACEOF
##AC_ARG_WITH(dyld, ##AC_ARG_WITH(dyld,
## AS_HELP_STRING([--with-dyld], ## AS_HELP_STRING([--with-dyld],
## [Use (OpenStep|Rhapsody) dynamic linker])) ## [use (OpenStep|Rhapsody) dynamic linker]))
## ##
# Set name for machine-dependent library files # Set name for machine-dependent library files

101
configure.ac
View File

@ -149,7 +149,10 @@ CONFIG_ARGS="$ac_configure_args"
AC_MSG_CHECKING([for --enable-universalsdk]) AC_MSG_CHECKING([for --enable-universalsdk])
AC_ARG_ENABLE(universalsdk, AC_ARG_ENABLE(universalsdk,
AS_HELP_STRING([--enable-universalsdk@<:@=SDKDIR@:>@], [Build fat binary against Mac OS X SDK]), AS_HELP_STRING([--enable-universalsdk@<:@=SDKDIR@:>@],
[create a universal binary build.
SDKDIR specifies which macOS SDK should be used to perform the build,
see Mac/README.rst. (default is no)]),
[ [
case $enableval in case $enableval in
yes) yes)
@ -212,7 +215,11 @@ fi
AC_SUBST(LIPO_32BIT_FLAGS) AC_SUBST(LIPO_32BIT_FLAGS)
AC_MSG_CHECKING(for --with-universal-archs) AC_MSG_CHECKING(for --with-universal-archs)
AC_ARG_WITH(universal-archs, AC_ARG_WITH(universal-archs,
AS_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel", "intel-32", "intel-64", or "all")]), AS_HELP_STRING([--with-universal-archs=ARCH],
[specify the kind of universal binary that should be created. this option is
only valid when --enable-universalsdk is set; options are:
("32-bit", "64-bit", "3-way", "intel", "intel-32", "intel-64", or "all")
see Mac/README.rst]),
[ [
UNIVERSAL_ARCHS="$withval" UNIVERSAL_ARCHS="$withval"
], ],
@ -226,7 +233,9 @@ fi
AC_ARG_WITH(framework-name, AC_ARG_WITH(framework-name,
AS_HELP_STRING([--with-framework-name=FRAMEWORK], AS_HELP_STRING([--with-framework-name=FRAMEWORK],
[specify an alternate name of the framework built with --enable-framework]), [specify the name for the python framework on macOS
only valid when --enable-framework is set. see Mac/README.rst
(default is 'Python')]),
[ [
PYTHONFRAMEWORK=${withval} PYTHONFRAMEWORK=${withval}
PYTHONFRAMEWORKDIR=${withval}.framework PYTHONFRAMEWORKDIR=${withval}.framework
@ -238,7 +247,10 @@ AC_ARG_WITH(framework-name,
]) ])
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
AC_ARG_ENABLE(framework, AC_ARG_ENABLE(framework,
AS_HELP_STRING([--enable-framework@<:@=INSTALLDIR@:>@], [Build (MacOSX|Darwin) framework]), AS_HELP_STRING([--enable-framework@<:@=INSTALLDIR@:>@],
[create a Python.framework rather than a traditional Unix install.
optional INSTALLDIR specifies the installation path. see Mac/README.rst
(default is no)]),
[ [
case $enableval in case $enableval in
yes) yes)
@ -357,7 +369,7 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
##AC_ARG_WITH(dyld, ##AC_ARG_WITH(dyld,
## AS_HELP_STRING([--with-dyld], ## AS_HELP_STRING([--with-dyld],
## [Use (OpenStep|Rhapsody) dynamic linker])) ## [use (OpenStep|Rhapsody) dynamic linker]))
## ##
# Set name for machine-dependent library files # Set name for machine-dependent library files
AC_ARG_VAR([MACHDEP], [name for machine-dependent library files]) AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
@ -647,8 +659,8 @@ AC_SUBST(CXX)
AC_SUBST(MAINCC) AC_SUBST(MAINCC)
AC_MSG_CHECKING(for --with-cxx-main=<compiler>) AC_MSG_CHECKING(for --with-cxx-main=<compiler>)
AC_ARG_WITH(cxx_main, AC_ARG_WITH(cxx_main,
AS_HELP_STRING([--with-cxx-main=<compiler>], AS_HELP_STRING([--with-cxx-main@<:@=COMPILER@:>@],
[compile main() and link python executable with C++ compiler]), [compile main() and link Python executable with C++ compiler specified in COMPILER (default is $CXX)]),
[ [
case $withval in case $withval in
@ -928,7 +940,7 @@ esac
AC_EXEEXT AC_EXEEXT
AC_MSG_CHECKING(for --with-suffix) AC_MSG_CHECKING(for --with-suffix)
AC_ARG_WITH(suffix, AC_ARG_WITH(suffix,
AS_HELP_STRING([--with-suffix=.exe], [set executable suffix]), AS_HELP_STRING([--with-suffix=SUFFIX], [set executable suffix to SUFFIX (default is '.exe')]),
[ [
case $withval in case $withval in
no) EXEEXT=;; no) EXEEXT=;;
@ -1050,7 +1062,7 @@ AC_MSG_RESULT($GNULD)
AC_MSG_CHECKING(for --enable-shared) AC_MSG_CHECKING(for --enable-shared)
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
AS_HELP_STRING([--enable-shared], [disable/enable building shared python library])) AS_HELP_STRING([--enable-shared], [enable building a shared Python library (default is no)]))
if test -z "$enable_shared" if test -z "$enable_shared"
then then
@ -1065,7 +1077,7 @@ AC_MSG_RESULT($enable_shared)
AC_MSG_CHECKING(for --enable-profiling) AC_MSG_CHECKING(for --enable-profiling)
AC_ARG_ENABLE(profiling, AC_ARG_ENABLE(profiling,
AS_HELP_STRING([--enable-profiling], [enable C-level code profiling])) AS_HELP_STRING([--enable-profiling], [enable C-level code profiling with gprof (default is no)]))
if test "x$enable_profiling" = xyes; then if test "x$enable_profiling" = xyes; then
ac_save_cc="$CC" ac_save_cc="$CC"
CC="$CC -pg" CC="$CC -pg"
@ -1216,7 +1228,7 @@ ABIFLAGS=""
# Check for --with-pydebug # Check for --with-pydebug
AC_MSG_CHECKING(for --with-pydebug) AC_MSG_CHECKING(for --with-pydebug)
AC_ARG_WITH(pydebug, AC_ARG_WITH(pydebug,
AS_HELP_STRING([--with-pydebug], [build with Py_DEBUG defined]), AS_HELP_STRING([--with-pydebug], [build with Py_DEBUG defined (default is no)]),
[ [
if test "$withval" != no if test "$withval" != no
then then
@ -1233,7 +1245,9 @@ fi],
# --with-trace-refs # --with-trace-refs
AC_MSG_CHECKING(for --with-trace-refs) AC_MSG_CHECKING(for --with-trace-refs)
AC_ARG_WITH(trace-refs, AC_ARG_WITH(trace-refs,
AS_HELP_STRING([--with-trace-refs],[enable tracing references for debugging purpose]),, AS_HELP_STRING(
[--with-trace-refs],
[enable tracing references for debugging purpose (default is no)]),,
with_trace_refs=no) with_trace_refs=no)
AC_MSG_RESULT($with_trace_refs) AC_MSG_RESULT($with_trace_refs)
@ -1247,7 +1261,7 @@ fi
assertions='false' assertions='false'
AC_MSG_CHECKING(for --with-assertions) AC_MSG_CHECKING(for --with-assertions)
AC_ARG_WITH(assertions, AC_ARG_WITH(assertions,
AS_HELP_STRING([--with-assertions],[build with C assertions enabled]), AS_HELP_STRING([--with-assertions],[build with C assertions enabled (default is no)]),
[ [
if test "$withval" != no if test "$withval" != no
then then
@ -1268,7 +1282,9 @@ AC_SUBST(DEF_MAKE_ALL_RULE)
AC_SUBST(DEF_MAKE_RULE) AC_SUBST(DEF_MAKE_RULE)
Py_OPT='false' Py_OPT='false'
AC_MSG_CHECKING(for --enable-optimizations) AC_MSG_CHECKING(for --enable-optimizations)
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive, stable optimizations (PGO, etc). Disabled by default.]), AC_ARG_ENABLE(optimizations, AS_HELP_STRING(
[--enable-optimizations],
[enable expensive, stable optimizations (PGO, etc.) (default is no)]),
[ [
if test "$enableval" != no if test "$enableval" != no
then then
@ -1323,7 +1339,7 @@ fi
# Enable LTO flags # Enable LTO flags
AC_MSG_CHECKING(for --with-lto) AC_MSG_CHECKING(for --with-lto)
AC_ARG_WITH(lto, AS_HELP_STRING([--with-lto], [Enable Link Time Optimization in any build. Disabled by default.]), AC_ARG_WITH(lto, AS_HELP_STRING([--with-lto], [enable Link-Time-Optimization in any build (default is no)]),
[ [
if test "$withval" != no if test "$withval" != no
then then
@ -2907,7 +2923,7 @@ AC_MSG_CHECKING(for --with-hash-algorithm)
dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
AC_ARG_WITH(hash_algorithm, AC_ARG_WITH(hash_algorithm,
AS_HELP_STRING([--with-hash-algorithm=@<:@fnv|siphash24@:>@], AS_HELP_STRING([--with-hash-algorithm=@<:@fnv|siphash24@:>@],
[select hash algorithm]), [select hash algorithm for use in Python/pyhash.c (default is SipHash24)]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
case "$withval" in case "$withval" in
@ -2927,7 +2943,7 @@ esac
AC_MSG_CHECKING(for --with-address-sanitizer) AC_MSG_CHECKING(for --with-address-sanitizer)
AC_ARG_WITH(address_sanitizer, AC_ARG_WITH(address_sanitizer,
AS_HELP_STRING([--with-address-sanitizer], AS_HELP_STRING([--with-address-sanitizer],
[enable AddressSanitizer (asan)]), [enable AddressSanitizer memory error detector, 'asan' (default is no)]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS" BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS"
@ -2940,7 +2956,7 @@ with_pymalloc="no"
AC_MSG_CHECKING(for --with-memory-sanitizer) AC_MSG_CHECKING(for --with-memory-sanitizer)
AC_ARG_WITH(memory_sanitizer, AC_ARG_WITH(memory_sanitizer,
AS_HELP_STRING([--with-memory-sanitizer], AS_HELP_STRING([--with-memory-sanitizer],
[enable MemorySanitizer (msan)]), [enable MemorySanitizer allocation error detector, 'msan' (default is no)]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS" BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS"
@ -2953,7 +2969,7 @@ with_pymalloc="no"
AC_MSG_CHECKING(for --with-undefined-behavior-sanitizer) AC_MSG_CHECKING(for --with-undefined-behavior-sanitizer)
AC_ARG_WITH(undefined_behavior_sanitizer, AC_ARG_WITH(undefined_behavior_sanitizer,
AS_HELP_STRING([--with-undefined-behavior-sanitizer], AS_HELP_STRING([--with-undefined-behavior-sanitizer],
[enable UndefinedBehaviorSanitizer (ubsan)]), [enable UndefinedBehaviorSanitizer undefined behaviour detector, 'ubsan' (default is no)]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
BASECFLAGS="-fsanitize=undefined $BASECFLAGS" BASECFLAGS="-fsanitize=undefined $BASECFLAGS"
@ -2967,7 +2983,7 @@ AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
AC_MSG_CHECKING(for --with-libs) AC_MSG_CHECKING(for --with-libs)
AC_ARG_WITH(libs, AC_ARG_WITH(libs,
AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]), AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs (default is no)]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
LIBS="$withval $LIBS" LIBS="$withval $LIBS"
@ -2979,7 +2995,7 @@ PKG_PROG_PKG_CONFIG
# Check for use of the system expat library # Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat) AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat, AC_ARG_WITH(system_expat,
AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]),
[], [],
[with_system_expat="no"]) [with_system_expat="no"])
@ -2988,7 +3004,7 @@ AC_MSG_RESULT($with_system_expat)
# Check for use of the system libffi library # Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi) AC_MSG_CHECKING(for --with-system-ffi)
AC_ARG_WITH(system_ffi, AC_ARG_WITH(system_ffi,
AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]),,,) AS_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library, see Doc/library/ctypes.rst (default is system-dependent)]),,,)
if test "$ac_sys_system" = "Darwin" if test "$ac_sys_system" = "Darwin"
then then
@ -3022,7 +3038,7 @@ AC_SUBST(LIBFFI_INCLUDEDIR)
# Check for use of the system libmpdec library # Check for use of the system libmpdec library
AC_MSG_CHECKING(for --with-system-libmpdec) AC_MSG_CHECKING(for --with-system-libmpdec)
AC_ARG_WITH(system_libmpdec, AC_ARG_WITH(system_libmpdec,
AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]), AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]),
[], [],
[with_system_libmpdec="no"]) [with_system_libmpdec="no"])
@ -3031,7 +3047,8 @@ AC_MSG_RESULT($with_system_libmpdec)
# Check for support for loadable sqlite extensions # Check for support for loadable sqlite extensions
AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
AC_ARG_ENABLE(loadable-sqlite-extensions, AC_ARG_ENABLE(loadable-sqlite-extensions,
AS_HELP_STRING([--enable-loadable-sqlite-extensions], [support loadable extensions in _sqlite module]), AS_HELP_STRING([--enable-loadable-sqlite-extensions],
[support loadable extensions in _sqlite module, see Doc/library/sqlite3.rst (default is no)]),
[], [],
[enable_loadable_sqlite_extensions="no"]) [enable_loadable_sqlite_extensions="no"])
@ -3068,7 +3085,7 @@ fi
# Check for --with-dbmliborder # Check for --with-dbmliborder
AC_MSG_CHECKING(for --with-dbmliborder) AC_MSG_CHECKING(for --with-dbmliborder)
AC_ARG_WITH(dbmliborder, AC_ARG_WITH(dbmliborder,
AS_HELP_STRING([--with-dbmliborder=db1:db2:...], [order to check db backends for dbm. Valid value is a colon separated string with the backend names `ndbm', `gdbm' and `bdb'.]), AS_HELP_STRING([--with-dbmliborder=db1:db2:...], [override order to check db backends for dbm; a valid value is a colon separated string with the backend names `ndbm', `gdbm' and `bdb'.]),
[ [
if test x$with_dbmliborder = xyes if test x$with_dbmliborder = xyes
then then
@ -3240,8 +3257,8 @@ fi
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified])
AC_ARG_ENABLE(ipv6, AC_ARG_ENABLE(ipv6,
[ --enable-ipv6 Enable ipv6 (with ipv4) support AS_HELP_STRING([--enable-ipv6],
--disable-ipv6 Disable ipv6 support], [enable ipv6 (with ipv4) support, see Doc/library/socket.rst (default is yes if supported)]),
[ case "$enableval" in [ case "$enableval" in
no) no)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -3412,7 +3429,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ /* CAN_RAW_FD_FRAMES available check */
# Check for --with-doc-strings # Check for --with-doc-strings
AC_MSG_CHECKING(for --with-doc-strings) AC_MSG_CHECKING(for --with-doc-strings)
AC_ARG_WITH(doc-strings, AC_ARG_WITH(doc-strings,
AS_HELP_STRING([--with(out)-doc-strings], [disable/enable documentation strings])) AS_HELP_STRING([--with-doc-strings], [enable documentation strings (default is yes)]))
if test -z "$with_doc_strings" if test -z "$with_doc_strings"
then with_doc_strings="yes" then with_doc_strings="yes"
@ -3427,7 +3444,7 @@ AC_MSG_RESULT($with_doc_strings)
# Check for Python-specific malloc support # Check for Python-specific malloc support
AC_MSG_CHECKING(for --with-pymalloc) AC_MSG_CHECKING(for --with-pymalloc)
AC_ARG_WITH(pymalloc, AC_ARG_WITH(pymalloc,
AS_HELP_STRING([--with(out)-pymalloc], [disable/enable specialized mallocs])) AS_HELP_STRING([--with-pymalloc], [enable specialized mallocs (default is yes)]))
if test -z "$with_pymalloc" if test -z "$with_pymalloc"
then then
@ -3443,8 +3460,8 @@ AC_MSG_RESULT($with_pymalloc)
# Check for --with-c-locale-coercion # Check for --with-c-locale-coercion
AC_MSG_CHECKING(for --with-c-locale-coercion) AC_MSG_CHECKING(for --with-c-locale-coercion)
AC_ARG_WITH(c-locale-coercion, AC_ARG_WITH(c-locale-coercion,
AS_HELP_STRING([--with(out)-c-locale-coercion], AS_HELP_STRING([--with-c-locale-coercion],
[disable/enable C locale coercion to a UTF-8 based locale])) [enable C locale coercion to a UTF-8 based locale (default is yes)]))
if test -z "$with_c_locale_coercion" if test -z "$with_c_locale_coercion"
then then
@ -3460,7 +3477,7 @@ AC_MSG_RESULT($with_c_locale_coercion)
# Check for Valgrind support # Check for Valgrind support
AC_MSG_CHECKING([for --with-valgrind]) AC_MSG_CHECKING([for --with-valgrind])
AC_ARG_WITH([valgrind], AC_ARG_WITH([valgrind],
AS_HELP_STRING([--with-valgrind], [Enable Valgrind support]),, AS_HELP_STRING([--with-valgrind], [enable Valgrind support (default is no)]),,
with_valgrind=no) with_valgrind=no)
AC_MSG_RESULT([$with_valgrind]) AC_MSG_RESULT([$with_valgrind])
if test "$with_valgrind" != no; then if test "$with_valgrind" != no; then
@ -3474,7 +3491,7 @@ fi
# Check for DTrace support # Check for DTrace support
AC_MSG_CHECKING(for --with-dtrace) AC_MSG_CHECKING(for --with-dtrace)
AC_ARG_WITH(dtrace, AC_ARG_WITH(dtrace,
AS_HELP_STRING([--with(out)-dtrace],[disable/enable DTrace support]),, AS_HELP_STRING([--with-dtrace],[enable DTrace support (default is no)]),,
with_dtrace=no) with_dtrace=no)
AC_MSG_RESULT($with_dtrace) AC_MSG_RESULT($with_dtrace)
@ -4321,7 +4338,7 @@ Darwin) ;;
esac esac
AC_MSG_CHECKING(for --with-libm=STRING) AC_MSG_CHECKING(for --with-libm=STRING)
AC_ARG_WITH(libm, AC_ARG_WITH(libm,
AS_HELP_STRING([--with-libm=STRING], [math library]), AS_HELP_STRING([--with-libm=STRING], [override libm math library to STRING (default is system-dependent)]),
[ [
if test "$withval" = no if test "$withval" = no
then LIBM= then LIBM=
@ -4337,7 +4354,7 @@ fi],
AC_SUBST(LIBC) AC_SUBST(LIBC)
AC_MSG_CHECKING(for --with-libc=STRING) AC_MSG_CHECKING(for --with-libc=STRING)
AC_ARG_WITH(libc, AC_ARG_WITH(libc,
AS_HELP_STRING([--with-libc=STRING], [C library]), AS_HELP_STRING([--with-libc=STRING], [override libc C library to STRING (default is system-dependent)]),
[ [
if test "$withval" = no if test "$withval" = no
then LIBC= then LIBC=
@ -4555,7 +4572,7 @@ AC_CHECK_DECLS([RTLD_LAZY, RTLD_NOW, RTLD_GLOBAL, RTLD_LOCAL, RTLD_NODELETE, RTL
# determine what size digit to use for Python's longs # determine what size digit to use for Python's longs
AC_MSG_CHECKING([digit size for Python's longs]) AC_MSG_CHECKING([digit size for Python's longs])
AC_ARG_ENABLE(big-digits, AC_ARG_ENABLE(big-digits,
AS_HELP_STRING([--enable-big-digits@<:@=BITS@:>@],[use big digits for Python longs [[BITS=30]]]), AS_HELP_STRING([--enable-big-digits@<:@=15|30@:>@],[use big digits (30 or 15 bits) for Python longs (default is system-dependent)]]),
[case $enable_big_digits in [case $enable_big_digits in
yes) yes)
enable_big_digits=30 ;; enable_big_digits=30 ;;
@ -5267,8 +5284,8 @@ fi
# Check for --with-computed-gotos # Check for --with-computed-gotos
AC_MSG_CHECKING(for --with-computed-gotos) AC_MSG_CHECKING(for --with-computed-gotos)
AC_ARG_WITH(computed-gotos, AC_ARG_WITH(computed-gotos,
AS_HELP_STRING([--with(out)-computed-gotos], AS_HELP_STRING([--with-computed-gotos],
[Use computed gotos in evaluation loop (enabled by default on supported compilers)]), [enable computed gotos in evaluation loop (enabled by default on supported compilers)]),
[ [
if test "$withval" = yes if test "$withval" = yes
then then
@ -5464,8 +5481,8 @@ fi
# ensurepip option # ensurepip option
AC_MSG_CHECKING(for ensurepip) AC_MSG_CHECKING(for ensurepip)
AC_ARG_WITH(ensurepip, AC_ARG_WITH(ensurepip,
[AS_HELP_STRING([--with(out)-ensurepip=@<:@=upgrade@:>@], [AS_HELP_STRING([--with-ensurepip@<:@=install|upgrade|no@:>@],
["install" or "upgrade" using bundled pip])], ["install" or "upgrade" using bundled pip (default is upgrade)])],
[], [],
[with_ensurepip=upgrade]) [with_ensurepip=upgrade])
AS_CASE($with_ensurepip, AS_CASE($with_ensurepip,
@ -5621,11 +5638,11 @@ AH_TEMPLATE(PY_SSL_DEFAULT_CIPHER_STRING,
AC_MSG_CHECKING(for --with-ssl-default-suites) AC_MSG_CHECKING(for --with-ssl-default-suites)
AC_ARG_WITH(ssl-default-suites, AC_ARG_WITH(ssl-default-suites,
AS_HELP_STRING([--with-ssl-default-suites=@<:@python|openssl|STRING@:>@], AS_HELP_STRING([--with-ssl-default-suites=@<:@python|openssl|STRING@:>@],
[Override default cipher suites string, [override default cipher suites string,
python: use Python's preferred selection (default), python: use Python's preferred selection (default),
openssl: leave OpenSSL's defaults untouched, openssl: leave OpenSSL's defaults untouched,
STRING: use a custom string, STRING: use a custom string,
PROTOCOL_SSLv2 ignores the setting]), PROTOCOL_SSLv2 ignores the setting, see Doc/library/ssl.rst]),
[ [
AC_MSG_RESULT($withval) AC_MSG_RESULT($withval)
case "$withval" in case "$withval" in

2
m4/ax_check_openssl.m4
View File

@ -39,7 +39,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
found=false found=false
AC_ARG_WITH([openssl], AC_ARG_WITH([openssl],
[AS_HELP_STRING([--with-openssl=DIR], [AS_HELP_STRING([--with-openssl=DIR],
[root of the OpenSSL directory])], [override root of the OpenSSL directory to DIR])],
[ [
case "$withval" in case "$withval" in
"" | y | ye | yes | n | no) "" | y | ye | yes | n | no)