]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
When --with-python is given to configure, use default search list for python binaries...
authorOndřej Surý <ondrej@sury.org>
Tue, 18 Dec 2018 14:05:52 +0000 (15:05 +0100)
committerOndřej Surý <ondrej@sury.org>
Tue, 18 Dec 2018 15:08:20 +0000 (16:08 +0100)
configure
configure.ac

index 243431b414d01726ddd6e44b9c9fc4c7a8733b41..6328aece5ccf6e8b65364e6e30ab55cd944c2a92 100755 (executable)
--- a/configure
+++ b/configure
@@ -12180,12 +12180,14 @@ except: exit(1)'
 testply='try: import ply
 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;
 else
-  with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"
+  with_python=$default_with_python
 fi
 
 
@@ -12197,6 +12199,10 @@ else
 fi
 
 
+if test "$with_python" = "yes"; then :
+  with_python=$default_with_python
+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; }
index 33be9c8e474e5cc97fa38bba8d5253fc78f65519..df4e281490e878f60b599230ce85186013e4d346 100644 (file)
@@ -191,15 +191,20 @@ except: exit(1)'
 testply='try: import ply
 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],
            AS_HELP_STRING([--with-python=PATH],
                           [specify path to Python interpreter]),
-           [], [with_python="python python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python2 python2.7"])
+           [], [with_python=$default_with_python])
 AC_ARG_WITH([python-install-dir],
            AS_HELP_STRING([--with-python-install-dir=PATH],
                           [installation directory for Python modules]),
            [], with_python_install_dir="")
 
+AS_IF([test "$with_python" = "yes"],
+      [with_python=$default_with_python])
+
 AS_IF([test "$with_python" = "no"],
       [AC_MSG_CHECKING([for Python support])
        AC_MSG_RESULT([disabled])],