Set a minimum automake version

* configure.ac: Require automake 1.11 (fairly arbitrarily).
* autogen.sh (automake_min): Get it from configure.ac.

diff --git a/ChangeLog b/ChangeLog
index 2b2ca76595aa116b716818b382cb5a0bf92a208c..61e749907c166a17086929a1cdf200c51dab2660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-07  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Require automake 1.11 (fairly arbitrarily).
+       * autogen.sh (automake_min): Get it from configure.ac.
+
 2012-08-06  Glenn Morris  <rgm@gnu.org>
 
        * configure.ac (BROKEN_GETWD) [unixware]: New define.

diff --git a/autogen.sh b/autogen.sh
index cabaaf014a874453683cea7c71b5cf8a83ce3509..9cfaa40eee58f256421621ea1c429a6ec554523b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,8 +36,9 @@ progs="autoconf automake"
 ## Minimum versions we need:
 autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac`
 
-## FIXME how to determine this from the sources?
-automake_min=1.11
+## This will need improving if more options are ever added to the
+## AM_INIT_AUTOMAKE call.
+automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`
 
 
 ## $1 = program, eg "autoconf".

diff --git a/configure.ac b/configure.ac
index 81d80a59414a63fc29cd84a313023b802e5625e5..60a262075896b05fa2d777a50235569668d19afb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ AC_INIT(emacs, 24.1.50)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 AC_CONFIG_AUX_DIR(build-aux)
-AM_INIT_AUTOMAKE
+dnl Fairly arbitrary, older versions might work too.
+AM_INIT_AUTOMAKE(1.11)
 
 dnl Support for --program-prefix, --program-suffix and
 dnl --program-transform-name options