[SCM] GNU Autoconf source repository branch, master, updated. v2.65-32-g57b9bc3

[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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=57b9bc399fd2ea4d8a320f7e044e9223ddb8528a

The branch, master has been updated
       via  57b9bc399fd2ea4d8a320f7e044e9223ddb8528a (commit)
      from  56f5b9bc6a3a4a4dccea38005e211066d1ba96cd (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 57b9bc399fd2ea4d8a320f7e044e9223ddb8528a
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jan 18 20:26:22 2010 +0100

    config.status: consistent exit status with nonexistent config file input.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_MAIN_LOOP): Ensure we
    exit with status 1 rather than with that of 'false', for
    reproducibility.
    (AC_OUTPUT): Ensure to exit 1 in case of config.status failure.
    * tests/torture.at (Missing templates): Also test code path
    for $srcdir != '.'.
    Report by Tim Rice.

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

Summary of changes:
 ChangeLog              |   11 +++++++++++
 lib/autoconf/status.m4 |    4 ++--
 tests/torture.at       |    9 +++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1719deb..eaee96b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-19  Ralf Wildenhues  <address@hidden>
+
+       config.status: consistent exit status with nonexistent config file 
input.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_MAIN_LOOP): Ensure we
+       exit with status 1 rather than with that of 'false', for
+       reproducibility.
+       (AC_OUTPUT): Ensure to exit 1 in case of config.status failure.
+       * tests/torture.at (Missing templates): Also test code path
+       for $srcdir != '.'.
+       Report by Tim Rice.
+
 2010-01-13  Eric Blake  <address@hidden>
 
        Fix previous example.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index f74bd34..3fddc38 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1294,7 +1294,7 @@ if test "$no_create" != yes; then
   exec AS_MESSAGE_LOG_FD>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || AS_EXIT
+  $ac_cs_success || AS_EXIT([1])
 fi
 dnl config.status should not do recursion.
 AC_PROVIDE_IFELSE([AC_CONFIG_SUBDIRS], [_AC_OUTPUT_SUBDIRS()])dnl
@@ -1666,7 +1666,7 @@ do
           [[\\/$]]*) false;;
           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
           esac ||
-          AC_MSG_ERROR([cannot find input file: `$ac_f']);;
+          AC_MSG_ERROR([cannot find input file: `$ac_f'], [1]);;
       esac
       case $ac_f in *\'*) ac_f=`AS_ECHO(["$ac_f"]) | sed 
"s/'/'\\\\\\\\''/g"`;; esac
       AS_VAR_APPEND([ac_file_inputs], [" '$ac_f'"])
diff --git a/tests/torture.at b/tests/torture.at
index ceea62c..8291694 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -370,6 +370,15 @@ AC_OUTPUT
 ]])
 
 AT_CHECK_AUTOCONF
+mkdir build
+AT_CAPTURE_FILE([build/config.log])[]dnl
+cd build
+AT_CHECK([../configure], [1], [ignore],
+[[config.status: error: cannot find input file: `nonexistent.in'
+]])
+# Make sure that the output file doesn't exist
+AT_CHECK([test -f nonexistent], 1)
+cd ..
 AT_CHECK_CONFIGURE([], [1], [],
 [[config.status: error: cannot find input file: `nonexistent.in'
 ]])


hooks/post-receive
-- 
GNU Autoconf source repository