diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-09 06:56:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-09 06:56:57 +0000 |
| commit | b2631bf0dc9579ddfb4bc1afdf7998c12fa268af (patch) | |
| tree | 50b8461717cbe7b8c26049f59d0d408fd99d9747 | |
| parent | b575a08d23ced75e304869d9e3f06b15c5368ab7 (diff) | |
| parent | be3d34a158b994f2af727b6ba5b85843149991cd (diff) | |
| download | llvm-release_34.tar.gz | |
Merge "python: AC_PATH_PROG -> AC_PATH_PROGS and fix search order" into release_34release_34
| -rw-r--r-- | autoconf/configure.ac | 2 | ||||
| -rwxr-xr-x | 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 |