diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure b/configure index 33ac91b8275..b6ff396caf6 100755 --- a/configure +++ b/configure @@ -5874,7 +5874,7 @@ esac { echo "$as_me:$LINENO: checking binary size reduction linker flags" >&5 echo $ECHO_N "checking binary size reduction linker flags... $ECHO_C" >&6; } { echo "$as_me:$LINENO: checking for compiler -Wl,--gc-sections option" >&5 -echo $ECHO_N "checking for compiler -Wl,-R<path> option... $ECHO_C" >&6; } +echo $ECHO_N "checking for compiler -Wl,--gc-sections option... $ECHO_C" >&6; } if test "${llvm_cv_link_use_gc_sections+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12480,8 +12480,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 @@ -12507,11 +12509,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 @@ -12525,6 +12522,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 |