summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-12-16 18:03:28 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-12-16 18:03:28 (GMT)
commit79154260923bf6f20c7503c91f714ac2d1c7eb3b (patch)
tree40af458a7e0ce882872821e176e895eab520c117 /configure
parent59090df851f0d50231ad90ba9b3cd79d4b88f072 (diff)
Better check for automake, check for either curl or wget:
- automake must be at least 1.10 to correctly setup MPFR - either one of curl or wget is needed to retrieve the tarballs /trunk/configure | 7 4 3 0 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index ce32ac7..27a6205 100755
--- a/configure
+++ b/configure
@@ -41,8 +41,9 @@ sed/
bison/
flex/
makeinfo/
-automake/
+automake/\(GNU automake\) [[:digit:]]+\.[[:digit:]]{2,}
libtool/
+curl/|wget/
patch/
tar/
gzip/
@@ -253,11 +254,11 @@ fi
# If we can't get the revision number, use date
printf "Computing version string... "
case "${VERSION}" in
- *+svn)
+ *+svn|svn)
REVISION=$(LC_ALL=C svnversion)
case "${REVISION}" in
exported)
- VERSION="${VERSION}unknown@$(date +%Y%m%d.%H%M%S)";;
+ 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 |egrep 'Repository Root: ' |cut -d ' ' -f 3-)