From c65e7cbba2c2f37c649bd58b18c44f27109688a1 Mon Sep 17 00:00:00 2001
From: Alex Wang <aw1621107@gmail.com>
Date: Tue, 28 Mar 2017 08:50:51 -0400
Subject: [PATCH 1/2] bpo-29643: Fix check for --enable-optimizations (GH-129)

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 8cea5929f52801b0ce5928b46ef836e99a24321a)
---
 Misc/NEWS    | 7 +++++++
 configure    | 2 +-
 configure.ac | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 9798a3a4490cbe..eb13844ae5717a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,13 @@ What's New in Python 3.6.1 release candidate 1
 ==============================================
 
 *Release date: 2017-03-04*
+Build
+-----
+
+- bpo-29643: Fix ``--enable-optimization`` didn't work.
+
+Tests
+-----
 
 Core and Builtins
 -----------------
diff --git a/configure b/configure
index abe1dc5abd4e1c..8bdb82ba4a7bce 100755
--- a/configure
+++ b/configure
@@ -6521,7 +6521,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
index 9eacf52559e8c2..6b331d5742745f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1274,7 +1274,7 @@ Py_OPT='false'
 AC_MSG_CHECKING(for --enable-optimizations)
 AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, etc).  Disabled by default.]),
 [
-if test "$withval" != no
+if test "$enableval" != no
 then
   Py_OPT='true'
   AC_MSG_RESULT(yes);

From 17997b0a1a026900b287f596f9f990d16009972b Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Tue, 28 Mar 2017 21:55:09 +0900
Subject: [PATCH 2/2] fix news

---
 Misc/NEWS | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index eb13844ae5717a..45c5c7828701f8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,11 @@ Library
   exception) to exception(s) raised in the dispatched methods.
   Patch by Petr Motejlek.
 
+Build
+-----
+
+- bpo-29643: Fix ``--enable-optimization`` didn't work.
+
 
 What's New in Python 3.6.1?
 ===========================
@@ -89,13 +94,6 @@ What's New in Python 3.6.1 release candidate 1
 ==============================================
 
 *Release date: 2017-03-04*
-Build
------
-
-- bpo-29643: Fix ``--enable-optimization`` didn't work.
-
-Tests
------
 
 Core and Builtins
 -----------------