From ecbf33009b818b73d1e63238f8bbbbd4bb7bb6c0 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 5 Sep 2017 01:41:33 +0000 Subject: [PATCH] regen v9_9 --- configure | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 4040089f03..f827200cc7 100755 --- a/configure +++ b/configure @@ -858,6 +858,8 @@ ISC_PLATFORM_NORETURN_PRE ISC_PLATFORM_HAVELONGLONG ISC_SOCKADDR_LEN_T expanded_sysconfdir +PYTHON_INSTALL_LIB +PYTHON_INSTALL_DIR PYTHON_TOOLS COVERAGE CHECKDS @@ -978,6 +980,7 @@ enable_warn_shadow enable_warn_error enable_developer with_python +with_python_install_dir enable_newstats enable_rrl enable_kqueue @@ -1710,6 +1713,8 @@ Optional Packages: --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). --with-python=PATH Specify path to python interpreter + --with-python-install-dir=PATH + installation directory for Python modules --with-openssl=PATH Build with OpenSSL yes|no|path. (Required for DNSSEC) --with-ecdsa OpenSSL ECDSA @@ -11658,6 +11663,14 @@ else fi +# Check whether --with-python-install-dir was given. +if test "${with_python_install_dir+set}" = set; then : + withval=$with_python_install_dir; use_python_install_dir="$withval" +else + use_python_install_dir="unspec" +fi + + python="python python3 python3.5 python3.4 python3.3 python3.2 python2 python2.7" testargparse='try: import argparse @@ -11753,8 +11766,19 @@ $as_echo "not found" >&6; } continue fi done - if test "X$PYTHON" = "X" + if test "X$PYTHON" != "X" then + case "$use_python_install_dir" in + unspec) + PYTHON_INSTALL_DIR="" + PYTHON_INSTALL_LIB="" + ;; + *) + PYTHON_INSTALL_DIR="$use_python_install_dir" + PYTHON_INSTALL_LIB="--install-lib=$use_python_install_dir" + ;; + esac + else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5 $as_echo_n "checking for python support... " >&6; } case "$use_python" in @@ -11854,6 +11878,8 @@ fi + + # # Special processing of paths depending on whether --prefix, # --sysconfdir or --localstatedir arguments were given. What's