From: Stefano Lattarini Date: Tue, 27 Mar 2012 20:40:20 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.11b~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a56bed0b38cd90b89339b8bd638bfc7e7f6fe29;p=thirdparty%2Fautomake.git 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 --- 7a56bed0b38cd90b89339b8bd638bfc7e7f6fe29 diff --cc NEWS index 7f6b923b2,11ce4c922..fd8f38c65 --- a/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 lib/depcomp index 81e64f6bf,25a39e6cd..debb6ffa3 --- a/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 d7a0e7f91,405480d78..c76f424ad --- a/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 000000000,0d61865ac..7b9fd5a3c mode 000000,100755..100755 --- a/tests/link_cond.test +++ b/tests/link_cond.test @@@ -1,0 -1,90 +1,90 @@@ + #! /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 . + + # 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.in << 'END' ++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/vala-mix.test index acf47d989,012b36ad0..58ab50028 --- a/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 e9a0aa4ea,298f88d60..516246724 --- a/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 636e66ec6,311eb3a06..a968afa0e --- a/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