summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>2016-11-20 21:17:01 (GMT)
committerGregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org>2016-11-20 21:17:01 (GMT)
commitfe914c034fc63ce26fec578d1a3a0c67bdea6880 (patch)
tree1f964be38275e67a6abacc7999517460f75514fd /configure
parentf8d8d18c3319ee6675a232a213322ff8434c5b33 (diff)
parent164eea5443f56411d0e617389fa22b2025683f50 (diff)
downloadcpython-fe914c034fc63ce26fec578d1a3a0c67bdea6880.zip
cpython-fe914c034fc63ce26fec578d1a3a0c67bdea6880.tar.gz
cpython-fe914c034fc63ce26fec578d1a3a0c67bdea6880.tar.bz2
Rename the new --with-optimiations flag to --enable-optimizations.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure37
1 files changed, 24 insertions, 13 deletions
diff --git a/configure b/configure
index 44350ac..f894ad7 100755
--- a/configure
+++ b/configure
@@ -784,6 +784,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -817,7 +818,7 @@ with_suffix
enable_shared
enable_profiling
with_pydebug
-with_optimizations
+enable_optimizations
with_lto
with_hash_algorithm
with_address_sanitizer
@@ -894,6 +895,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1146,6 +1148,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1283,7 +1294,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1436,6 +1447,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1476,6 +1488,8 @@ Optional Features:
Build (MacOSX|Darwin) framework
--enable-shared disable/enable building shared python library
--enable-profiling enable C-level code profiling
+ --enable-optimizations Enable expensive optimizations (PGO, etc). Disabled
+ by default.
--enable-loadable-sqlite-extensions
support loadable extensions in _sqlite module
--enable-ipv6 Enable ipv6 (with ipv4) support
@@ -1499,8 +1513,6 @@ Optional Packages:
compiler
--with-suffix=.exe set executable suffix
--with-pydebug build with Py_DEBUG defined
- --with-optimizations Enable expensive optimizations (PGO, etc). Disabled
- by default.
--with-lto Enable Link Time Optimization in PGO builds.
Disabled by default.
--with-hash-algorithm=[fnv|siphash24]
@@ -6524,12 +6536,11 @@ fi
Py_OPT='false'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5
-$as_echo_n "checking for --with-optimizations... " >&6; }
-
-# Check whether --with-optimizations was given.
-if test "${with_optimizations+set}" = set; then :
- withval=$with_optimizations;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
+$as_echo_n "checking for --enable-optimizations... " >&6; }
+# Check whether --enable-optimizations was given.
+if test "${enable_optimizations+set}" = set; then :
+ enableval=$enable_optimizations;
if test "$withval" != no
then
Py_OPT='true'
@@ -6796,7 +6807,7 @@ case $CC in
LLVM_PROF_ERR=yes
if test "${REQUIRE_PGO}" = "yes"
then
- as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
+ as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
fi
fi
;;
@@ -6812,7 +6823,7 @@ case $CC in
LLVM_PROF_ERR=yes
if test "${REQUIRE_PGO}" = "yes"
then
- as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
+ as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
fi
fi
;;
@@ -17877,7 +17888,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
echo "" >&6
echo "" >&6
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&6
- echo "please run ./configure --with-optimizations" >&6
+ echo "please run ./configure --enable-optimizations" >&6
echo "" >&6
echo "" >&6
fi