[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
AU_DEFUN obsolete functions
|
From: |
Alexandre Duret-Lutz |
|
Subject: |
AU_DEFUN obsolete functions |
|
Date: |
21 Apr 2002 22:24:50 +0200 |
|
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
This is a patch that we can't apply before some work is done in
Autoconf. I'm sending it in before I lose it, and in case
someone else wanted to work in this area.
Basically there are two issues, one of which is already solved.
1. Autoconf 2.53 does not honor AU_DEFUN from aclocal.m4.
The current CVS version does, so we can wait for the next
release and depend on this one. (I believe there will be
other reasons to depend on a greater Autoconf version.)
2. Some AU_DEFUNs in Autoconf substitute calls to AC_REQUIRE,
which is not supported at the top-level. This causes the
last $AUTOCONF call of obsolete.test (the new version from
this patch) to fail.
Index: ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,1 +1,18 @@
+2002-04-21 Alexandre Duret-Lutz <address@hidden>
+
+ * m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4 : New files.
+ * m4/Makefile.am (dist_m4data_DATA): Add them.
+ * m4/ccstdc.m4 (fp_PROG_CC_STDC): New AU_DEFUN.
+ * m4/dmalloc.m4 (fp_WITH_DMALLOC): Likewise.
+ * m4/lispdir.m4 (ud_PATH_LISPDIR): Likewise.
+ * m4/maintainer.m4 (jm_MAINTAINER_MODE): Likewise.
+ * m4/protos.m4 (fp_C_PROTOTYPES): Likewise.
+ * m4/regex.m4 (fp_WITH_REGEX): Likewise.
+ * aclocal.in (obsolete, obsolete_rx): Remove.
+ (scan_configure): Don't grep for obsolete macros.
+ * tests/defs (AUTOUPDATE): Define.
+ * Makefile.am (maintainer-check): Check for misuses of autoupdate.
+ * tests/obsolete.test: Exercize the AU_DEFUN macros from
+ m4/obsolete.m4.
+
Index: Makefile.am
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- Makefile.am 17 Apr 2002 18:28:47 -0000 1.1
+++ Makefile.am 21 Apr 2002 20:10:53 -0000
@@ -155,6 +155,11 @@
echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF"
instead.' 1>&2; \
exit 1; \
fi
+## Tests should never call autoupdate directly.
+ @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*autoupdate';
then \
+ echo 'Do not run "autoupdate" in the above tests. Use "$$AUTOUPDATE"
instead.' 1>&2; \
+ exit 1; \
+ fi
## Tests should never call automake directly.
@if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*automake';
then \
echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE"
instead.' 1>&2; \
Index: aclocal.in
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/aclocal.in,v
retrieving revision 1.1
diff -u -r1.1 aclocal.in
--- aclocal.in 17 Apr 2002 18:28:48 -0000 1.1
+++ aclocal.in 18 Apr 2002 19:00:52 -0000
@@ -76,44 +76,8 @@
# How much to say.
$verbose = 0;
-# Map from obsolete macros to hints for new macros.
-my %obsolete_macros =
- (
- 'AC_FEATURE_CTYPE' => "use `AC_HEADER_STDC'",
- 'AC_FEATURE_ERRNO' => "add `strerror' to
`AC_REPLACE_FUNCS(...)'",
- 'AC_FEATURE_EXIT' => '',
- 'AC_SYSTEM_HEADER' => '',
-
- # Note that we do not handle this one, because it is still run
- # from AM_CONFIG_HEADER.
- # 'AC_CONFIG_HEADER' => "use `AM_CONFIG_HEADER'",
-
- 'fp_C_PROTOTYPES' => "use `AM_C_PROTOTYPES'",
- 'fp_PROG_CC_STDC' => "use `AM_PROG_CC_STDC'",
- 'fp_PROG_INSTALL' => "use `AC_PROG_INSTALL'",
- 'fp_WITH_DMALLOC' => "use `AM_WITH_DMALLOC'",
- 'fp_WITH_REGEX' => "use `AM_WITH_REGEX'",
- 'gm_PROG_LIBTOOL' => "use `AM_PROG_LIBTOOL'",
- 'jm_MAINTAINER_MODE' => "use `AM_MAINTAINER_MODE'",
- 'md_TYPE_PTRDIFF_T' => "add `ptrdiff_t' to `AC_CHECK_TYPES(...)'",
- 'ud_PATH_LISPDIR' => "use `AM_PATH_LISPDIR'",
- 'ud_GNU_GETTEXT' => "use `AM_GNU_GETTEXT'",
-
- # Now part of autoconf proper, under a different name.
- 'fp_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'",
- 'AM_SANITY_CHECK_CC' => "automatically done by `AC_PROG_CC'",
- 'AM_PROG_INSTALL' => "use `AC_PROG_INSTALL'",
- 'AM_EXEEXT' => "automatically done by
`AC_PROG_(CC|CXX|F77)'",
- 'AM_CYGWIN32' => "use `AC_CYGWIN'",
- 'AM_MINGW32' => "use `AC_MINGW32'",
- 'AM_FUNC_MKTIME' => "use `AC_FUNC_MKTIME'",
- );
-
-# Regexp to match the above macros.
-$obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b';
-
# Matches a macro definition.
-$ac_defun_rx = "AC_DEFUN\\(\\[?([^],)\n]+)\\]?";
+$ac_defun_rx = "A[CU]_DEFUN\\(\\[?([^],)\n]+)\\]?";
# Matches an AC_REQUIRE line.
$ac_require_rx = "AC_REQUIRE\\(\\[?([^])]*)\\]?\\)";
@@ -248,18 +212,6 @@
# Remove comments from current line.
s/\bdnl\b.*$//;
s/\#.*$//;
-
- if (/$obsolete_rx/o)
- {
- local ($hint) = '';
- if ($obsolete_macros{$1} ne '')
- {
- $hint = '; ' . $obsolete_macros{$1};
- }
- warn "aclocal: $configure_ac: $.: `$1' is obsolete$hint\n";
- $exit_status = 1;
- next;
- }
# Search for things we know about. The "search" sub is
# constructed dynamically by scan_m4_files. The last
Index: m4/Makefile.am
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- m4/Makefile.am 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/Makefile.am 18 Apr 2002 19:38:27 -0000
@@ -21,10 +21,36 @@
m4datadir = $(datadir)/aclocal-$(APIVERSION)
-dist_m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
-dmalloc.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 lispdir.m4 \
-make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 options.m4 \
-protos.m4 python.m4 regex.m4 runlog.m4 sanity.m4 strip.m4 termios.m4 \
+dist_m4data_DATA = \
+as.m4 \
+auxdir.m4 \
+ccstdc.m4 \
+cond.m4 \
+depend.m4 \
+depout.m4 \
+dmalloc.m4 \
+gcj.m4 \
+header.m4 \
+init.m4 \
+install-sh.m4 \
+lex.m4 \
+lispdir.m4 \
+maintainer.m4 \
+make.m4 \
+minuso.m4 \
+missing.m4 \
+multi.m4 \
+obsol-gt.m4 \
+obsol-lt.m4 \
+obsolete.m4 \
+options.m4 \
+protos.m4 \
+python.m4 \
+regex.m4 \
+runlog.m4 \
+sanity.m4 \
+strip.m4 \
+termios.m4 \
winsz.m4
nodist_m4data_DATA = amversion.m4
Index: m4/Makefile.in
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- m4/Makefile.in 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/Makefile.in 21 Apr 2002 20:01:55 -0000
@@ -86,10 +86,36 @@
m4datadir = $(datadir)/aclocal-$(APIVERSION)
-dist_m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
-dmalloc.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 lispdir.m4 \
-make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 options.m4 \
-protos.m4 python.m4 regex.m4 runlog.m4 sanity.m4 strip.m4 termios.m4 \
+dist_m4data_DATA = \
+as.m4 \
+auxdir.m4 \
+ccstdc.m4 \
+cond.m4 \
+depend.m4 \
+depout.m4 \
+dmalloc.m4 \
+gcj.m4 \
+header.m4 \
+init.m4 \
+install-sh.m4 \
+lex.m4 \
+lispdir.m4 \
+maintainer.m4 \
+make.m4 \
+minuso.m4 \
+missing.m4 \
+multi.m4 \
+obsol-gt.m4 \
+obsol-lt.m4 \
+obsolete.m4 \
+options.m4 \
+protos.m4 \
+python.m4 \
+regex.m4 \
+runlog.m4 \
+sanity.m4 \
+strip.m4 \
+termios.m4 \
winsz.m4
Index: m4/ccstdc.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/ccstdc.m4,v
retrieving revision 1.1
diff -u -r1.1 ccstdc.m4
--- m4/ccstdc.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/ccstdc.m4 18 Apr 2002 19:25:39 -0000
@@ -3,7 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------------- ##
-# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 1
+# serial 2
# @defmac AC_PROG_CC_STDC
# @maindex PROG_CC_STDC
@@ -107,3 +107,5 @@
*) CC="$CC $am_cv_prog_cc_stdc" ;;
esac
])
+
+AU_DEFUN([fp_PROG_CC_STDC], [AC_REQUIRE([AM_PROG_CC_STDC])])
Index: m4/dmalloc.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/dmalloc.m4,v
retrieving revision 1.1
diff -u -r1.1 dmalloc.m4
--- m4/dmalloc.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/dmalloc.m4 21 Apr 2002 20:06:45 -0000
@@ -3,7 +3,7 @@
## From Franc,ois Pinard ##
## ----------------------------------- ##
-# Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 1
+# serial 2
AC_DEFUN([AM_WITH_DMALLOC],
[AC_MSG_CHECKING([if malloc debugging is wanted])
@@ -37,3 +37,5 @@
AC_MSG_RESULT(no)
fi], [AC_MSG_RESULT(no)])
])
+
+AU_DEFUN([fp_WITH_DMALLOC], [AC_REQUIRE([AM_WITH_DMALLOC])])
Index: m4/lispdir.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/lispdir.m4,v
retrieving revision 1.1
diff -u -r1.1 lispdir.m4
--- m4/lispdir.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/lispdir.m4 18 Apr 2002 19:28:39 -0000
@@ -4,7 +4,8 @@
## Almost entirely rewritten by Alexandre Oliva
## ------------------------
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 5
+# serial 6
# AM_PATH_LISPDIR
# ---------------
@@ -61,3 +62,5 @@
])
AC_SUBST(lispdir)
])# AM_PATH_LISPDIR
+
+AU_DEFUN([ud_PATH_LISPDIR], [AC_REQUIRE([AM_PATH_LISPDIR])])
Index: m4/maintainer.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/maintainer.m4,v
retrieving revision 1.1
diff -u -r1.1 maintainer.m4
--- m4/maintainer.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/maintainer.m4 18 Apr 2002 19:26:56 -0000
@@ -1,7 +1,7 @@
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
-# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 1
+# serial 2
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -34,3 +34,5 @@
AC_SUBST(MAINT)dnl
]
)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AC_REQUIRE([AM_MAINTAINER_MODE])])
Index: m4/obsol-gt.m4
===================================================================
RCS file: m4/obsol-gt.m4
diff -N m4/obsol-gt.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ m4/obsol-gt.m4 18 Apr 2002 19:36:38 -0000
@@ -0,0 +1,23 @@
+# Support for obsolete Gettext macro. -*- Autoconf -*-
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# See comment in obsolete.m4.
+AU_DEFUN([ud_GNU_GETTEXT], [AC_REQUIRE([AM_GNU_GETTEXT])])
Index: m4/obsol-lt.m4
===================================================================
RCS file: m4/obsol-lt.m4
diff -N m4/obsol-lt.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ m4/obsol-lt.m4 18 Apr 2002 19:36:55 -0000
@@ -0,0 +1,23 @@
+# Support for obsolete Libtool macro. -*- Autoconf -*-
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# See comment in obsolete.m4.
+AU_DEFUN([gm_PROG_LIBTOOL], [AC_REQUIRE([AM_PROG_LIBTOOL])])
Index: m4/obsolete.m4
===================================================================
RCS file: m4/obsolete.m4
diff -N m4/obsolete.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ m4/obsolete.m4 19 Apr 2002 09:00:42 -0000
@@ -0,0 +1,46 @@
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Obsolete Automake macros.
+
+# We put here only the macros whose substitution is not an Automake
+# macro; otherwise including this file would trigger dependencies for
+# all the subsitutions. Generally, obsolete Automake macros are
+# better AU_DEFUNed in the same file as there replacement, or alone in
+# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
+
+AU_DEFUN([AC_FEATURE_CTYPE], [AC_HEADER_STDC])
+AU_DEFUN([AC_FEATURE_ERRNO], [AC_REPLACE_FUNCS([strerror])])
+AU_DEFUN([AM_CYGWIN32], [AC_CYGWIN])
+AU_DEFUN([AM_EXEEXT], [AC_EXEEXT])
+AU_DEFUN([AM_FUNC_MKTIME], [AC_FUNC_MKTIME])
+AU_DEFUN([AM_MINGW32], [AC_MINGW32])
+AU_DEFUN([AM_PROG_INSTALL], [AC_PROG_INSTALL])
+AU_DEFUN([AM_SANITY_CHECK_CC], [AC_PROG_CC])
+AU_DEFUN([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH])
+AU_DEFUN([fp_PROG_INSTALL], [AC_PROG_INSTALL])
+AU_DEFUN([md_TYPE_PTRDIFF_T], [AC_CHECK_TYPES([ptrdiff_t])])
+
+# Don't know how to translate these.
+# If used, Autoconf will complain that they are possibly unexpended;
+# this seems a good enough error message.
+# AC_FEATURE_EXIT
+# AC_SYSTEM_HEADER
Index: m4/protos.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/protos.m4,v
retrieving revision 1.1
diff -u -r1.1 protos.m4
--- m4/protos.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/protos.m4 21 Apr 2002 20:09:16 -0000
@@ -3,7 +3,7 @@
## From Franc,ois Pinard ##
## ------------------------------- ##
-# Copyright 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 1
+# serial 2
AC_DEFUN([AM_C_PROTOTYPES],
[AC_REQUIRE([AM_PROG_CC_STDC])
@@ -40,3 +40,5 @@
AC_SUBST(U)dnl
AC_SUBST(ANSI2KNR)dnl
])
+
+AU_DEFUN([fp_C_PROTOTYPES], [AC_REQUIRE([AM_C_PROTOTYPES])])
Index: m4/regex.m4
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/m4/regex.m4,v
retrieving revision 1.1
diff -u -r1.1 regex.m4
--- m4/regex.m4 17 Apr 2002 18:28:48 -0000 1.1
+++ m4/regex.m4 18 Apr 2002 19:27:22 -0000
@@ -2,7 +2,7 @@
## Check if --with-regex was given. ##
## --------------------------------- ##
-# Copyright 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-# serial 3
+# serial 4
AC_PREREQ(2.50)
# AM_WITH_REGEX
@@ -61,3 +61,5 @@
fi
AC_SUBST(LIBOBJS)dnl
])
+
+AU_DEFUN([fp_WITH_REGEX], [AC_REQUIRE([AM_WITH_REGEX])])
Index: tests/defs
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/tests/defs,v
retrieving revision 1.1
diff -u -r1.1 defs
--- tests/defs 17 Apr 2002 18:28:50 -0000 1.1
+++ tests/defs 18 Apr 2002 19:47:52 -0000
@@ -83,6 +83,7 @@
# User can set which tools from Autoconf to use.
test -z "$AUTOCONF" && AUTOCONF=autoconf
+test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
echo "=== Running test $0"
Index: tests/obsolete.test
===================================================================
RCS file: /home/adl/CVSROOT/HEAD-20020417-2028/tests/obsolete.test,v
retrieving revision 1.1
diff -u -r1.1 obsolete.test
--- tests/obsolete.test 17 Apr 2002 18:28:55 -0000 1.1
+++ tests/obsolete.test 21 Apr 2002 20:06:08 -0000
@@ -1,16 +1,32 @@
#! /bin/sh
-# Test to make sure obsolete macros really are.
+# Test to make sure obsolete macros can be autoupdated.
. $srcdir/defs || exit 1
-cat >> configure.in << 'END'
-fp_PROG_INSTALL
+cat > configure.in << 'END'
+AC_INIT
END
-: > Makefile.am
+$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
+ $testsrcdir/../m4/obsolete.m4 >> obs
+cat obs >> configure.in
+$PERL -ne 'chomp; print "grep $_ stderr || exit 1\n"; ' obs > obs.1
+$PERL -ne 'chomp; print "grep $_ configure.in && exit 1\n"; ' obs > obs.2
-$ACLOCAL 2>stderr && exit 1
-grep AC_PROG_INSTALL stderr || exit 1
+# Sanity check. Make sure we have added something to configure.in.
+test `cat configure.in | wc -l` -gt 1 || exit 1
+
+$ACLOCAL || exit 1
+
+# Expect Autoconf to complain about each of the macros in obs.
+$AUTOCONF -Wobsolete >stderr 2>&1
+. obs.1
+# Make sure Autoupdate remove each of these macros.
+$AUTOUPDATE || exit 1
+. obs.2
+
+# Autoconf should be able to grok the updated configure.in.
+$AUTOCONF || exit 1
exit 0
--
Alexandre Duret-Lutz
- AU_DEFUN obsolete functions,
Alexandre Duret-Lutz <=