When --with-python is given to configure, use default search list for python binaries...

(cherry picked from commit 3951cb053b4d451fdb0580294fb78bc792b828da)

diff --git a/configure b/configure
index e3143cdc7e31e619d5c3731fcbaac353b5657353..c5a9256c66a8a818cf014c3c8604ae8bd77d45f3 100755 (executable)
--- a/configure
+++ b/configure
@@ -12512,12 +12512,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
 
 
@@ -12529,6 +12531,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; }

diff --git a/configure.ac b/configure.ac
index cd5533314bd276ac758199d80ba2b3c615f2c6f1..26c509e74242ef6b0e9e4fa7ffe6d565195ee02b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,15 +249,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])],