[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-14-g8ce1b6c

[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=8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69

The branch, master has been updated
       via  8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69 (commit)
       via  018a186636ba4078496f56a945d25087bca127a3 (commit)
       via  ab14841acb906346345c9298ef50621d298f4a28 (commit)
       via  ae3d5dfc50f05470b791ec7f67ca8b401915c3ee (commit)
       via  e25a41fac07478d88ad87e96bd254843882ec229 (commit)
       via  f31fe4f003b0eb12eb082ae4dca837f36eaac214 (commit)
       via  eb7e8f33f4c020814436e9983481c1d63c278256 (commit)
       via  63e07a9c1297679818e8c584413a2b1df88c834a (commit)
       via  444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe (commit)
       via  ba5b98ffd2bd6abdb260cf4842ad9902e2ee1132 (commit)
      from  5368def8bb1635d7275a2ac3e08b8127933afe05 (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 -----------------------------------------------------------------
commit 8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69
Merge: 5368def 018a186
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 26 17:52:31 2012 +0200

    Merge branch 'maint'
    
    * maint:
      maint: don't use "union" merge driver for NEWS anymore
      build: avoid too greedy rebuilds in the testsuite
      tests: avoid yet another spurious environment influence
      tests: fix a failure in Lex/C++ tests on Mac OS X
      tests: fix a spurious failure due to truncated timestamps
      build: require autoconf 2.69
      build: don't require minimal automake version in AM_INIT_AUTOMAKE
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 .gitattributes             |    1 -
 Makefile.am                |   10 +++++-----
 THANKS                     |    1 +
 configure.ac               |    5 ++---
 t/lex-clean-cxx.sh         |    2 +-
 t/lex-depend-cxx.sh        |    6 ++----
 t/remake11.sh              |    1 +
 t/self-check-is_newest.tap |   14 ++++++++++++--
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 5126add..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-NEWS merge=union
 *.texi* diff=texinfo
diff --git a/Makefile.am b/Makefile.am
index dc8932d..0d02de7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,11 +379,11 @@ $(srcdir)/t/testsuite-part.am:
        $(AM_V_at)mv -f t/testsuite-part.tmp $@
 EXTRA_DIST += gen-testsuite-part
 
-$(generated_TESTS) $(srcdir)/t/testsuite-part.am: \
-  $(srcdir)/gen-testsuite-part \
-  t/list-of-tests.mk \
-  Makefile.am \
-  $(handwritten_TESTS)
+## The dependecies declared here are not truly complete, but such
+## completeness would cause more issues than it would solve.  See
+## automake bug#11347.
+$(generated_TESTS): $(srcdir)/gen-testsuite-part
+$(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am
 
 # Static dependencies valid for each test case.
 check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
diff --git a/THANKS b/THANKS
index 16367e1..c8e4012 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ It would not be what it is today without the invaluable help of 
these
 people:
 
 Adam J. Richter                address@hidden
+Adam Mercer            address@hidden
 Adam Sampson           address@hidden
 Adrian Bunk            address@hidden
 Akim Demaille          address@hidden
diff --git a/configure.ac b/configure.ac
index 1885836..3f55df7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ([2.68])
+AC_PREREQ([2.69])
 AC_INIT([GNU Automake], [1.12a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
@@ -39,7 +39,7 @@ AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"])
 dnl We call AC_PROG_CC in an unusual way, and only for use in our
 dnl testsuite, so also use 'no-dependencies' and 'no-define' among
 dnl the automake options to avoid bloating and potential problems.
-AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests
+AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
                  parallel-tests silent-rules no-define no-dependencies])
 
 # The API version is the base version.  We must guarantee
@@ -299,7 +299,6 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_FC(dnl
   [xlf90 f90 pgf90 pghpf epcf90 g95 gfortran])],
   [FC=false; _AM_SKIP_COMP_TESTS([Fortran])])
 
-# FIXME this won't work as expected until we can assume autoconf 2.69 :-(
 AS_IF([test x"$GFC" = x"yes"], [am_FC_is_GNU=yes], [am_FC_is_GNU=no])
 
 _AM_COMPILER_CAN_FAIL([AC_PROG_F77(dnl
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 1c57524..d1a745b 100755
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -20,7 +20,7 @@
 # "make maintainer-clean".
 # See also sister test 'lex-clean.test'.
 
-required=lex
+required='c++ lex'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index 490516f..7bdfdf9 100755
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -17,7 +17,7 @@
 # Test to make sure dependencies work with Lex/C++.
 # Test synthesized from PR automake/6.
 
-required=lex
+required='c++ lex'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'
@@ -61,7 +61,6 @@ int yywrap (void)
 }
 int main (int argc, char **argv)
 {
-  printf("Hello, World!\n");
   return 0;
 }
 END
@@ -69,8 +68,7 @@ END
 cp joe.ll moe.l++
 
 cat > my-hdr.hxx <<'END'
-// This header contains deliberetly invalid C (but valid C++)
-#include <cstdio>
+// This header contains deliberately invalid C (but valid C++).
 using namespace std;
 END
 
diff --git a/t/remake11.sh b/t/remake11.sh
index ec96a08..b88254f 100755
--- a/t/remake11.sh
+++ b/t/remake11.sh
@@ -30,6 +30,7 @@ echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
 
 echo "@FOO@" > bar.in
 echo "AC_CONFIG_FILES([bar])" >> configure.ac
+d=; unset d # Avoid unduly interferences from the environment.
 for i in 0 1 2 3 4 5 6 7 8 9; do
   d=${d+"$d/"}sub$i
   echo "SUBDIRS = sub$i" > Makefile.am
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 76b69ac..842c411 100755
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -24,6 +24,16 @@ plan_ 21
 Y () { command_ok_ "is_newest $*" is_newest "$@"; }
 N () { command_ok_ "not is_newest $*" not is_newest "$@"; }
 
+# A simple "touch -r" might not work, since on some file systems, and/or
+# with some 'touch' versions, it might truncate the timestamp (or even
+# rounded it upwards maybe).  So the first (apparently redundant) 'touch'
+# invocation below ensures that the timestamp gets "normalized" in a way
+# that allows it to be correctly copied by the second 'touch' invocation.
+copy_timestamp ()
+{
+  touch -r "$1" "$1" && touch -r "$1" "$2"
+}
+
 : > a
 $sleep
 : > b
@@ -38,7 +48,7 @@ Y c b
 Y c c
 Y c a b c
 
-touch -r c d
+copy_timestamp c d
 
 stat c d || : # For debugging.
 
@@ -69,7 +79,7 @@ done
 Y x/foo x
 N x x/foo
 
-touch -r x u
+copy_timestamp x u
 Y x u
 Y u x
 


hooks/post-receive
-- 
GNU Automake