Skip to content

Commit 2de064e

Browse files
tonybaloneyned-deily
authored andcommitted
bpo-39160 Align the verbs, grammar and defaults for ./configure --help (GH-17747)
1 parent a190e2a commit 2de064e

File tree

4 files changed

+135
-95
lines changed

4 files changed

+135
-95
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated the documentation in `./configure --help` to show default values, reference documentation where required and add additional explanation where needed.

configure

Lines changed: 74 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,80 +1483,102 @@ Optional Features:
14831483
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
14841484
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
14851485
--enable-universalsdk[=SDKDIR]
1486-
Build fat binary against Mac OS X SDK
1486+
create a universal binary build. SDKDIR specifies
1487+
which macOS SDK should be used to perform the build,
1488+
see Mac/README.rst. (default is no)
14871489
--enable-framework[=INSTALLDIR]
1488-
Build (MacOSX|Darwin) framework
1489-
--enable-shared disable/enable building shared python library
1490-
--enable-profiling enable C-level code profiling
1491-
--enable-optimizations Enable expensive, stable optimizations (PGO, etc).
1492-
Disabled by default.
1490+
create a Python.framework rather than a traditional
1491+
Unix install. optional INSTALLDIR specifies the
1492+
installation path. see Mac/README.rst (default is
1493+
no)
1494+
--enable-shared enable building a shared Python library (default is
1495+
no)
1496+
--enable-profiling enable C-level code profiling with gprof (default is
1497+
no)
1498+
--enable-optimizations enable expensive, stable optimizations (PGO, etc.)
1499+
(default is no)
14931500
--enable-loadable-sqlite-extensions
1494-
support loadable extensions in _sqlite module
1495-
--enable-ipv6 Enable ipv6 (with ipv4) support
1496-
--disable-ipv6 Disable ipv6 support
1497-
--enable-big-digits[=BITS]
1498-
use big digits for Python longs [[BITS=30]]
1501+
support loadable extensions in _sqlite module, see
1502+
Doc/library/sqlite3.rst (default is no)
1503+
--enable-ipv6 enable ipv6 (with ipv4) support, see
1504+
Doc/library/socket.rst (default is yes if supported)
1505+
--enable-big-digits[=15|30]
1506+
use big digits (30 or 15 bits) for Python longs
1507+
(default is system-dependent)]
14991508
15001509
Optional Packages:
15011510
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
15021511
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
15031512
--with-universal-archs=ARCH
1504-
select architectures for universal build ("32-bit",
1505-
"64-bit", "3-way", "intel", "intel-32", "intel-64",
1506-
or "all")
1513+
specify the kind of universal binary that should be
1514+
created. this option is only valid when
1515+
--enable-universalsdk is set; options are:
1516+
("32-bit", "64-bit", "3-way", "intel", "intel-32",
1517+
"intel-64", or "all") see Mac/README.rst
15071518
--with-framework-name=FRAMEWORK
1508-
specify an alternate name of the framework built
1509-
with --enable-framework
1510-
--with-cxx-main=<compiler>
1511-
compile main() and link python executable with C++
1512-
compiler
1513-
--with-suffix=.exe set executable suffix
1514-
--with-pydebug build with Py_DEBUG defined
1519+
specify the name for the python framework on macOS
1520+
only valid when --enable-framework is set. see
1521+
Mac/README.rst (default is 'Python')
1522+
--with-cxx-main[=COMPILER]
1523+
compile main() and link Python executable with C++
1524+
compiler specified in COMPILER (default is $CXX)
1525+
--with-suffix=SUFFIX set executable suffix to SUFFIX (default is '.exe')
1526+
--with-pydebug build with Py_DEBUG defined (default is no)
15151527
--with-trace-refs enable tracing references for debugging purpose
1516-
--with-assertions build with C assertions enabled
1517-
--with-lto Enable Link Time Optimization in any build. Disabled
1518-
by default.
1528+
(default is no)
1529+
--with-assertions build with C assertions enabled (default is no)
1530+
--with-lto enable Link-Time-Optimization in any build (default
1531+
is no)
15191532
--with-hash-algorithm=[fnv|siphash24]
1520-
select hash algorithm
1533+
select hash algorithm for use in Python/pyhash.c
1534+
(default is SipHash24)
15211535
--with-address-sanitizer
1522-
enable AddressSanitizer (asan)
1523-
--with-memory-sanitizer enable MemorySanitizer (msan)
1536+
enable AddressSanitizer memory error detector,
1537+
'asan' (default is no)
1538+
--with-memory-sanitizer enable MemorySanitizer allocation error detector,
1539+
'msan' (default is no)
15241540
--with-undefined-behavior-sanitizer
1525-
enable UndefinedBehaviorSanitizer (ubsan)
1526-
--with-libs='lib1 ...' link against additional libs
1541+
enable UndefinedBehaviorSanitizer undefined
1542+
behaviour detector, 'ubsan' (default is no)
1543+
--with-libs='lib1 ...' link against additional libs (default is no)
15271544
--with-system-expat build pyexpat module using an installed expat
1528-
library
1529-
--with-system-ffi build _ctypes module using an installed ffi library
1545+
library, see Doc/library/pyexpat.rst (default is no)
1546+
--with-system-ffi build _ctypes module using an installed ffi library,
1547+
see Doc/library/ctypes.rst (default is
1548+
system-dependent)
15301549
--with-system-libmpdec build _decimal module using an installed libmpdec
1531-
library
1550+
library, see Doc/library/decimal.rst (default is no)
15321551
--with-tcltk-includes='-I...'
15331552
override search for Tcl and Tk include files
15341553
--with-tcltk-libs='-L...'
15351554
override search for Tcl and Tk libs
15361555
--with-dbmliborder=db1:db2:...
1537-
order to check db backends for dbm. Valid value is a
1538-
colon separated string with the backend names
1539-
`ndbm', `gdbm' and `bdb'.
1540-
--with(out)-doc-strings disable/enable documentation strings
1541-
--with(out)-pymalloc disable/enable specialized mallocs
1542-
--with(out)-c-locale-coercion
1543-
disable/enable C locale coercion to a UTF-8 based
1544-
locale
1545-
--with-valgrind Enable Valgrind support
1546-
--with(out)-dtrace disable/enable DTrace support
1547-
--with-libm=STRING math library
1548-
--with-libc=STRING C library
1549-
--with(out)-computed-gotos
1550-
Use computed gotos in evaluation loop (enabled by
1556+
override order to check db backends for dbm; a valid
1557+
value is a colon separated string with the backend
1558+
names `ndbm', `gdbm' and `bdb'.
1559+
--with-doc-strings enable documentation strings (default is yes)
1560+
--with-pymalloc enable specialized mallocs (default is yes)
1561+
--with-c-locale-coercion
1562+
enable C locale coercion to a UTF-8 based locale
1563+
(default is yes)
1564+
--with-valgrind enable Valgrind support (default is no)
1565+
--with-dtrace enable DTrace support (default is no)
1566+
--with-libm=STRING override libm math library to STRING (default is
1567+
system-dependent)
1568+
--with-libc=STRING override libc C library to STRING (default is
1569+
system-dependent)
1570+
--with-computed-gotos enable computed gotos in evaluation loop (enabled by
15511571
default on supported compilers)
1552-
--with(out)-ensurepip=[=upgrade]
1553-
"install" or "upgrade" using bundled pip
1554-
--with-openssl=DIR root of the OpenSSL directory
1572+
--with-ensurepip[=install|upgrade|no]
1573+
"install" or "upgrade" using bundled pip (default is
1574+
upgrade)
1575+
--with-openssl=DIR override root of the OpenSSL directory to DIR
15551576
--with-ssl-default-suites=[python|openssl|STRING]
1556-
Override default cipher suites string, python: use
1577+
override default cipher suites string, python: use
15571578
Python's preferred selection (default), openssl:
15581579
leave OpenSSL's defaults untouched, STRING: use a
1559-
custom string, PROTOCOL_SSLv2 ignores the setting
1580+
custom string, PROTOCOL_SSLv2 ignores the setting,
1581+
see Doc/library/ssl.rst
15601582
15611583
Some influential environment variables:
15621584
MACHDEP name for machine-dependent library files
@@ -3248,7 +3270,7 @@ _ACEOF
32483270

32493271
##AC_ARG_WITH(dyld,
32503272
## AS_HELP_STRING([--with-dyld],
3251-
## [Use (OpenStep|Rhapsody) dynamic linker]))
3273+
## [use (OpenStep|Rhapsody) dynamic linker]))
32523274
##
32533275
# Set name for machine-dependent library files
32543276

0 commit comments

Comments
 (0)