[SCM] GNU Autoconf source repository branch, master, updated. v2.62-20-g4bd8756

[Eric Blake]

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=4bd87562dca6bcf5e0cf3f282782b9e0ee3df7b3

The branch, master has been updated
       via  4bd87562dca6bcf5e0cf3f282782b9e0ee3df7b3 (commit)
       via  e7232d49cab7933f7eca277cf3ab864cd145c5a5 (commit)
      from  822c5bbf02bc5f86db975014e27958b5bda6e054 (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 4bd87562dca6bcf5e0cf3f282782b9e0ee3df7b3
Author: Ralf Wildenhues <address@hidden>
Date:   Tue May 6 22:41:54 2008 +0200

    Let AC_MSG_FAILURE report pwd.
    
    * lib/autoconf/general.m4 (_AC_ARG_VAR_VALIDATE, AC_MSG_FAILURE):
    Output $ac_pwd along with fatal failure.
    * tests/torture.at (Deep Package): Extend test.
    Reported numerous times against GCC, and probably other packages.

commit e7232d49cab7933f7eca277cf3ab864cd145c5a5
Author: Eric Blake <address@hidden>
Date:   Wed May 7 09:00:16 2008 -0600

    Enforce --help and --version compliance.
    
    * configure.ac (AM_INIT_AUTOMAKE): Add std-options option.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog               |   13 +++++++++++++
 configure.ac            |    2 +-
 lib/autoconf/general.m4 |    6 ++++--
 tests/torture.at        |   11 +++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41716a5..5af9cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-05-12  Ralf Wildenhues  <address@hidden>
+
+       Let AC_MSG_FAILURE report pwd.
+       * lib/autoconf/general.m4 (_AC_ARG_VAR_VALIDATE, AC_MSG_FAILURE):
+       Output $ac_pwd along with fatal failure.
+       * tests/torture.at (Deep Package): Extend test.
+       Reported numerous times against GCC, and probably other packages.
+
+2008-05-12  Eric Blake  <address@hidden>
+
+       Enforce --help and --version compliance.
+       * configure.ac (AM_INIT_AUTOMAKE): Add std-options option.
+
 2008-05-08  Keith Marshall  <address@hidden>  (tiny change)
 
        Avoid case-insensitive `make install' vs. `INSTALL' conflict.
diff --git a/configure.ac b/configure.ac
index f06559e..9fbb235 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CONFIG_SRCDIR([ChangeLog])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 readme-alpha no-texinfo.tex])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 readme-alpha no-texinfo.tex std-options])
 
 # We use `/bin/sh -n script' to check that there are no syntax errors
 # in the scripts.  Although incredible, there are /bin/sh that go into
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 57b4871..0f8e32d 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1576,6 +1576,7 @@ for ac_var in $ac_precious_vars; do
   fi
 done
 if $ac_cache_corrupted; then
+  AS_MESSAGE([error: in `$ac_pwd':], 2)
   AS_MESSAGE([error: changes in the environment can compromise the build], 2)
   AS_ERROR([run `make distclean' and/or `rm $cache_file' and start over])
 fi])dnl
@@ -2166,8 +2167,9 @@ m4_copy([AS_WARN],    [AC_MSG_WARN])
 m4_copy([AS_MESSAGE], [AC_MSG_NOTICE])
 m4_copy([AS_ERROR],   [AC_MSG_ERROR])
 m4_define([AC_MSG_FAILURE],
-[AC_MSG_ERROR([$1
-See `config.log' for more details.], [$2])])
+[{ AS_MESSAGE([error: in `$ac_pwd':], 2)
+AC_MSG_ERROR([$1
+See `config.log' for more details.], [$2]); }])
 
 
 # _AC_MSG_LOG_CONFTEST
diff --git a/tests/torture.at b/tests/torture.at
index 2a88f36..c37daba 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1275,6 +1275,9 @@ AT_DATA([inner/innermost/configure.in],
 AC_ARG_VAR([INNERMOST], [an innermost variable])
 AC_CONFIG_HEADERS(config.h:config.hin)
 AC_DEFINE_UNQUOTED([INNERMOST], [$INNERMOST], [an innermost variable])
+if test -n "$innermost_error"; then
+  AC_MSG_FAILURE([Error in $PACKAGE_NAME])
+fi
 AC_OUTPUT
 ]])
 
@@ -1324,6 +1327,14 @@ AT_CHECK([grep INNERMOST inner/innermost/config.h], 0,
 [[#define INNERMOST tsomrenni
 ]])
 
+# Ensure we point to the right config.log file for errors.
+AT_CHECK_CONFIGURE([innermost_error=:], [1], [], [stderr])
+AT_CHECK([grep 'inner/innermost' stderr], [], [ignore])
+cd inner
+AT_CHECK_CONFIGURE([innermost_error=:], [1], [], [stderr])
+AT_CHECK([grep 'innermost' stderr], [], [ignore])
+cd ..
+
 # The same, but from a builddir.
 AS_MKDIR_P([builddir])
 chmod a-w builddir inner/innermost inner


hooks/post-receive
--
GNU Autoconf source repository