[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13-8-g3e35245

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=3e35245c5f6aae5594b00ffe3611a4955d115be5

The branch, maint has been updated
       via  3e35245c5f6aae5594b00ffe3611a4955d115be5 (commit)
       via  c5fe4fdfb0d4ece2f47d6b7dabf3371fc15af6d7 (commit)
       via  6899085918b1673131e5451c39390b76ba273540 (commit)
       via  9c07d8926ec97d43f1f811706043e5398ef916cf (commit)
       via  8e921bf86103578b56b2910590c7f1157e96e380 (commit)
      from  2e269cff5425cded47fb9f5578102dee0ac12dc9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                        |    2 +-
 NEWS                                               |   12 +++++-
 m4/obsolete-err.m4                                 |   23 ++++++++++
 m4/protos.m4                                       |   13 ------
 ...no-top-level.sh => am-config-header-no-more.sh} |   41 +++++++----------
 t/{lisp-pr11806.sh => am-prog-cc-stdc-no-more.sh}  |   46 ++++++++-----------
 t/ansi2knr-no-more.sh                              |    2 +-
 t/list-of-tests.mk                                 |    2 +
 8 files changed, 74 insertions(+), 67 deletions(-)
 create mode 100644 m4/obsolete-err.m4
 delete mode 100644 m4/protos.m4
 copy t/{recurs-user-no-top-level.sh => am-config-header-no-more.sh} (63%)
 copy t/{lisp-pr11806.sh => am-prog-cc-stdc-no-more.sh} (58%)

diff --git a/Makefile.am b/Makefile.am
index 6a4ebd4..8d8e033 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -283,8 +283,8 @@ dist_automake_ac_DATA = \
   m4/minuso.m4 \
   m4/missing.m4 \
   m4/mkdirp.m4 \
+  m4/obsolete-err.m4 \
   m4/options.m4 \
-  m4/protos.m4 \
   m4/python.m4 \
   m4/runlog.m4 \
   m4/sanity.m4 \
diff --git a/NEWS b/NEWS
index bdafaed..ef1e953 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.13:
+New in 1.13.1:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -51,6 +51,16 @@ New in 1.13:
 
 * Bugs fixed:
 
+  - Use of the obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC now
+    causes a clear and helpful error message, instead of obscure ones
+    (issue introduced in Automake 1.13).
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.13:
+
+* Bugs fixed:
+
   - ylwrap renames properly header guards in generated header files
     (*.h), instead of leaving Y_TAB_H.
 
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
new file mode 100644
index 0000000..eb23dc4
--- /dev/null
+++ b/m4/obsolete-err.m4
@@ -0,0 +1,23 @@
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_FATAL(['$0': this macro is obsolete.
+    You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_FATAL(['$0': this macro is obsolete.
+    You should simply use the 'AC][_PROG_CC' macro instead.
+    Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+    but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/m4/protos.m4 b/m4/protos.m4
deleted file mode 100644
index c8c7adc..0000000
--- a/m4/protos.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-#  -*- Autoconf -*-
-# Obsolete (and now removed) automatic de-ANSI-fiction support.
-#
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([AM_C_PROTOTYPES],
-         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
-
-AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/recurs-user-no-top-level.sh b/t/am-config-header-no-more.sh
similarity index 63%
copy from t/recurs-user-no-top-level.sh
copy to t/am-config-header-no-more.sh
index 1546f1c..f100e93 100755
--- a/t/recurs-user-no-top-level.sh
+++ b/t/am-config-header-no-more.sh
@@ -14,37 +14,30 @@
 # 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 user recursion works even for targets that don't exist
-# in the top-level Makefile.
+# Check that any attempt to use the obsolete macro AM_CONFIG_HEADER
+# elicits clear and explicit fatal errors.
 
 . test-init.sh
 
-cat >> configure.ac <<'END'
-AC_CONFIG_FILES([sub/Makefile])
-AM_EXTRA_RECURSIVE_TARGETS([foo-bar])
-AC_OUTPUT
-END
+geterr ()
+{
+    "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+    cat stderr >&2
+    grep "^configure\.ac:4:.*'AM_CONFIG_HEADER'.*obsolete" stderr
+    grep "'AC_CONFIG_HEADERS'.* instead" stderr
+}
 
-mkdir sub
-
-cat > Makefile.am <<'END'
-SUBDIRS = sub
-all-local: foo-bar
-END
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
 
-cat > sub/Makefile.am <<'END'
-foo-bar-local:
-       : > foo-bar
-MOSTLYCLEANFILES = foo-bar
-END
+echo AM_CONFIG_HEADER >> configure.ac
 
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
+geterr $ACLOCAL
+test ! -f aclocal.m4
 
-./configure
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
 
-$MAKE foo-bar
-test -f sub/foo-bar
+geterr $AUTOCONF
+geterr $AUTOMAKE
 
 :
diff --git a/t/lisp-pr11806.sh b/t/am-prog-cc-stdc-no-more.sh
similarity index 58%
copy from t/lisp-pr11806.sh
copy to t/am-prog-cc-stdc-no-more.sh
index edcf9ba..447be37 100755
--- a/t/lisp-pr11806.sh
+++ b/t/am-prog-cc-stdc-no-more.sh
@@ -14,38 +14,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Compiling .el files that requires each other in a VPATH build.
-# See automake bug#11806.
+# Check that any attempt to use the obsolete macro AM_CONFIG_HEADER
+# elicits clear and explicit fatal errors.
 
-required=emacs
 . test-init.sh
 
-cat >> configure.ac << 'END'
-AM_PATH_LISPDIR
-AC_OUTPUT
-END
+geterr ()
+{
+    "$@" -Wnone 2>stderr && { cat stderr >&2; exit 1; }
+    cat stderr >&2
+    grep "^configure\.ac:4:.*'AM_PROG_CC_STDC'.*obsolete" stderr
+    grep "'AC_PROG_CC'.* instead" stderr
+}
 
-cat > Makefile.am << 'END'
-lisp_LISP = foo.el
-lisp_DATA = bar.el
-END
+$ACLOCAL
+mv aclocal.m4 aclocal.sav
 
-echo "(require 'bar)" > foo.el
-echo "(provide 'bar)" > bar.el
+echo AM_PROG_CC_STDC >> configure.ac
 
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-mkdir build
-cd build
-../configure
-$MAKE
-test -f foo.elc
-cd ..
-
-./configure
-$MAKE
-test -f foo.elc
+geterr $ACLOCAL
+test ! -f aclocal.m4
+
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
+
+geterr $AUTOCONF
+geterr $AUTOMAKE
 
 :
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index e28e651..dfb2e17 100755
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -32,7 +32,7 @@ $ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 grep "^configure\\.ac:5:.*$warn_rx" stderr
 
-cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
 $AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 grep "^configure\\.ac:5:.*$warn_rx" stderr
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 5ee31d0..4fe8216 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -131,6 +131,8 @@ t/amhello-cross-compile.sh \
 t/amhello-binpkg.sh \
 t/aminit-moreargs-deprecation.sh \
 t/amassign.sh \
+t/am-config-header-no-more.sh \
+t/am-prog-cc-stdc-no-more.sh \
 t/am-macro-not-found.sh \
 t/amopt.sh \
 t/amopts-location.sh \


hooks/post-receive
-- 
GNU Automake