Merge branch 'maint'

* maint:
  depcomp: support tcc (Tiny C Compiler)
  tests: workaround for automatic linker determination and conditionals
  info: allow user to inhibit pruning of '${infodir}/dir'
  vala tests: fix spurious failures with older valac (<= 0.7.2)
  tests: fix a timestamp issue, and other minor buglets
  tests: fix spurious failure with older autoconf
  build: remove duplicated entries in $(TESTS)

+ Extra non-trivia edits:
* tests/link_cond.test: Use 'configure.ac', not 'configure.in'.

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

diff --cc NEWS
index 7f6b923,11ce4c9..fd8f38c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -370,11 -108,10 +375,11 @@@ New in 1.11.2
      file generated by automake-provided rules by defining the special make
      variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
  
-   - The `install-info' rule can now be instructed not to create/update
-     the `${infodir}/dir' file, by exporting the new environment variable
-     `AM_UPDATE_INFO_DIR' to the value "no".
+   - The `install-info' and `uninstall-info' rules can now be instructed
+     not to create/update the `${infodir}/dir' file, by exporting the new
+     environment variable `AM_UPDATE_INFO_DIR' to the value "no".
  
 +Bugs fixed in 1.11.2:
    - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
      and adds them to the normal list of dependencies, but without
      overwriting the foo_DEPENDENCIES variable, which is normally computed

diff --cc THANKS
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/am/texinfos.am
Simple merge

diff --cc lib/depcomp
index 81e64f6,25a39e6..debb6ff
--- 1/lib/depcomp
--- 2/lib/depcomp
+++ b/lib/depcomp
@@@ -1,9 -1,10 +1,9 @@@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
- scriptversion=2012-03-12.15; # UTC
+ scriptversion=2012-03-27.16; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 -# 2011, 2012 Free Software Foundation, Inc.
 +# Copyright (C) 1999-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

diff --cc tests/install-info-dir.test
index d7a0e7f,405480d..c76f424
--- 1/tests/install-info-dir.test
--- 2/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@@ -72,10 -74,11 +72,11 @@@ els
    have_installinfo=no
  fi
  
 -# The `install-info' target updates the `${infodir}/dir' file
 -# by default (if the `install-info' program is available).
 +# The 'install-info' target updates the '${infodir}/dir' file
 +# by default (if the 'install-info' program is available).
  # This should happen in a normal as well as in a DESTDIR installation.
  if test $have_installinfo = yes; then
+ 
    $MAKE install-info
    test -f $instdir/info/foo.info
    test -f $instdir/info/dir

diff --cc tests/link_cond.test
index 0000000,0d61865..7b9fd5a
mode 000000,100755..100755
--- /dev/null
--- 2/tests/link_cond.test
+++ b/tests/link_cond.test
@@@ -1,0 -1,90 +1,90 @@@
 -cat >> configure.in << 'END'
+ #! /bin/sh
+ # Copyright (C) 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 that automatic determination of the linker works well with
+ # conditional use of languages in a single program.
+ # This currently doesn't truly work, but we have an easy workaround
+ # at least, that is tested here.
+ # See automake bug#11089.
+ 
+ required='cc c++'
+ . ./defs || Exit 1
+ 
+ set -e
+ 
++cat >> configure.ac << 'END'
+ AC_PROG_CC
+ AC_PROG_CXX
+ AM_CONDITIONAL([HAVE_CXX], [test $have_cxx = yes])
+ AC_OUTPUT
+ END
+ 
+ cat > Makefile.am << 'END'
+ bin_PROGRAMS = foo
+ if HAVE_CXX
+ foo_SOURCES = more.c++
+ else
+ foo_SOURCES = less.c
+ endif
+ ## FIXME: ideally, this workaround shouldn't be needed.
+ if HAVE_CXX
+ foo_LINK = $(CXXLINK)
+ else
+ foo_LINK = $(LINK)
+ endif
+ END
+ 
+ $ACLOCAL
+ $AUTOMAKE
+ $AUTOCONF
+ 
+ rm -f *.c++
+ cat > less.c <<'END'
+ /* Valid C but deliberately invalid C++ */
+ main ()
+ {
+   int new = 0;
+   return new;
+ }
+ END
+ 
+ ./configure have_cxx=no
+ CXX=false $MAKE -e
+ 
+ # Sanity check.
+ rm -f foo foo.exe
+ CC=false $MAKE -e && Exit 99
+ 
+ $MAKE distclean
+ 
+ rm -f *.c
+ cat > more.c++ <<'END'
+ /* Valid C++ but deliberately invalid C */
+ using namespace std;
+ int main (void)
+ {
+   return 0;
+ }
+ END
+ 
+ ./configure have_cxx=yes
+ CC=false $MAKE -e
+ 
+ # Sanity check.
+ rm -f foo foo.exe
+ CXX=false $MAKE -e && Exit 99
+ 
+ :

diff --cc tests/list-of-tests.mk
Simple merge

diff --cc tests/vala-mix.test
index acf47d9,012b36a..58ab500
--- 1/tests/vala-mix.test
--- 2/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@@ -19,10 -19,12 +19,10 @@@
  required='valac cc GNUmake'
  . ./defs || Exit 1
  
 -set -e
 -
 -cat >> configure.in <<'END'
 +cat >> configure.ac <<'END'
  AC_PROG_CC
  AM_PROG_CC_C_O
- AM_PROG_VALAC
+ AM_PROG_VALAC([0.7.3])
  AC_OUTPUT
  END
  

diff --cc tests/vala-mix2.test
index e9a0aa4,298f88d..5162467
--- 1/tests/vala-mix2.test
--- 2/tests/vala-mix2.test
+++ b/tests/vala-mix2.test
@@@ -20,10 -20,12 +20,10 @@@
  required='valac cc c++ GNUmake'
  . ./defs || Exit 1
  
 -set -e
 -
 -cat >> configure.in <<'END'
 +cat >> configure.ac <<'END'
  AC_PROG_CC
  AC_PROG_CXX
- AM_PROG_VALAC
+ AM_PROG_VALAC([0.7.3])
  AC_OUTPUT
  END
  

diff --cc tests/vala-vpath.test
index 636e66e,311eb3a..a968afa
--- 1/tests/vala-vpath.test
--- 2/tests/vala-vpath.test
+++ b/tests/vala-vpath.test
@@@ -20,10 -20,12 +20,10 @@@
  required="valac GNUmake"
  . ./defs || Exit 1
  
 -set -e
 -
 -cat >> configure.in << 'END'
 +cat >> configure.ac << 'END'
  AC_CONFIG_SRCDIR([hello.vala])
  AC_PROG_CC
- AM_PROG_VALAC([0.7])
+ AM_PROG_VALAC([0.7.3])
  AC_OUTPUT
  END