upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 02:22:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1434-explicitly-set-python-to-a-empty-string-with-without-python' into 'master'

Browse source 
Resolve "explicitly set PYTHON to a empty string with --without-python"

Closes #1434

See merge request isc-projects/bind9!2672
This commit is contained in:
Mark Andrews 2019-12-03 12:48:42 +00:00
commit 96475e7eb4
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5330. [bug] 'configure --without-python' was ineffective if
PYTHON was set in the environment. [GL #1434]
5329. [bug] Reconfiguring named caused memory to be leaked when any
GeoIP2 database was in use. [GL #1445]

5
configure vendored
View file

@ -968,6 +968,7 @@ LT_SYS_LIBRARY_PATH
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
PYTHON
MAXMINDDB_CFLAGS
MAXMINDDB_LIBS
MAXMINDDB_PREFIX
@ -1726,6 +1727,7 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
PYTHON path to python executable
MAXMINDDB_CFLAGS
C compiler flags for MAXMINDDB, overriding pkg-config
MAXMINDDB_LIBS
@ -12491,6 +12493,8 @@ except: exit(1)'
default_with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
# Check whether --with-python was given.
if test "${with_python+set}" = set; then :
withval=$with_python;
@ -12514,6 +12518,7 @@ fi
if test "$with_python" = "no"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python support" >&5
$as_echo_n "checking for Python support... " >&6; }
unset PYTHON
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
$as_echo "disabled" >&6; }
else

3
configure.ac
View file

@ -207,6 +207,8 @@ except: exit(1)'
default_with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
AC_ARG_VAR([PYTHON], [path to python executable])
AC_ARG_WITH([python],
AS_HELP_STRING([--with-python=PATH],
[specify path to Python interpreter]),
@ -221,6 +223,7 @@ AS_IF([test "$with_python" = "yes"],
AS_IF([test "$with_python" = "no"],
[AC_MSG_CHECKING([for Python support])
unset PYTHON
AC_MSG_RESULT([disabled])],
[for p in $with_python
do