Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5a44fa1

Browse files
benjaminpbenjaminp
committed
merge 3.5 (#27670)
2 parents 70214ad + c2fcbf4 commit 5a44fa1

2 files changed

Lines changed: 22 additions & 10 deletions

File tree

‎configure‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Guess values for system-dependent variables and create Makefiles.
33
# Generated by GNU Autoconf 2.69 for python 3.6.
44
#
5-
# Report bugs to <http://bugs.python.org/>.
5+
# Report bugs to <https://bugs.python.org/>.
66
#
77
#
88
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,7 @@ fi
267267
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
268268
else
269269
$as_echo "$0: Please tell [email protected] and
270-
$0: http://bugs.python.org/ about your system, including
270+
$0: https://bugs.python.org/ about your system, including
271271
$0: any error possibly output before this message. Then
272272
$0: install a modern shell, or manually run the script
273273
$0: under such a shell if you do have one."
@@ -582,7 +582,7 @@ PACKAGE_NAME='python'
582582
PACKAGE_TARNAME='python'
583583
PACKAGE_VERSION='3.6'
584584
PACKAGE_STRING='python 3.6'
585-
PACKAGE_BUGREPORT='http://bugs.python.org/'
585+
PACKAGE_BUGREPORT='https://bugs.python.org/'
586586
PACKAGE_URL=''
587587

588588
ac_unique_file="Include/object.h"
@@ -775,6 +775,7 @@ infodir
775775
docdir
776776
oldincludedir
777777
includedir
778+
runstatedir
778779
localstatedir
779780
sharedstatedir
780781
sysconfdir
@@ -885,6 +886,7 @@ datadir='${datarootdir}'
885886
sysconfdir='${prefix}/etc'
886887
sharedstatedir='${prefix}/com'
887888
localstatedir='${prefix}/var'
889+
runstatedir='${localstatedir}/run'
888890
includedir='${prefix}/include'
889891
oldincludedir='/usr/include'
890892
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1137,6 +1139,15 @@ do
11371139
| -silent | --silent | --silen | --sile | --sil)
11381140
silent=yes ;;
11391141

1142+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1143+
| --runstate | --runstat | --runsta | --runst | --runs \
1144+
| --run | --ru | --r)
1145+
ac_prev=runstatedir ;;
1146+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1147+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1148+
| --run=* | --ru=* | --r=*)
1149+
runstatedir=$ac_optarg ;;
1150+
11401151
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11411152
ac_prev=sbindir ;;
11421153
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1274,7 +1285,7 @@ fi
12741285
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12751286
datadir sysconfdir sharedstatedir localstatedir includedir \
12761287
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1277-
libdir localedir mandir
1288+
libdir localedir mandir runstatedir
12781289
do
12791290
eval ac_val=\$$ac_var
12801291
# Remove trailing slashes.
@@ -1427,6 +1438,7 @@ Fine tuning of the installation directories:
14271438
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14281439
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14291440
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1441+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14301442
--libdir=DIR object code libraries [EPREFIX/lib]
14311443
--includedir=DIR C header files [PREFIX/include]
14321444
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1546,7 +1558,7 @@ Some influential environment variables:
15461558
Use these variables to override the choices made by `configure' or to help
15471559
it to find libraries and programs with nonstandard names/locations.
15481560
1549-
Report bugs to <http://bugs.python.org/>.
1561+
Report bugs to <https://bugs.python.org/>.
15501562
_ACEOF
15511563
ac_status=$?
15521564
fi
@@ -1814,9 +1826,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
18141826
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
18151827
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
18161828
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1817-
( $as_echo "## -------------------------------------- ##
1818-
## Report this to http://bugs.python.org/ ##
1819-
## -------------------------------------- ##"
1829+
( $as_echo "## --------------------------------------- ##
1830+
## Report this to https://bugs.python.org/ ##
1831+
## --------------------------------------- ##"
18201832
) | sed "s/^/$as_me: WARNING: /" >&2
18211833
;;
18221834
esac
@@ -17017,7 +17029,7 @@ $config_files
1701717029
Configuration headers:
1701817030
$config_headers
1701917031
17020-
Report bugs to <http://bugs.python.org/>."
17032+
Report bugs to <https://bugs.python.org/>."
1702117033
1702217034
_ACEOF
1702317035
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ m4_define(PYTHON_VERSION, 3.6)
77

88
AC_PREREQ(2.65)
99

10-
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
10+
AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/)
1111

1212
AC_SUBST(BASECPPFLAGS)
1313
if test "$abs_srcdir" != "$abs_builddir"; then

0 commit comments

Comments
 (0)