Use AC_PREREQ to enforce correct version of autoconf

tomprince · Jan 5, 2010 · 2b36d48 · 2b36d48
1 parent 62072be
commit 2b36d48
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/bootstrap b/bootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 echo "Bootstrapping libmetrics"
-cd libmetrics && ./bootstrap
+cd libmetrics && ./bootstrap || exit 1
 cd ..
 
 MINOR=`grep 'GANGLIA_MINOR_VERSION=' configure.in | cut -d "=" -f 2`
@@ -27,7 +27,7 @@ automake --add-missing --copy 2>/dev/null
 echo "Running libtoolize" &&
 libtoolize --automake --copy && automake --add-missing --copy &&
 echo "Running autoconf" &&
-autoconf
+autoconf || exit 1
 
 echo &&
 echo "To begin installation, run \"./configure\" now"
diff --git a/configure.in b/configure.in
@@ -21,6 +21,8 @@ dnl ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
 dnl PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 dnl
 
+AC_PREREQ(2.61)
+
 AC_REVISION([$Revision$])
 AC_INIT(gmond/gmond.c)
 AC_CONFIG_AUX_DIR(build)

diff --git a/libmetrics/bootstrap b/libmetrics/bootstrap
@@ -13,5 +13,5 @@ automake --add-missing --copy 2>/dev/null
 echo "Running libtoolize" &&
 libtoolize --automake --copy && automake --add-missing --copy &&
 echo "Running autoconf" &&
-autoconf &&
+autoconf || exit 1
 echo
diff --git a/libmetrics/configure.in b/libmetrics/configure.in
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.61)
 AC_INIT(libmetrics.c)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(build)