diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -327,16 +327,17 @@ has_or_abort prog=make \ ver='^GNU Make (3.[89][[:digit:]]|[4-9])' \ err="GNU 'make' 3.80 or above was not found" has_or_abort prog=gcc -has_or_abort prog=awk +has_or_abort prog="awk gawk" ver='^GNU Awk' err="GNU 'awk' was not found" has_or_abort prog=bison has_or_abort prog=flex has_or_abort prog=makeinfo has_or_abort prog=automake \ - ver='\(GNU automake\) (1\.[[:digit:]]{2,}\.|[2-9][[:digit:]]*\.)' \ + ver='\(GNU automake\) (1\.[[:digit:]]{2,}|[2-9][[:digit:]]*\.)' \ err="'automake' 1.10 or above was not found" has_or_abort prog=libtool \ ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)' \ err="'libtool' 1.5.26 or above was not found" +has_or_abort prog=stat ver='GNU coreutils' has_or_abort prog="curl wget" has_or_abort prog=cvs has_or_abort prog=patch @@ -364,23 +365,15 @@ has_or_abort lib="${ncurses_libs}" \ # If this version is a svn snapshot, try to get the revision number # If we can't get the revision number, use date case "${VERSION}" in - *+svn|svn) - has_or_abort prog=svnversion + *+hg|hg) + has_or_abort prog=hg printf "Computing version string... " - REVISION="$( LC_ALL=C svnversion )" + REVISION="$( hg id -n 2>/dev/null )" case "${REVISION}" in - exported) + "") VERSION="${VERSION}_unknown@$( date +%Y%m%d.%H%M%S )";; *) - URL="$( LC_ALL=C svn info 2>/dev/null \ - |egrep 'URL: ' \ - |cut -d ' ' -f 2- \ - )" - ROOT="$( LC_ALL=C svn info 2>/dev/null \ - |"${grep}" '^Repository Root: ' \ - |cut -d ' ' -f 3- \ - )" - VERSION="${VERSION}${URL#${ROOT}}@${REVISION}" + VERSION="${VERSION}_$( hg id -b )@${REVISION%%+}_$( hg id -i )" ;; esac # Arrange to have no / in the directory name, no need to create an |