From 579f0d06710801c8d13cae9d28e05f650749846a Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 30 Sep 2002 07:20:35 +0000 Subject: [PATCH] list preferred autotools Original commit message from CVS: list preferred autotools --- autogen.sh | 12 ++++++++---- common | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 12031b76dc..281175f99f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -28,10 +28,14 @@ autogen_options $@ echo -n "+ check for build tools" if test ! -z $NOCHECK; then echo " skipped"; else echo; fi -version_check "autoconf" "$AUTOCONF" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 -version_check "automake" "$AUTOMAKE" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 -version_check "libtool" "" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 -version_check "pkg-config" "" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 +version_check "autoconf" "$AUTOCONF autoconf autoconf-2.53 autoconf-2.52" \ + "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 +version_check "automake" "$AUTOMAKE automake automake-1.6 automake-1.5" \ + "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 +version_check "libtool" "" \ + "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 +version_check "pkg-config" "" \ + "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 die_check $DIE diff --git a/common b/common index 2f6d9cfdaa..fa2e4df50f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2f6d9cfdaaa83ab454d263d6eba88046debadc2d +Subproject commit fa2e4df50fd965b1dbd3b35b87d914ff87362815