diff --git a/ChangeLog b/ChangeLog index a3e8c32e2..807c9be1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-10-13 Gary Houston + + * autogen.sh (ac_version): try automake 1.7 too. + 2002-10-05 Marius Vollmer * autogen.sh: Make sure that $autoheader is always set. When we diff --git a/autogen.sh b/autogen.sh index 00252629b..522e9d1c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -75,10 +75,10 @@ fi #detect automake version -# configure.in reqs automake-1.6; try to find it -for suf in "-1.6" "1.6" "" false; do +# configure.in requires particular automake; try to find it +for suf in "-1.7" "1.7" "-1.6" "1.6" "" false; do version=`automake$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 10 + $2}'` - if test "0$version" -eq 16; then + if test "0$version" -eq 17 -o "0$version" -eq 16; then automake=automake$suf break fi @@ -89,7 +89,6 @@ if test -z "$automake"; then exit 1 fi - ################################################################ $autoheader $autoconf