diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2b2ca76595a..61e749907c1 100644 --- 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 cabaaf014a8..9cfaa40eee5 100755 --- 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 81d80a59414..60a26207589 100644 --- 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 |