From be3d34a158b994f2af727b6ba5b85843149991cd Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Sun, 16 Mar 2014 03:00:06 +0000
Subject: python: AC_PATH_PROG -> AC_PATH_PROGS and fix search order

.. to python26 python2 python as some distros have python == python3

Change-Id: I2e1fbb6aa23614abc6df1581097400a31b7badac
---
 autoconf/configure.ac |  2 +-
 configure             | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 590433b7531..432c947621a 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -1408,7 +1408,7 @@ else
     AC_MSG_WARN([specified python ($PYTHON) is not usable, searching path])
   fi
 
-  AC_PATH_PROG([PYTHON], [python python2 python26],
+  AC_PATH_PROGS([PYTHON], [python26 python2 python],
                [AC_MSG_RESULT([not found])
                 AC_MSG_ERROR([could not find python 2.5 or higher])])
 fi
diff --git a/configure b/configure
index a4f53e48217..2c494fcc377 100755
--- a/configure
+++ b/configure
@@ -11908,8 +11908,10 @@ else
 echo "$as_me: WARNING: specified python ($PYTHON) is not usable, searching path" >&2;}
   fi
 
-  # Extract the first word of "python python2 python26", so it can be a program name with args.
-set dummy python python2 python26; ac_word=$2
+  for ac_prog in python26 python2 python
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PYTHON+set}" = set; then
@@ -11935,11 +11937,6 @@ done
 done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-                { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
-echo "$as_me: error: could not find python 2.5 or higher" >&2;}
-   { (exit 1); exit 1; }; }"
   ;;
 esac
 fi
@@ -11953,6 +11950,14 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
+  test -n "$PYTHON" && break
+done
+test -n "$PYTHON" || PYTHON="{ echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+                { { echo "$as_me:$LINENO: error: could not find python 2.5 or higher" >&5
+echo "$as_me: error: could not find python 2.5 or higher" >&2;}
+   { (exit 1); exit 1; }; }"
+
 fi
 
 { echo "$as_me:$LINENO: checking for python >= 2.5" >&5
-- 
cgit v1.2.3