Index: bootstrap
===================================================================
RCS file: /sources/avr-libc/avr-libc/bootstrap,v
retrieving revision 1.4.2.3
diff -u -p -r1.4.2.3 bootstrap
--- bootstrap	19 Sep 2008 13:43:17 -0000	1.4.2.3
+++ bootstrap	30 Jan 2009 17:15:40 -0000
@@ -16,25 +16,24 @@
 : ${AUTOMAKE="automake${AM_VER}"}
 
 # Verify autoconf version
-
-AUTOCONF_VER=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | \
-              cut -d ' ' -f 4) 2>/dev/null`
-if [ "$AUTOCONF_VER" != "2.59" -a "$AUTOCONF_VER" != "2.60" -a "$AUTOCONF_VER" != "2.61" \
-     -a "$AUTOCONF_VER" != "2.62" ]
+AUTOCONF_VERSION=`(${AUTOCONF} --version 2>/dev/null | head -n 1 | cut -d ' ' -f 4) 2>/dev/null`
+AUTOCONF_VERSION_MAJOR=`(echo ${AUTOCONF_VERSION} | cut -d . -f 1) 2>/dev/null`
+AUTOCONF_VERSION_MINOR=`(echo ${AUTOCONF_VERSION} | cut -d . -f 2) 2>/dev/null`
+if test $(($AUTOCONF_VERSION_MAJOR)) -eq 2 -a $((${AUTOCONF_VERSION_MINOR})) -lt 59
 then
-	echo "You need to use autoconf version 2.59, 2.60, 2.61, or 2.62."
-	echo "You are using `${AUTOCONF} --version | head -n 1`."
+	echo "You need to use autoconf version 2.59 or greater."
+	echo "You are using version ${AUTOCONF_VERSION}."
 	exit 1
 fi
 
 # Verify automake version
-
-AUTOMAKE_VER=`(${AUTOMAKE} --version | head -n 1 | \
-              cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null`
-if [ "$AUTOMAKE_VER" != "1.8" -a "$AUTOMAKE_VER" != "1.9" -a "$AUTOMAKE_VER" != "1.10" ]
+AUTOMAKE_VERSION=`(${AUTOMAKE} --version | head -n 1 | cut -d ' ' -f 4 | cut -d '.' -f -2) 2>/dev/null`
+AUTOMAKE_VERSION_MAJOR=`(echo ${AUTOMAKE_VERSION} | cut -d . -f 1) 2>/dev/null`
+AUTOMAKE_VERSION_MINOR=`(echo ${AUTOMAKE_VERSION} | cut -d . -f 2) 2>/dev/null`
+if test $(($AUTOMAKE_VERSION_MAJOR)) -eq 1 -a $((${AUTOMAKE_VERSION_MINOR})) -lt 8
 then
-	echo "You need to use automake version 1.8, 1.9, or 1.10."
-	echo "You are using `${AUTOMAKE} --version | head -n 1`."
+	echo "You need to use automake version 1.8 or greater."
+	echo "You are using version ${AUTOMAKE_VERSION}."
 	exit 1
 fi