File automake-no-deprecate.patch of Package automake

Overview Repositories Revisions Requests Users Attributes Meta

File automake-no-deprecate.patch of Package automake (Revision 3f9b512e1d9fa629b6576ba0f6e0f168)

Currently displaying revision 3f9b512e1d9fa629b6576ba0f6e0f168 , Show latest

From eada7ef7dfdee457c7e773ae96f435de81c2f0ce Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 18 Jan 2013 13:13:30 +0100
Subject: [PATCH] compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC

Make them give runtime warnings in the obsolete category, but apart
from that, make them behave as they did in Automake 1.12.x and earlier.

While removing those macros seemed quite harmless, because it didn't put
a real burden on the developers (requiring them just to do a quick edit
to configure.ac), it turned out to place an unsustainable burden (or at
least, a burden perceived as such) on distro packagers who use the latest
Automake to bootstrap existing packages.  Many of those packages, while
having likely updated to AC_CONFIG_HEADERS in their development version,
still used AM_CONFIG_HEADER in their existing released versions, and the
removal of this macro would have thus forced the Fedora packagers to
patch all of them.  References:

<http://www.mail-archive.com/devel@lists.fedoraproject.org/msg52840.html>
  <http://www.spinics.net/lists/fedora-devel/msg175922.html>
  <http://blog.flameeyes.eu/2013/01/autotools-mythbuster-automake-pains>

In addition, the Fedora packagers have already decided to patch their
Automake 1.13.1 to reinstate the AM_CONFIG_HEADER and AM_PROG_CC_STDC
macros (plus other macros that I don't believe it's worth worrying about):

<http://www.spinics.net/lists/fedora-devel/msg176098.html>
  <http://www.mail-archive.com/devel@lists.fedoraproject.org/msg53030.html>
  <http://pkgs.fedoraproject.org/cgit/automake.git/commit/?id=ffe6bc39>

So, rather than having one more incompatibility floating around, we
better mirror that change (or, actually, its relevant parts) in the
upstream.

* m4/obsolete-err.m4 (AM_CONFIG_HEADER, AM_PROG_CC_STDC): Revert to the
older semantics, plus a runtime warning in the 'obsolete' category.
* t/backcompat6.sh: Use AM_CONFIG_HEADER once again.
* t/am-config-header-no-more.sh: Rename ...
* t/am-config-header.sh: ... like this, and adjust.
* t/am-prog-cc-stdc-no-more.sh: Rename ...
* t/am-prog-cc-stdc.sh: ... like this, and adjust.
* t/list-of-tests.mk: Adjust.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 NEWS                          | 10 +++++++++
 m4/obsolete-err.m4            | 20 +++++++++--------
 t/am-config-header-no-more.sh | 43 -------------------------------------
 t/am-config-header.sh         | 50 +++++++++++++++++++++++++++++++++++++++++++
 t/am-prog-cc-stdc-no-more.sh  | 43 -------------------------------------
 t/am-prog-cc-stdc.sh          | 44 +++++++++++++++++++++++++++++++++++++
 t/backcompat6.sh              |  2 +-
 t/list-of-tests.mk            |  4 ++--
 8 files changed, 118 insertions(+), 98 deletions(-)
 delete mode 100755 t/am-config-header-no-more.sh
 create mode 100755 t/am-config-header.sh
 delete mode 100755 t/am-prog-cc-stdc-no-more.sh
 create mode 100755 t/am-prog-cc-stdc.sh

Index: automake-1.13.1/NEWS
===================================================================
--- automake-1.13.1.orig/NEWS
+++ automake-1.13.1/NEWS
@@ -55,6 +55,16 @@ New in 1.13.1:
     causes a clear and helpful error message, instead of obscure ones
     (issue introduced in Automake 1.13).
 
+* Bugs fixed:
+
+  - The obsolete macros AM_CONFIG_HEADER or AM_PROG_CC_STDC work once
+    again, as they did in Automake 1.12.x (albeit printing runtime
+    warnings in the 'obsolete' category).  Removing them has turned
+    out to be a very bad idea, because it complicated distro packing
+    enormously.  Making them issue fatal warnings, as we did in
+    Automake 1.13, has turned out to be a similarly very bad idea,
+    for exactly the same reason.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.13:
Index: automake-1.13.1/m4/obsolete-err.m4
===================================================================
--- automake-1.13.1.orig/m4/obsolete-err.m4
+++ automake-1.13.1/m4/obsolete-err.m4
@@ -8,19 +8,21 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-dnl TODO: Remove in Automake 1.15.
 AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FATAL(['$0': this macro is obsolete.
-    You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
 
-dnl TODO: Remove in Automake 1.15.
 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_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$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'.])])
 
-dnl TODO: Remove in Automake 1.14.
 AC_DEFUN([AM_C_PROTOTYPES],
          [AC_FATAL([automatic de-ANSI-fication support has been removed])])
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
Index: automake-1.13.1/t/am-config-header-no-more.sh
===================================================================
--- automake-1.13.1.orig/t/am-config-header-no-more.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012-2013 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 any attempt to use the obsolete macro AM_CONFIG_HEADER
-# elicits clear and explicit fatal errors.
-
-. test-init.sh
-
-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
-}
-
-$ACLOCAL
-mv aclocal.m4 aclocal.sav
-
-echo AM_CONFIG_HEADER >> configure.ac
-
-geterr $ACLOCAL
-test ! -f aclocal.m4
-
-cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
-
-geterr $AUTOCONF
-geterr $AUTOMAKE
-
-:
Index: automake-1.13.1/t/am-config-header.sh
===================================================================
--- /dev/null
+++ automake-1.13.1/t/am-config-header.sh
@@ -0,0 +1,50 @@
+#! /bin/sh
+# Copyright (C) 2012-2013 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 the obsolete macro AM_CONFIG_HEADER still works.
+
+. test-init.sh
+
+cat > Makefile.am <<'END'
+check-local:
+	test -f oldconf.h
+	test -f $(srcdir)/oldconf.in
+END
+
+cat >> configure.ac <<'END'
+AM_CONFIG_HEADER([oldconf.h:oldconf.in])
+AC_OUTPUT
+END
+
+$ACLOCAL -Wno-obsolete
+
+$AUTOCONF -Werror -Wall 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
+
+$AUTOCONF -Werror -Wall -Wno-obsolete
+
+$AUTOHEADER
+test -f oldconf.in
+
+$AUTOMAKE
+
+./configure
+$MAKE check-local
+$MAKE distcheck
+
+:
Index: automake-1.13.1/t/am-prog-cc-stdc-no-more.sh
===================================================================
--- automake-1.13.1.orig/t/am-prog-cc-stdc-no-more.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2012-2013 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 any attempt to use the obsolete macro AM_CONFIG_HEADER
-# elicits clear and explicit fatal errors.
-
-. test-init.sh
-
-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
-}
-
-$ACLOCAL
-mv aclocal.m4 aclocal.sav
-
-echo AM_PROG_CC_STDC >> configure.ac
-
-geterr $ACLOCAL
-test ! -f aclocal.m4
-
-cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
-
-geterr $AUTOCONF
-geterr $AUTOMAKE
-
-:
Index: automake-1.13.1/t/am-prog-cc-stdc.sh
===================================================================
--- /dev/null
+++ automake-1.13.1/t/am-prog-cc-stdc.sh
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 2012-2013 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 the obsolete macro the obsolete macro AM_PROG_CC_STDC
+# still works.
+
+required=gcc
+. test-init.sh
+
+cat >> configure.ac <<'END'
+AM_PROG_CC_STDC
+AC_OUTPUT
+END
+
+echo bin_PROGRAMS = foo > Makefile.am
+
+$ACLOCAL
+$AUTOMAKE
+
+$AUTOCONF -Wnone -Wobsolete -Werror 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
+
+echo 'int main (void) { return 0; }' > foo.c
+
+./configure
+$MAKE
+$MAKE distcheck
+
+:
Index: automake-1.13.1/t/backcompat6.sh
===================================================================
--- automake-1.13.1.orig/t/backcompat6.sh
+++ automake-1.13.1/t/backcompat6.sh
@@ -38,7 +38,7 @@ AC_SUBST(two, $two)
 three=3
 AC_SUBST(three)
 AC_PROG_CC
-AC_CONFIG_HEADERS(config.h:config.hin)
+AM_CONFIG_HEADER(config.h:config.hin)
 AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes)
 AC_OUTPUT(Makefile foo.got:foo1.in:foo2.in:foo3.in)
 END
Index: automake-1.13.1/t/list-of-tests.mk
===================================================================
--- automake-1.13.1.orig/t/list-of-tests.mk
+++ automake-1.13.1/t/list-of-tests.mk
@@ -130,8 +130,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-config-header.sh \
+t/am-prog-cc-stdc.sh \
 t/am-macro-not-found.sh \
 t/amopt.sh \
 t/amopts-location.sh \

Places

File automake-no-deprecate.patch of Package automake (Revision 3f9b512e1d9fa629b6576ba0f6e0f168)

Places