bpo-29643: Fix check for --enable-optimizations (GH-871)

methane · web-flow · commit e6a495315685 · 2017-03-29T00:26:29.000+09:00
The presence of the ``--enable-optimizations`` flag is indicated by the value of ``$enableval``, but the configure script was checking ``$withval``, resulting in the ``--enable-optimizations`` flag being effectively ignored. (cherry picked from commit 8cea592)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -157,6 +157,11 @@ Documentation
 
 - Issue #29349: Fix Python 2 syntax in code for building the documentation.
 
+Build
+-----
+
+- bpo-29643: Fix ``--enable-optimization`` didn't work.
+
 Tests
 -----
 
diff --git a/configure b/configure
@@ -6548,7 +6548,7 @@ $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
+if test "$enableval" != no
 then
   Py_OPT='true'
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
diff --git a/configure.ac b/configure.ac
@@ -1237,7 +1237,7 @@ Py_OPT='false'
 AC_MSG_CHECKING(for --enable-optimizations)
 AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc).  Disabled by default.]),
 [
-if test "$withval" != no
+if test "$enableval" != no
 then
   Py_OPT='true'
   AC_MSG_RESULT(yes);

Original file line number	Diff line number	Diff line change
`@@ -1237,7 +1237,7 @@ Py_OPT='false'`
`1237`	`1237`	`AC_MSG_CHECKING(for --enable-optimizations)`
`1238`	`1238`	`AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),`
`1239`	`1239`	`[`
`1240`		`-if test "$withval" != no`
	`1240`	`+if test "$enableval" != no`
`1241`	`1241`	`then`
`1242`	`1242`	`Py_OPT='true'`
`1243`	`1243`	`AC_MSG_RESULT(yes);`