diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-05-31 20:52:17 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-05-31 20:52:17 -0500 |
commit | 8a652446e501ef5fe1e87dad7db19b0691a811ef (patch) | |
tree | d77f074a95967ea8b190a76a95d44424e63d2bf4 /configure | |
parent | 4cd5517097bb7975d757576b6dd29a7027fc92f5 (diff) | |
download | cpython-8a652446e501ef5fe1e87dad7db19b0691a811ef.tar.gz |
remove __version__s dependent on subversion keyword expansion (closes #12221)
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 128 |
1 files changed, 65 insertions, 63 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision. +# From configure.in HGVERSION. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.3. # @@ -638,10 +638,6 @@ INSTALL_SCRIPT INSTALL_PROGRAM HAS_PYTHON DISABLE_ASDLGEN -HAS_HG -HGBRANCH -HGTAG -HGVERSION ARFLAGS AR RANLIB @@ -692,6 +688,10 @@ UNIVERSALSDK CONFIG_ARGS SOVERSION VERSION +HAS_HG +HGBRANCH +HGTAG +HGVERSION target_alias host_alias build_alias @@ -2687,6 +2687,66 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +if test -e $srcdir/.hg/00changelog.i +then +# Extract the first word of "hg", so it can be a program name with args. +set dummy hg; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_HAS_HG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAS_HG"; then + ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_HAS_HG="found" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found" +fi +fi +HAS_HG=$ac_cv_prog_HAS_HG +if test -n "$HAS_HG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5 +$as_echo "$HAS_HG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +else +HAS_HG=no-repository +fi +if test $HAS_HG = found +then + HGVERSION="hg id -i \$(srcdir)" + HGTAG="hg id -t \$(srcdir)" + HGBRANCH="hg id -b \$(srcdir)" +else + HGVERSION="" + HGTAG="" + HGBRANCH="" +fi + + + ac_config_headers="$ac_config_headers pyconfig.h" @@ -5139,64 +5199,6 @@ then fi - - - -if test -e $srcdir/.hg/00changelog.i -then -# Extract the first word of "hg", so it can be a program name with args. -set dummy hg; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_HAS_HG+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HAS_HG"; then - ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_HAS_HG="found" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found" -fi -fi -HAS_HG=$ac_cv_prog_HAS_HG -if test -n "$HAS_HG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5 -$as_echo "$HAS_HG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -else -HAS_HG=no-repository -fi -if test $HAS_HG = found -then - HGVERSION="hg id -i \$(srcdir)" - HGTAG="hg id -t \$(srcdir)" - HGBRANCH="hg id -b \$(srcdir)" -else - HGVERSION="" - HGTAG="" - HGBRANCH="" -fi - - DISABLE_ASDLGEN="" # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 |