From 1295a9b8020d2c2c16525cf21fd6b05623af4f02 Mon Sep 17 00:00:00 2001 From: Rocky Bernstein Date: Sun, 22 Aug 2004 02:17:43 +0000 Subject: [PATCH] automake 1.8 works, so accept that as well. --- bootstrap | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index f30d3c2b68..bfadd4e01d 100755 --- a/bootstrap +++ b/bootstrap @@ -46,7 +46,15 @@ fi # Check for automake amvers="none" -if automake-1.7 --version >/dev/null 2>&1; then +if automake-1.8 --version >/dev/null 2>&1; then + amvers="-1.8" + # If we also have 1.6 (>> 1.6.1), use it instead because it is faster + if automake-1.6 --version >/dev/null 2>&1; then + if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then + amvers="-1.6" + fi + fi +elif automake-1.7 --version >/dev/null 2>&1; then amvers="-1.7" # If we also have 1.6 (>> 1.6.1), use it instead because it is faster if automake-1.6 --version >/dev/null 2>&1; then