Commit 545e1391 authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch '1397-install-isc-python-module' into 'master'

Resolve "Install ISC python module"

Closes #1397

See merge request !2620
parents 909dc1a1 8bbafeb5
Pipeline #26323 passed with stages
in 1 minute and 43 seconds
5326. [bug] Add python dependancy on 'distutils.core' to configure.
'distutils.core' is required for installation.
[GL #1397]
5325. [bug] Addressed several issues with TCP connections in
the netmgr: restored support for TCP connection
timeouts, restored TCP backlog support, actively
......
......@@ -191,9 +191,11 @@ or if you have Xcode already installed you can run `xcode-select --install`.
Portions of BIND that are written in Python, including
`dnssec-keymgr`, `dnssec-coverage`, `dnssec-checkds`, and some of the
system tests, require the `argparse` and `ply` modules to be available.
system tests, require the `argparse`, `ply` and `distutils.core` modules
to be available.
`argparse` is a standard module as of Python 2.7 and Python 3.2.
`ply` is available from [https://pypi.python.org/pypi/ply](https://pypi.python.org/pypi/ply).
`distutils.core` is required for installation.
#### <a name="opts"/> Compile-time options
......
......@@ -12485,6 +12485,9 @@ except: exit(1)'
testply='try: import ply
except: exit(1)'
 
testsetup='try: from distutils.core import setup
except: exit(1)'
default_with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
 
 
......@@ -12603,6 +12606,18 @@ $as_echo_n "checking Python module 'ply'... " >&6; }
if "$PYTHON" -c "$testply" 2>/dev/null; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
unset PYTHON
continue
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python module 'distutils.core setup'" >&5
$as_echo_n "checking Python module 'distutils.core setup'... " >&6; }
if "$PYTHON" -c "$testsetup" 2>/dev/null; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
......
......@@ -202,6 +202,9 @@ except: exit(1)'
testply='try: import ply
except: exit(1)'
testsetup='try: from distutils.core import setup
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_WITH([python],
......@@ -255,6 +258,13 @@ AS_IF([test "$with_python" = "no"],
unset PYTHON
continue])
AC_MSG_CHECKING([Python module 'distutils.core setup'])
AS_IF(["$PYTHON" -c "$testsetup" 2>/dev/null],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
unset PYTHON
continue])
# Stop looking any further once we find a Python interpreter
# satisfying all requirements.
break
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment