m4: delete several obsolete macros

Support for several obsolescent macros has already been deprecated,
and their removal already announced in the documentation and in the
NEWS file.  It's now time to finally remove them.

* m4/dmalloc.m4 (fp_WITH_DMALLOC): Don't define anymore.
* m4/maintainer.m4 (jm_MAINTAINER_MODE): Likewise.
* m4/lispdir.m4 (ud_PATH_LISPDIR): Likewise.
* m4/protos.m4 (fp_C_PROTOTYPES): Likewise.
* m4/ccstdc.m4: Delete file.
* m4/header.m4: Likewise.
* m4/obsol-gt.m4: Likewise.
* m4/obsol-lt.m4: Likewise.
* m4/obsolete.m4: Likewise.
* Makefile.am (dist_automake_ac_DATA): Don't list the deleted '.m4'
files anymore.
* t/confh.sh: Use 'AC_CONFIG_HEADERS' instead of the now-removed
AM_CONFIG_HEADER.
* t/confh.sh: Likewise.
* t/confh4.sh: Likewise.
* t/confh6.sh: Likewise.
* t/confh7.sh: Likewise.
* t/confh8.sh: Likewise.
* t/confsub.sh: Likewise.
* t/stamph2.sh: Likewise.
* t/subdir6.sh: Likewise.
* t/autohdr2.sh: Remove as obsolete.
* t/obsolete.sh: Likewise.
* t/list-of-tests.mk. Don't list the deleted test cases anymore.
* NEWS: Update.
* doc/automake.texi: Likewise.  In particular ...
(Obsolete Macros): Remove this node altogether.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

11 files changed, 10 insertions, 100 deletions

diff --git a/t/autohdr2.sh b/t/autohdr2.sh
deleted file mode 100755
index 6f5415e00..000000000
--- a/t/autohdr2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2012 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, see <http://www.gnu.org/licenses/>.
-
-# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-
-. ./defs || Exit 1
-
-cat >>configure.ac <<EOF
-AM_CONFIG_HEADER([thisfile.h])
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOHEADER
-
-test -f thisfile.h.in
diff --git a/t/confh.sh b/t/confh.sh
index 475961998..9dc2f15b1 100755
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -20,7 +20,7 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
 AC_OUTPUT
 END
 
diff --git a/t/confh4.sh b/t/confh4.sh
index ea6a9ffc2..665e04a0a 100755
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -26,7 +26,7 @@
 
 cat >> configure.ac << 'END'
 AC_CONFIG_FILES([include/Makefile])
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
 AC_PROG_CC
 END
 
diff --git a/t/confh6.sh b/t/confh6.sh
index c5e7d7e58..c94c7ba92 100755
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -21,7 +21,7 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([subdir/config.h])
+AC_CONFIG_HEADERS([subdir/config.h])
 AC_OUTPUT
 END
 
diff --git a/t/confh7.sh b/t/confh7.sh
index 408077978..0bc2465cd 100755
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -20,7 +20,7 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([config.h two.h])
+AC_CONFIG_HEADERS([config.h two.h])
 END
 
 : > Makefile.am
diff --git a/t/confh8.sh b/t/confh8.sh
index c3a27d10f..2feaae582 100755
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -20,7 +20,7 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([one.h two.h])
+AC_CONFIG_HEADERS([one.h two.h])
 AC_OUTPUT
 END
 
diff --git a/t/confsub.sh b/t/confsub.sh
index 188704678..e788275f1 100755
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -22,7 +22,7 @@
 cat > configure.ac << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
+AC_CONFIG_HEADERS(subdir/config.h:subdir/config.hin)
 AC_OUTPUT(Makefile subdir/Makefile)
 END
 
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index fef716517..9b2c3288e 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -151,7 +151,6 @@ t/autodist-configure-no-subdir.sh \
 t/autodist-no-duplicate.sh \
 t/autodist-stamp-vti.sh \
 t/autohdr.sh \
-t/autohdr2.sh \
 t/autohdr3.sh \
 t/autohdr4.sh \
 t/autohdrdry.sh \
@@ -704,7 +703,6 @@ t/number.sh \
 t/objc.sh \
 t/objc2.sh \
 t/objext-pr10128.sh \
-t/obsolete.sh \
 t/oldvars.sh \
 t/order.sh \
 t/output.sh \
diff --git a/t/obsolete.sh b/t/obsolete.sh
deleted file mode 100755
index c4240c200..000000000
--- a/t/obsolete.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 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, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure obsolete macros can be autoupdated.
-
-# We need the following indirection in case someone exported e.g.
-# AUTOUPDATE='autoupdate --verbose'.
-set x ${AUTOUPDATE-autoupdate}
-required=$2
-. ./defs || Exit 1
-
-cat > configure.ac << 'END'
-AC_INIT
-END
-
-$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
-  "$am_automake_acdir/obsolete.m4" > obs
-cat obs >> configure.ac
-$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
-$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2
-echo : >> obs.1 # Since it will be sourced, it must end with a success.
-echo : >> obs.2 # Likewise.
-
-cat configure.ac # For debugging.
-cat obs.1        # Likewise.
-cat obs.2        # Likewise.
-
-# Sanity check.  Make sure we have added something to configure.ac.
-test `wc -l <configure.ac` -gt 1
-
-$ACLOCAL
-
-# Expect Autoconf to complain about each of the macros in obs.
-$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; }
-cat output
-. ./obs.1
-# Make sure Autoupdate remove each of these macros.
-$AUTOUPDATE
-. ./obs.2
-
-# Autoconf should be able to grok the updated configure.ac.
-$AUTOCONF
-
-:
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 59a373a35..5346bfc4c 100755
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -18,10 +18,9 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << END
-AM_CONFIG_HEADER([1.h
-                  2.h:config.hin
-                  3.h:sdir1/config1.hin])
-# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms.
+AC_CONFIG_HEADERS([1.h
+                   2.h:config.hin
+                   3.h:sdir1/config1.hin])
 AC_CONFIG_HEADERS([sdir1/4.h
                    sdir1/5.h:config.hin
                    sdir1/6.h:sdir1/config1.hin
diff --git a/t/subdir6.sh b/t/subdir6.sh
index 5c17b6550..26f395724 100755
--- a/t/subdir6.sh
+++ b/t/subdir6.sh
@@ -19,7 +19,7 @@
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
+AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
 AC_OUTPUT
 END