[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-32-g27f39e4

[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=27f39e402a2af50e041311c326e3d1413f420f1a

The branch, branch-1.11 has been updated
       via  27f39e402a2af50e041311c326e3d1413f420f1a (commit)
       via  971878288bec797087215f7fb1e7c398ef2f3a1a (commit)
       via  674ee2f48686aa67507f9fa6dd67487f8a0e3b93 (commit)
      from  55bead34fa50168252ffe716a78bf7312dbc6d85 (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 27f39e402a2af50e041311c326e3d1413f420f1a
Merge: 55bead34fa50168252ffe716a78bf7312dbc6d85 
971878288bec797087215f7fb1e7c398ef2f3a1a
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Oct 6 22:06:11 2009 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                            |   19 ++++++++++
 lib/compile                          |    6 ++--
 tests/Makefile.am                    |    1 +
 tests/Makefile.in                    |    1 +
 tests/README                         |    2 +-
 tests/{subobj3.test => ccnoco3.test} |   64 +++++++++++++++++++++-------------
 6 files changed, 65 insertions(+), 28 deletions(-)
 copy tests/{subobj3.test => ccnoco3.test} (57%)

diff --git a/ChangeLog b/ChangeLog
index 21cfefc..89a41fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-10-06  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix 'compile' script to not call mv when target equals source.
+       * lib/compile: Don't attempt to move the generated file to its
+       target destination when it is already at the target destination.
+       Avoids an mv failure with subdir-objects.
+       * tests/ccnoco3.test: New test.
+       * tests/Makefile.am: Adjust.
+
+2009-10-01  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       Fix recommended way to run automake's test scripts with Zsh.
+       * tests/README (Supported shells): Changed the recommended way
+       to run automake's test scripts with Zsh.  Now we tell to use
+       the Zsh's command line option `-o no_function_argzero', not
+       `--no-function-argzero', since the latter does not work with
+       versions 3.x of Zsh.
+
 2009-09-18  Peter Johansson  <address@hidden>  (tiny change)
 
        Fix link to "Recursive Make Considered Harmful" paper.
diff --git a/lib/compile b/lib/compile
index ec64c62..c0096a7 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-10-06.20; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
 # Foundation, Inc.
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
 ret=$?
 
 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62529a6..bab2ac3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,6 +103,7 @@ canon5.test \
 canon-name.test \
 ccnoco.test \
 ccnoco2.test \
+ccnoco3.test \
 check.test \
 check2.test \
 check3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7a3c72b..0e44d82 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -337,6 +337,7 @@ canon5.test \
 canon-name.test \
 ccnoco.test \
 ccnoco2.test \
+ccnoco3.test \
 check.test \
 check2.test \
 check3.test \
diff --git a/tests/README b/tests/README
index b264881..4068ad6 100644
--- a/tests/README
+++ b/tests/README
@@ -57,7 +57,7 @@ Supported shells
   no easy workaround.  Thus, if you want to run a test script, say
   foo.test, with Zsh, you *can't* simply do `zsh foo.test', but you
   *must* resort to:
-    zsh --no-function-argzero foo.test
+    zsh -o no_function_argzero foo.test
 
   Note that this problem does not occur if zsh is executed through a
   symlink with a basename of `sh', since in that case it starts
diff --git a/tests/subobj3.test b/tests/ccnoco3.test
similarity index 57%
copy from tests/subobj3.test
copy to tests/ccnoco3.test
index a4ba765..2e9cd37 100755
--- a/tests/subobj3.test
+++ b/tests/ccnoco3.test
@@ -1,6 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006  Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2008, 2009  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
@@ -15,51 +14,68 @@
 # 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 of subdir objects with C++.
+# Test to make sure `compile' doesn't call 'mv SRC SRC'.
 
 required=gcc
 . ./defs || Exit 1
 
 set -e
 
-cat > configure.in << 'END'
-AC_INIT(sub/hello.c)
-dnl Prevent automake from looking in .. and ../..
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(hello,0.23)
+cat >> configure.in << 'END'
 AC_PROG_CC
-AC_PROG_CC_STDC
 AM_PROG_CC_C_O
-AM_C_PROTOTYPES
-AC_OUTPUT(Makefile)
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = hello
-hello_SOURCES = sub/hello.c
+bin_PROGRAMS = wish
+wish_SOURCES = a.c
 END
 
 mkdir sub
-cat > sub/hello.c << 'END'
+
+cat > a.c << 'END'
 #include <stdio.h>
-int
-main (int argc, char *argv[])
+
+int main ()
 {
-   printf ("yeah, yeah\n");
-   return 0;
+  printf ("hi\n");
 }
 END
 
+cat > Mycomp << 'END'
+#!/bin/sh
+
+case " "$* in
+ *\ -c*\ -o* | *\ -o*\ -c*)
+    exit 1
+    ;;
+esac
+
+exec gcc "$@"
+END
+
+chmod +x Mycomp
+
 # Ignore user CFLAGS.
 CFLAGS=
 export CFLAGS
 
-# We use gcc and not gcc -traditional as the latter fails on some
-# Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a
-./configure
-ANSI2KNR=./ansi2knr U=_ $MAKE -e
-./hello
+$AUTOMAKE --copy --add-missing
+
+mkdir build
+cd build
+
+# Make sure the compiler doesn't understand `-c -o'
+CC=`pwd`/../Mycomp
+export CC
+
+../configure
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'mv.*the same file' stderr && Exit 1
+
+Exit 0


hooks/post-receive
-- 
GNU Automake