diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-08-24 19:56:07 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-08-24 19:56:07 +0000 |
| commit | 9e9f797472a14cc31681bcd551071b8f7e8e478e (patch) | |
| tree | e123ab8dafbd28c70e86ffaa8d1594a37193e66c /m4/init.m4 | |
| parent | 4de3f2b8f05b5f46d32af7585e02302382688cbb (diff) | |
| download | automake-9e9f797472a14cc31681bcd551071b8f7e8e478e.tar.gz | |
* configure.in: Require Autoconf 2.57b to be sure
aclocal can use autom4te --language Autoconf-without-aclocal-m4.
* m4/init.m4: Likewise. Move the AC_PREREQ and m4_pattern_allow
calls inside the AM_INIT_AUTOMAKE macro.
* m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
AC_PREREQ calls inside the macros.
* m4/header.m4: Remove AC_PREREQ.
Diffstat (limited to 'm4/init.m4')
| -rw-r--r-- | m4/init.m4 | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index 2bf9dd3e3..f0222ee6e 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -21,13 +21,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -# serial 10 - -AC_PREREQ([2.55]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +# serial 11 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) @@ -41,8 +35,12 @@ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl +[AC_PREREQ([2.57b])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then |