Merge branch 'maint'

* maint:
  sync: update files from upstream with "make fetch"
  news: cygnus will be removed in automake 1.13
  news: some changes for 1.13 has been "de-planned"
  news: report that the have seen fixlets after 1.12.3
  warns: enable category 'obsolete' by default

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

4 files changed, 45 insertions, 4 deletions

diff --git a/t/backcompat.sh b/t/backcompat.sh
index fa8368763..214515d17 100755
--- a/t/backcompat.sh
+++ b/t/backcompat.sh
@@ -46,13 +46,13 @@ END
 for ac_init in 'AC_INIT' 'AC_INIT([Makefile.am])'; do
   for am_extra_args in '' ', []' ', [:]' ', [false]'; do
     rm -rf autom4te*.cache config* Makefile.in Makefile
-    unindent > configure.in <<END
+    unindent > configure.ac <<END
       $ac_init
       AM_INIT_AUTOMAKE([FooBar], [0.7.1]$am_extra_args)
       AC_CONFIG_FILES([Makefile])
       AC_OUTPUT
 END
-    cat configure.in # For debugging.
+    cat configure.ac # For debugging.
     $ACLOCAL
     $AUTOCONF
     $AUTOMAKE -Wno-obsolete
diff --git a/t/backcompat6.sh b/t/backcompat6.sh
index 9fc494642..bcfd3dc75 100755
--- a/t/backcompat6.sh
+++ b/t/backcompat6.sh
@@ -15,7 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Backward-compatibility test: try to build and distribute a package
-# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT.
+# using obsoleted forms of AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT,
+# and 'configure.in' as autconf input file.
 # This script can also serve as mild stress-testing for Automake.
 # See also the similar test 'backcompat5.test'.
 
@@ -77,7 +78,7 @@ int main (void)
 }
 END
 
-$ACLOCAL
+$ACLOCAL -Wno-obsolete
 $AUTOMAKE -Wno-obsolete --add-missing
 $AUTOCONF
 
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index cb6d445dd..57bc89bdd 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1229,6 +1229,7 @@ t/vtexi.sh \
 t/vtexi2.sh \
 t/vtexi3.sh \
 t/vtexi4.sh \
+t/warnings-obsolete-default.sh \
 t/warnings-override.sh \
 t/warnings-precedence.sh \
 t/warnings-strictness-interactions.sh \
diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
new file mode 100755
index 000000000..fc439eab9
--- /dev/null
+++ b/t/warnings-obsolete-default.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2011-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 automake warnings in the 'obsolete' category are enabled
+# by default.
+
+. ./defs || exit 1
+
+# We want (almost) complete control over automake options.
+AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
+
+echo AC_PROG_CC >> configure.ac
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo
+INCLUDES = -Ibar
+END
+
+$ACLOCAL
+AUTOMAKE_fails
+grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr
+
+# Check that we can override warnings about obsolete stuff.
+$AUTOMAKE -Wno-obsolete
+
+: