* lib/am/configure.am (%MAKEFILE-IN%): Propagate automake's exit

status.
* tests/makej.test: New file (test Autom4te's cache locking,
new in CVS Autoconf).
* tests/Makefile.am (TESTS): Add makej.test.

diff --git a/ChangeLog b/ChangeLog
index edb45b4e44ef7eacd3a91f772d5ecbaa6d5d6e8e..4bb5e8d6bf6be8b047ae6600563247c5e1913805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-07  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/am/configure.am (%MAKEFILE-IN%): Propagate automake's exit
+       status.
+       * tests/makej.test: New file (test Autom4te's cache locking,
+       new in CVS Autoconf).
+       * tests/Makefile.am (TESTS): Add makej.test.
+
 2003-05-06  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/General.pm (contents): New function.

diff --git a/Makefile.in b/Makefile.in
index dbca2a559a9daa9e3774d134c9979dbf54ee90e9..ea09e6733149e09aefbebad6218bcf24c1e22b07 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -196,8 +196,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
              echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-             cd $(srcdir) && $(AUTOMAKE) --gnu ; \
-             exit 0;; \
+             cd $(srcdir) && $(AUTOMAKE) --gnu  \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \

diff --git a/configure b/configure
index 2e1c01a44a67123fb65e735aefc1d2152cc72a5e..6dde1bdb4774149d10c45a297bc9b5dbd58d1b3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for GNU Automake 1.7a.
+# Generated by GNU Autoconf 2.57a for GNU Automake 1.7a.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -43,7 +43,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -855,7 +855,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Automake configure 1.7a
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.57a
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -870,7 +870,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.57a.  Invocation command line was
 
   $ $0 $@
 
@@ -1283,6 +1283,7 @@ am__api_version="1.7a"
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1299,6 +1300,7 @@ do
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1463,7 +1465,7 @@ done
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2019,7 +2021,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -2234,7 +2236,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by GNU Automake $as_me 1.7a, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.57a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2289,7 +2291,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Automake config.status 1.7a
-configured by $0, generated by GNU Autoconf 2.57,
+configured by $0, generated by GNU Autoconf 2.57a,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -2676,14 +2678,14 @@ echo "$as_me: creating $ac_file" >&6;}
          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+         echo "$f";;
       *) # Relative
          if test -f "$f"; then
            # Build tree
-           echo $f
+           echo "$f"
          elif test -f "$srcdir/$f"; then
            # Source tree
-           echo $srcdir/$f
+           echo "$srcdir/$f"
          else
            # /dev/null tree
            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index af55fe2d087b7587efc67570d38d55cce29895b2..bcca798335057785e84910d380d4f99365ff114e 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -146,8 +146,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Automake/Makefile'; \

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index d5a4ca5837215e35a9093682ad7dedbaa0cada48..1a19815b7a6fa2ed7465eb4dea40b0553f94b9b2 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -126,8 +126,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Automake/tests/Makefile'; \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 364dddceb96ecd95d7922bf994dc9b43f91c952d..28b97103014aa7858a277ad7b4aa5653fe61a1a1 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -144,8 +144,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 5b7ff54ca04d8002ad40c36b8f219778aaf12042..5fa673e6318df4bf8467a138df7f2bd15c3f0582 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -132,8 +132,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/am/Makefile'; \

diff --git a/lib/am/configure.am b/lib/am/configure.am
index 474e83138a2a78892041638e95d72e3b73926712..2d05f18bb8fd3d49e4d9b85bf222a3fb50db3c60 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -42,9 +42,10 @@ endif %?TOPDIR_P%
          case '$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
 ?TOPDIR_P?           echo ' cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%'; \
-?TOPDIR_P?           cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS%; \
-?!TOPDIR_P?          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+?TOPDIR_P?           cd $(srcdir) && $(AUTOMAKE) --%STRICTNESS% %USE-DEPS% \
+?!TOPDIR_P?          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
 ## Otherwise, rebuild only this file.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 4df46453ee894c88be94c3ddfc6fbe59161172a9..9d9e0b9ab1182236c931abbfe3bdd81734a7b892 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -162,8 +162,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f85f4e2c1617fd171a27846ec50071810404dd9d..74ed8d9a9618e47c9ca5e49898dbdc05437f99a9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -272,6 +272,7 @@ ltdeps.test \
 ltlibobjs.test \
 maintclean.test \
 make.test \
+makej.test \
 makevars.test \
 man.test \
 man2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 13bfa453b4458c13ac959db461bec560e556801e..5600352dade77b377c39401d2a2523d5dd822a6e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -383,6 +383,7 @@ ltdeps.test \
 ltlibobjs.test \
 maintclean.test \
 make.test \
+makej.test \
 makevars.test \
 man.test \
 man2.test \
@@ -590,8 +591,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(
        @for dep in $?; do \
          case '$(top_srcdir)/configure.in $(ACLOCAL_M4) $(am__configure_deps)' in \
            *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh; \
-             exit 0;; \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
          esac; \
        done; \
         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \

diff --git a/tests/makej.test b/tests/makej.test
new file mode 100755 (executable)
index 0000000..5b646fe
--- /dev/null
+++ b/tests/makej.test
@@ -0,0 +1,57 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake 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.
+#
+# GNU Automake 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 autoconf; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# `make -j' used to fail with Autoconf < 2.58, because tools like
+# autoconf and automake can try to update autom4te's cache in parallel.
+#
+# Note that failures might not be reproducible systematically as they
+# depend on the time at which autoconf and automake update the cache
+# via autom4te.
+
+required=GNUmake
+. ./defs || exit 1
+
+set -e
+
+cat >configure.in <<'END'
+m4_include([version.m4])
+AC_INIT([version7], [THE_VERSION])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+echo 'm4_define([THE_VERSION], [2.718])' > version.m4
+
+: > Makefile.am
+
+$ACLOCAL
+$AUTOCONF
+$AUTOHEADER
+$AUTOMAKE --add-missing
+./configure --version | grep '2\.718'
+./configure
+$MAKE
+
+$sleep
+echo 'm4_define([THE_VERSION], [3.141])' > version.m4
+$MAKE -j
+./configure --version | grep '3\.141'