[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-107-gf68d015

[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=f68d0155cb558ada12c24fba3da4143755e4f3bf

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

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog           |   26 ++++++++++++++++++++++++++
 INSTALL             |   39 ++++++++++++++++++++-------------------
 lib/INSTALL         |   39 ++++++++++++++++++++-------------------
 lib/config.guess    |   32 ++++++++++++++++++++------------
 lib/config.sub      |   20 ++++++++++++++------
 tests/Makefile.am   |    5 ++++-
 tests/Makefile.in   |    5 ++++-
 tests/acoutbs.test  |   14 ++++++++++++--
 tests/acoutbs2.test |   17 ++++++++++++++---
 9 files changed, 134 insertions(+), 63 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 35602c2..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
@@ -69,6 +69,10 @@ of `autoconf'.
 
   5. Optionally, type `make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
   6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
@@ -141,7 +145,7 @@ Installation Names
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute path.
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -155,7 +159,7 @@ kinds of files.  Run `configure --help' for a list of the 
directories
 you can set and what kinds of files go in them.  In general, the
 default for these options is expressed in terms of `${prefix}', so that
 specifying just `--prefix' will affect all of the other directory
-specifications.
+specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
 correct locations to `configure'; however, many packages provide one or
@@ -165,28 +169,25 @@ having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
 affected directory.  For example, `make install
-prefix=/path/to/alternate' will choose an alternate location, as well as
-influencing all other directory configuration variables that were
-expressed in terms of `${prefix}' (or, put another way, all directories
-specified during `configure' but not in terms of the common prefix must
-each be overridden at install time for the entire installation to be
-relocated).  The approach of makefile variable overrides for each
-directory variable is required by the GNU Coding Standards, and ideally
-causes no recompilation.  However, some platforms have known
-limitations with the semantics of shared libraries that end up
-requiring recompilation when using this method, particularly noticeable
-in packages that use GNU Libtool.
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
 
    The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/path/to/alternate' will prepend
-`/path/to/alternate' before all installation paths.  The approach of
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
 `DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
 when some directory options were not specified in terms of `${prefix}'
-at `configure' time.  For packages which support `DESTDIR', the
-variable should remain undefined during `configure' and `make all', and
-only be specified during `make install'.
+at `configure' time.
 
 Optional Features
 =================
diff --git a/lib/INSTALL b/lib/INSTALL
index 35602c2..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
@@ -69,6 +69,10 @@ of `autoconf'.
 
   5. Optionally, type `make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
   6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
@@ -141,7 +145,7 @@ Installation Names
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute path.
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -155,7 +159,7 @@ kinds of files.  Run `configure --help' for a list of the 
directories
 you can set and what kinds of files go in them.  In general, the
 default for these options is expressed in terms of `${prefix}', so that
 specifying just `--prefix' will affect all of the other directory
-specifications.
+specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
 correct locations to `configure'; however, many packages provide one or
@@ -165,28 +169,25 @@ having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
 affected directory.  For example, `make install
-prefix=/path/to/alternate' will choose an alternate location, as well as
-influencing all other directory configuration variables that were
-expressed in terms of `${prefix}' (or, put another way, all directories
-specified during `configure' but not in terms of the common prefix must
-each be overridden at install time for the entire installation to be
-relocated).  The approach of makefile variable overrides for each
-directory variable is required by the GNU Coding Standards, and ideally
-causes no recompilation.  However, some platforms have known
-limitations with the semantics of shared libraries that end up
-requiring recompilation when using this method, particularly noticeable
-in packages that use GNU Libtool.
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
 
    The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/path/to/alternate' will prepend
-`/path/to/alternate' before all installation paths.  The approach of
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
 `DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
 when some directory options were not specified in terms of `${prefix}'
-at `configure' time.  For packages which support `DESTDIR', the
-variable should remain undefined during `configure' and `make all', and
-only be specified during `make install'.
+at `configure' time.
 
 Optional Features
 =================
diff --git a/lib/config.guess b/lib/config.guess
index e792aac..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-09-18'
+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."
@@ -333,6 +334,9 @@ case 
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+       echo i386-pc-auroraux${UNAME_RELEASE}
+       exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        eval $set_cc_for_build
        SUN_ARCH="i386"
@@ -807,12 +811,12 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
        case ${UNAME_MACHINE} in
            x86)
                echo i586-pc-interix${UNAME_RELEASE}
                exit ;;
-           EM64T | authenticamd | genuineintel)
+           authenticamd | genuineintel | EM64T)
                echo x86_64-unknown-interix${UNAME_RELEASE}
                exit ;;
            IA64)
@@ -891,7 +895,15 @@ EOF
        echo frv-unknown-linux-gnu
        exit ;;
     i*86:Linux:*:*)
-       echo ${UNAME_MACHINE}-pc-linux-gnu
+       LIBC=gnu
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
        exit ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,11 +930,7 @@ EOF
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-           /^CPU/{
-               s: ::g
-               p
-           }'`"
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
        ;;
     or32:Linux:*:*)
diff --git a/lib/config.sub b/lib/config.sub
index 5ecc18b..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-10-07'
+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."
@@ -295,6 +296,7 @@ case $basic_machine in
        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
        | spu | strongarm \
        | tahoe | thumb | tic4x | tic80 | tron \
+       | ubicom32 \
        | v850 | v850e \
        | we32k \
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -381,6 +383,7 @@ case $basic_machine in
        | tahoe-* | thumb-* \
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
        | tron-* \
+       | ubicom32-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -1254,6 +1257,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
        # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+               os=-auroraux
+               ;;
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
                ;;
@@ -1275,8 +1281,8 @@ case $os in
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | 
-sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -kopensolaris* \
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | 
-solaris* \
+             | -sym* | -kopensolaris* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
              | -aos* | -aros* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1430,6 +1436,8 @@ case $os in
        -dicos*)
                os=-dicos
                ;;
+        -nacl*)
+               ;;
        -none)
                ;;
        *)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 449a36c..3428b44 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 \
@@ -303,6 +305,7 @@ ext.test \
 ext2.test \
 ext3.test \
 extra.test \
+extra2.test \
 extra3.test \
 extra4.test \
 extra5.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1d91851..b84dd1d 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
@@ -307,6 +307,7 @@ acoutpt.test \
 acoutpt2.test \
 acoutqnl.test \
 acoutbs.test \
+acoutbs2.test \
 acsilent.test \
 acsubst.test \
 acsubst2.test \
@@ -349,6 +350,7 @@ backsl2.test \
 backsl3.test \
 backsl4.test \
 badline.test \
+badopt.test \
 badprog.test \
 block.test \
 bsource.test \
@@ -544,6 +546,7 @@ ext.test \
 ext2.test \
 ext3.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