diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-06 22:54:38 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-06 22:54:38 (GMT) |
| commit | 0cf223873e568e40ebf813bb4d5d78536bf53338 (patch) | |
| tree | d79098bf1cb189f8446f93894180e519137d51c8 | |
| parent | dc5a3fe4efee222dd8512fd63d9445ae5de42fc1 (diff) | |
| parent | 01c340da23075b6f3dc1c5e61c31b1b7d38652ca (diff) | |
| download | cpython-0cf223873e568e40ebf813bb4d5d78536bf53338.zip cpython-0cf223873e568e40ebf813bb4d5d78536bf53338.tar.gz cpython-0cf223873e568e40ebf813bb4d5d78536bf53338.tar.bz2 | |
merge 3.5
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 17 insertions, 1 deletions
@@ -775,6 +775,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -885,6 +886,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}' @@ -1137,6 +1139,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=* \ @@ -1274,7 +1285,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. @@ -1427,6 +1438,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] @@ -12372,6 +12384,8 @@ int main() break; } } + freeaddrinfo(aitop); + aitop = NULL; } if (!(inet4 == 0 || inet4 == 2)) diff --git a/configure.ac b/configure.ac index 1e77c66..786796a 100644 --- a/configure.ac +++ b/configure.ac @@ -3718,6 +3718,8 @@ int main() break; } } + freeaddrinfo(aitop); + aitop = NULL; } if (!(inet4 == 0 || inet4 == 2)) |