[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

Tue Sep 6 18:57:59 EDT 2016

https://hg.python.org/cpython/rev/42673b6fc6c5
changeset: 103160:42673b6fc6c5
parent: 103156:a1e032dbcf86
parent: 103159:c90f8c994048
user: Benjamin Peterson <benjamin at python.org>
date: Tue Sep 06 15:54:38 2016 -0700
summary:
 merge 3.5
files:
 configure | 16 +++++++++++++++-
 configure.ac | 2 ++
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -775,6 +775,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -885,6 +886,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1137,6 +1139,15 @@
 | -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=* \
@@ -1274,7 +1285,7 @@
 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.
@@ -1427,6 +1438,7 @@
 --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]
@@ -12372,6 +12384,8 @@
 break;
 }
 }
+ freeaddrinfo(aitop);
+ aitop = NULL;
 }
 
 if (!(inet4 == 0 || inet4 == 2))
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3718,6 +3718,8 @@
 break;
 }
 }
+ freeaddrinfo(aitop);
+ aitop = NULL;
 }
 
 if (!(inet4 == 0 || inet4 == 2))
-- 
Repository URL: https://hg.python.org/cpython
