Require automake 1.7 (and thus aclocal 1.7) which requires autoconf 2.54. Changed since newer libtools may fail to work with older automake versions such as 1.4. I bet this will annoy people with older tool chains :(

2 files changed, 82 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 32e5c0eb..c1d3154d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-09  Dave Beckett  <Dave.Beckett@bristol.ac.uk>
+
+	* autogen.sh: Require automake 1.7 (and thus aclocal 1.7) which
+	requires autoconf 2.54. Changed since newer libtools may fail to
+	work with older automake versions such as 1.4.  I bet this will
+	annoy people with older tool chains :(
+
 2004-07-05  Carl Worth  <cworth@isi.edu>
 
 	* src/cairo.c (CAIRO_CHECK_SANITY): Remove errant semicolon from
diff --git a/autogen.sh b/autogen.sh
index fe847d9e..9e8e594d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,8 @@
 
 set -e
 
+PACKAGE=cairo
+
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 LIBTOOLIZE_FLAGS="--copy --force"
 ACLOCAL=${ACLOCAL-aclocal}
@@ -11,8 +13,75 @@ AUTOMAKE=${AUTOMAKE-automake}
 AUTOMAKE_FLAGS="--add-missing"
 AUTOCONF=${AUTOCONF-autoconf}
 
+# automake 1.8 requires autoconf 2.58
+# automake 1.7 requires autoconf 2.54
+automake_min_vers=1.7
+aclocal_min_vers=$automake_min_vers
+autoconf_min_vers=2.54
+libtoolize_min_vers=1.4
+
+
 ARGV0=$0
 
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($AUTOCONF --version | awk 'NR==1 { if( $3 >= '$autoconf_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`$AUTOCONF' is too old."
+       echo "           (version $autoconf_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo
+    echo "$ARGV0: ERROR: You must have \`$AUTOCONF' installed to compile $PACKAGE."
+    echo "           (version $autoconf_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
+  if ($AUTOMAKE --version | awk 'NR==1 { if( $4 >= '$automake_min_vers') \
+			     exit 1; exit 0; }');
+     then
+     echo "$ARGV0: ERROR: \`$AUTOMAKE' is too old."
+     echo "           (version $automake_min_vers or newer is required)"
+     DIE="yes"
+  fi
+  if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
+    if ($ACLOCAL --version | awk 'NR==1 { if( $4 >= '$aclocal_min_vers' ) \
+						exit 1; exit 0; }' );
+    then
+      echo "$ARGV0: ERROR: \`$ACLOCAL' is too old."
+      echo "           (version $aclocal_min_vers or newer is required)"
+      DIE="yes"
+    fi
+  else
+    echo
+    echo "$ARGV0: ERROR: Missing \`$ACLOCAL'"
+    echo "           The version of $AUTOMAKE installed doesn't appear recent enough."
+    DIE="yes"
+  fi
+else
+    echo
+    echo "$ARGV0: ERROR: You must have \`$AUTOMAKE' installed to compile $PACKAGE."
+    echo "           (version $automake_min_vers or newer is required)"
+    DIE="yes"
+fi
+
+if (libtoolize --version) < /dev/null > /dev/null 2>&1 ; then
+    if (libtoolize --version | awk 'NR==1 { if( $4 >= '$libtoolize_min_vers') \
+			       exit 1; exit 0; }');
+    then
+       echo "$ARGV0: ERROR: \`libtoolize' is too old."
+       echo "           (version $libtoolize_min_vers or newer is required)"
+       DIE="yes"
+    fi
+else
+    echo
+    echo "$ARGV0: ERROR: You must have \`libtoolize' installed to compile $PACKAGE."
+    echo "           (version $libtoolize_min_vers or newer is required)"
+    DIE="yes"
+fi
+
 if test -z "$ACLOCAL_FLAGS"; then
     acdir=`aclocal --print-ac-dir`
     if [ ! -f $acdir/pkg.m4 ]; then
@@ -24,10 +93,15 @@ if test -z "$ACLOCAL_FLAGS"; then
 	echo ""
 	echo "pkg-config is available from:"
 	echo "http://www.freedesktop.org/software/pkgconfig/"
-	exit 1
+	DIE=yes
     fi
 fi
 
+if test "X$DIE" != X; then
+  exit 1
+fi
+
+
 if test -z "$*"; then
   echo "$ARGV0:	Note: \`./configure' will be run with no arguments."
   echo "		If you wish to pass any to it, please specify them on the"