[Emacs-diffs] /srv/bzr/emacs/trunk r109480: Set a minimum automake version

[Glenn Morris]

------------------------------------------------------------
revno: 109480
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-06 21:03:44 -0400
message:
  Set a minimum automake version
  
  * configure.ac: Require automake 1.11 (fairly arbitrarily).
  * autogen.sh (automake_min): Get it from configure.ac.
modified:
  ChangeLog
  autogen.sh
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-06 21:05:25 +0000
+++ b/ChangeLog 2012-08-07 01:03:44 +0000
@@ -1,3 +1,8 @@
+2012-08-07  Glenn Morris  <address@hidden>
+
+       * configure.ac: Require automake 1.11 (fairly arbitrarily).
+       * autogen.sh (automake_min): Get it from configure.ac.
+
 2012-08-06  Glenn Morris  <address@hidden>
 
        * configure.ac (BROKEN_GETWD) [unixware]: New define.

=== modified file 'autogen.sh'
--- a/autogen.sh        2012-08-02 01:59:19 +0000
+++ b/autogen.sh        2012-08-07 01:03:44 +0000
@@ -36,8 +36,9 @@
 ## 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".

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-06 20:29:45 +0000
+++ b/configure.ac      2012-08-07 01:03:44 +0000
@@ -26,7 +26,8 @@
 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