[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Require Autoconf 2.57b and move AC_PREREQ inside macros.
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: Require Autoconf 2.57b and move AC_PREREQ inside macros. |
Date: |
Sun, 24 Aug 2003 21:55:56 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) |
I'm checking this in.
Actually I'm not sure why we have so many AC_PREREQ instead of
just one in AM_INIT_AUTOMAKE. Are these macros used outside
Automake? (That doesn't really make lots of sense to me, except
maybe for AM_WITH_REGEX.)
2003-08-24 Alexandre Duret-Lutz <address@hidden>
* 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.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.223
diff -u -r1.223 NEWS
--- NEWS 24 Aug 2003 02:00:55 -0000 1.223
+++ NEWS 24 Aug 2003 19:50:46 -0000
@@ -6,7 +6,7 @@
* Requirements
- - Autoconf 2.55 or greater is required.
+ - Autoconf 2.57b or greater is required.
* New features
Index: configure.in
===================================================================
RCS file: /cvs/automake/automake/configure.in,v
retrieving revision 1.128
diff -u -r1.128 configure.in
--- configure.in 7 Aug 2003 00:32:29 -0000 1.128
+++ configure.in 24 Aug 2003 19:50:48 -0000
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-AC_PREREQ(2.54)
+AC_PREREQ(2.57b)
AC_INIT([GNU Automake], [1.7a], address@hidden)
AC_CONFIG_SRCDIR(automake.in)
Index: m4/auxdir.m4
===================================================================
RCS file: /cvs/automake/automake/m4/auxdir.m4,v
retrieving revision 1.5
diff -u -r1.5 auxdir.m4
--- m4/auxdir.m4 2 Jun 2003 07:08:40 -0000 1.5
+++ m4/auxdir.m4 24 Aug 2003 19:50:49 -0000
@@ -55,10 +55,9 @@
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
Index: m4/cond.m4
===================================================================
RCS file: /cvs/automake/automake/m4/cond.m4,v
retrieving revision 1.10
diff -u -r1.10 cond.m4
--- m4/cond.m4 2 Jun 2003 07:08:40 -0000 1.10
+++ m4/cond.m4 24 Aug 2003 19:50:49 -0000
@@ -17,15 +17,14 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 5
-
-AC_PREREQ(2.52)
+# serial 6
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
Index: m4/header.m4
===================================================================
RCS file: /cvs/automake/automake/m4/header.m4,v
retrieving revision 1.21
diff -u -r1.21 header.m4
--- m4/header.m4 2 Jun 2003 07:08:40 -0000 1.21
+++ m4/header.m4 24 Aug 2003 19:50:49 -0000
@@ -17,9 +17,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-AC_PREREQ([2.52])
-
-# serial 6
+# serial 7
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.55
diff -u -r1.55 init.m4
--- m4/init.m4 13 Mar 2003 21:43:47 -0000 1.55
+++ m4/init.m4 24 Aug 2003 19:50:49 -0000
@@ -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 @@
# 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
Index: m4/lex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lex.m4,v
retrieving revision 1.8
diff -u -r1.8 lex.m4
--- m4/lex.m4 2 Jun 2003 07:08:40 -0000 1.8
+++ m4/lex.m4 24 Aug 2003 19:50:49 -0000
@@ -19,16 +19,15 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 3
-
-AC_PREREQ(2.50)
+# serial 4
# AM_PROG_LEX
# -----------
# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
# "missing" invocation, for better error output.
AC_DEFUN([AM_PROG_LEX],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
AC_REQUIRE([AC_PROG_LEX])dnl
if test "$LEX" = :; then
LEX=${am_missing_run}flex
Index: m4/regex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/regex.m4,v
retrieving revision 1.11
diff -u -r1.11 regex.m4
--- m4/regex.m4 2 Jun 2003 07:08:40 -0000 1.11
+++ m4/regex.m4 24 Aug 2003 19:50:49 -0000
@@ -20,8 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 4
-AC_PREREQ(2.50)
+# serial 5
# AM_WITH_REGEX
# -------------
@@ -39,7 +38,8 @@
# FIXME: This macro seems quite obsolete now since rx doesn't seem to
# be maintained, while regex is.
AC_DEFUN([AM_WITH_REGEX],
-[AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
+[AC_PREREQ(2.50)dnl
+AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
AC_ARG_WITH(regex,
[ --without-regex use GNU rx in lieu of gawk's regex for matching],
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: Require Autoconf 2.57b and move AC_PREREQ inside macros.,
Alexandre Duret-Lutz <=