[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-16-g80c84dd

[Ralf Wildenhues]

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=80c84dd087c0dbabbb7fe2f1ed0c104d639d78c7

The branch, branch-1.11 has been updated
       via  80c84dd087c0dbabbb7fe2f1ed0c104d639d78c7 (commit)
       via  05a3690f9be228bd4ac3342c7a7e4c0e9c328780 (commit)
       via  ff27d1ecdee89bea7e677a43bb1bfaa74256cb3a (commit)
       via  31c51b2a79b83c546c68916245cc18b620cec4e3 (commit)
       via  64161769e18baee5d1ddfe0fc8a396dbe656c72a (commit)
      from  3b6abc9c2885dcdb3f75b776a450712da68c0285 (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 80c84dd087c0dbabbb7fe2f1ed0c104d639d78c7
Merge: 3b6abc9c2885dcdb3f75b776a450712da68c0285 
05a3690f9be228bd4ac3342c7a7e4c0e9c328780
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jan 17 14:22:37 2010 +0100

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog           |   26 ++++++++++++++++++++++++++
 INSTALL             |    2 +-
 lib/INSTALL         |    2 +-
 lib/config.guess    |    9 +++++----
 lib/config.sub      |   11 +++++++----
 tests/Makefile.am   |    5 ++++-
 tests/Makefile.in   |    5 ++++-
 tests/acoutbs.test  |   14 ++++++++++++--
 tests/acoutbs2.test |   17 ++++++++++++++---
 9 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 664390b..c0270c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
+2010-01-17  Stefano Lattarini  <address@hidden>
+
+       Slighty improve tests acoutbs.test and acoutbs2.test.
+       * tests/acoutbs2.test: Enable `errexit' shell flag.  Check that
+       autoconf and configure work, that the file `zot' is created by
+       configure, and that no file containing a backslash in its name is
+       created.
+       * tests/acoutbs.test: Likewise, plus updated copyright years.
+
+       Fix test acoutbs2.test.
+       * tests/acoutbs2: In the generated configure.in: add proper calls
+       to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
+       PACKAGE and VERSION. Add a call to aclocal before calling automake.
+       Updated copyright years.
+       * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
+
+       Add forgotten test scripts to $(TESTS).
+       * tests/Makefile.am (TESTS): Added test scripts present on the
+       filesystem, which were erroneously left out from $(TESTS):
+       acoutbs2.test, badopt.test, extra2.test.
+       (XFAIL_TESTS): Added acoutbs2.test.
+
 2010-01-17  Ralf Wildenhues  <address@hidden>
 
+       Sync auxiliary files from upstream.
+       * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
+       Sync from upstream.
+
        Bump copyright years.
        * aclocal.in (write_aclocal, version): Bump copyright years.
        * automake.in (gen_copyright, version): Likewise.
diff --git a/INSTALL b/INSTALL
index 7d1c323..81fd332 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/lib/INSTALL b/lib/INSTALL
index 7d1c323..81fd332 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/lib/config.guess b/lib/config.guess
index dc84c68..c2246a4 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-12-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/lib/config.sub b/lib/config.sub
index 2a55a50..8518609 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2009-12-31'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <address@hidden>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1435,6 +1436,8 @@ case $os in
        -dicos*)
                os=-dicos
                ;;
+        -nacl*)
+               ;;
        -none)
                ;;
        *)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 73011dc..c160028 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010  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
@@ -66,6 +66,7 @@ acoutpt.test \
 acoutpt2.test \
 acoutqnl.test \
 acoutbs.test \
+acoutbs2.test \
 acsilent.test \
 acsubst.test \
 acsubst2.test \
@@ -108,6 +109,7 @@ backsl2.test \
 backsl3.test \
 backsl4.test \
 badline.test \
+badopt.test \
 badprog.test \
 block.test \
 bsource.test \
@@ -297,6 +299,7 @@ exsource.test \
 ext.test \
 ext2.test \
 extra.test \
+extra2.test \
 extra3.test \
 extra4.test \
 extra5.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 90082f6..870a218 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -16,7 +16,7 @@
 @SET_MAKE@
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010  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
@@ -300,6 +300,7 @@ acoutpt.test \
 acoutpt2.test \
 acoutqnl.test \
 acoutbs.test \
+acoutbs2.test \
 acsilent.test \
 acsubst.test \
 acsubst2.test \
@@ -342,6 +343,7 @@ backsl2.test \
 backsl3.test \
 backsl4.test \
 badline.test \
+badopt.test \
 badprog.test \
 block.test \
 bsource.test \
@@ -531,6 +533,7 @@ exsource.test \
 ext.test \
 ext2.test \
 extra.test \
+extra2.test \
 extra3.test \
 extra4.test \
 extra5.test \
diff --git a/tests/acoutbs.test b/tests/acoutbs.test
index 0f5eb48..0ce981c 100755
--- a/tests/acoutbs.test
+++ b/tests/acoutbs.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2001, 2002, 2010  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
@@ -19,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -29,5 +31,13 @@ END
 : > Makefile.am
 : > zot.in
 
-$ACLOCAL || Exit 1
+$ACLOCAL
+$AUTOCONF
 $AUTOMAKE
+
+./configure
+
+test -f zot || Exit 1
+ls -a | grep '\\' && Exit 1
+
+:
diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test
index 2df24c2..5e03c08 100755
--- a/tests/acoutbs2.test
+++ b/tests/acoutbs2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2002, 2010  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
@@ -19,9 +19,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
-PACKAGE=nonesuch
-VERSION=nonesuch
+AC_INIT
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -34,4 +36,13 @@ END
 : > Makefile.am
 : > zot.in
 
+$ACLOCAL
+$AUTOCONF
 $AUTOMAKE
+
+./configure
+
+test -f zot || Exit 1
+ls -a | grep '\\' && Exit 1
+
+:


hooks/post-receive
-- 
GNU Automake