Re: [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-82-gac0fd19

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

> According to Paolo Bonzini on 7/13/2009 1:47 PM:
>     * tests/autotest.st: Add tests for AT_SKIP_IF and AT_FAIL_IF.
>     Use AT_SKIP_IF.
>     * tests/local.st: Use AT_SKIP_IF.

I noticed a typo in the ChangeLog, along with a couple other things.  So
I'm committing this to fix a few nits that remain over today's patches.
Now that m4 1.4.13 is released, we might as well recommend it (especially
since 1.4.11 doesn't know --gnu).  And in the documentation, since
@var{shell-condition} is true if the group is skip/hard-failed, then the
longer sample should use the same sense.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpcA2UACgkQ84KuGfSFAYCNogCgrCURM9pOFtXL3Y3EUeNOZPpS
9QYAn0tbu+bHNYNM00OJaDkQf/EOC0z/
=w1NY
-----END PGP SIGNATURE-----

>From c633d4a39a0385a3534ab154390943d5de50b3ff Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 13 Jul 2009 21:34:49 -0600
Subject: [PATCH] Fix nits in recent patches.

* configure.ac (ac_cv_dir_trailing_space): Avoid $status, for
zsh.
* doc/autoconf.texi (Writing Testsuites) <AT_FAIL_IF, AT_SKIP_IF>:
Tweak wording.
(Introduction): Recommend m4 1.4.13.
* README: Likewise.
* m4/m4.m4 (AC_PROG_GNU_M4): Likewise.  Use long option --gnu
rather than -g.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog         |   16 ++++++++++++++--
 README            |    2 +-
 configure.ac      |    6 +++---
 doc/autoconf.texi |    8 ++++----
 m4/m4.m4          |    9 +++++----
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 565b9e9..f8df09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-07-13  Eric Blake  <address@hidden>
+
+       Fix nits in recent patches.
+       * configure.ac (ac_cv_dir_trailing_space): Avoid $status, for
+       zsh.
+       * doc/autoconf.texi (Writing Testsuites) <AT_FAIL_IF, AT_SKIP_IF>:
+       Tweak wording.
+       (Introduction): Recommend m4 1.4.13.
+       * README: Likewise.
+       * m4/m4.m4 (AC_PROG_GNU_M4): Likewise.  Use long option --gnu
+       rather than -g.
+
 2009-07-13  Paolo Bonzini  <address@hidden>

        Introduce AT_SKIP_IF and AT_FAIL_IF
@@ -6,9 +18,9 @@
        * lib/autotest/general.m4 (_AT_LINE_ESCAPED, AT_SKIP_IF,
        AT_FAIL_IF, _AT_CHECK_EXIT): New.
        (AT_CHECK): Use _AT_LINE_ESCAPED.
-       * tests/autotest.st: Add tests for AT_SKIP_IF and AT_FAIL_IF.
+       * tests/autotest.at: Add tests for AT_SKIP_IF and AT_FAIL_IF.
        Use AT_SKIP_IF.
-       * tests/local.st: Use AT_SKIP_IF.
+       * tests/local.at: Use AT_SKIP_IF.

 2009-07-13  Paolo Bonzini  <address@hidden>

diff --git a/README b/README
index 5524941..1e35ff7 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ macro calls.

 Producing configuration scripts using Autoconf requires GNU M4 and
 Perl.  You should install GNU M4 (version 1.4.5 or later is required;
-1.4.12 or later is recommended) and Perl (5.005_03 or later) before
+1.4.13 or later is recommended) and Perl (5.005_03 or later) before
 configuring Autoconf, so that Autoconf's configure script can find
 them.  The configuration scripts produced by Autoconf are
 self-contained, so their users do not need to have Autoconf (or GNU
diff --git a/configure.ac b/configure.ac
index d5659e2..0f2aec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 # Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 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
@@ -90,9 +90,9 @@ AC_SUBST([ac_cv_unsupported_fs_chars])
 AC_CACHE_CHECK([whether directories can have trailing spaces],
               [ac_cv_dir_trailing_space],
 [rm -rf 'conftest.d ' && mkdir 'conftest.d ' && touch 'conftest.d /tfile' 
2>/dev/null
-status=$?
+stat=$?
 rm -rf 'conftest.d '
-case $status$? in #(
+case $stat$? in #(
    00) ac_cv_dir_trailing_space=yes ;; #(
    *) ac_cv_dir_trailing_space=no ;;
 esac
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 0802c2a..aa6ceba 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -730,7 +730,7 @@ Introduction
 Autoconf requires @acronym{GNU} M4 version 1.4.5 or later in order to
 generate the scripts.  It uses features that some versions of M4,
 including @acronym{GNU} M4 1.3, do not have.  Autoconf works better
-with @acronym{GNU} M4 version 1.4.11 or later, though this is not
+with @acronym{GNU} M4 version 1.4.13 or later, though this is not
 required.

 @xref{Autoconf 1}, for information about upgrading from version 1.
@@ -22655,7 +22655,7 @@ Writing Testsuites

 @defmac AT_FAIL_IF (@var{shell-condition})
 @atindex{FAIL_IF}
-Make the test group fail, skipping the rest of its execution if
+Make the test group fail and skip the rest of its execution, if
 @var{shell-condition} is true.  @var{shell-condition} is a shell expression
 such as a @code{test} command.  Tests before @command{AT_FAIL_IF}
 will be executed and may still cause the test group to be skipped.
@@ -22665,7 +22665,7 @@ Writing Testsuites
 @var{shell-condition} could emit any kind of output you should instead
 use @command{AT_CHECK} like
 @example
-AT_CHECK(address@hidden || exit 99])
+AT_CHECK([if @var{shell-condition}; then exit 99; fi])
 @end example
 @noindent
 so that such output is properly recorded in the @file{testsuite.log}
@@ -22685,7 +22685,7 @@ Writing Testsuites
 @var{shell-condition} could emit any kind of output you should instead
 use @command{AT_CHECK} like
 @example
-AT_CHECK(address@hidden || exit 77])
+AT_CHECK([if @var{shell-condition}; then exit 77; fi])
 @end example
 @noindent
 so that such output is properly recorded in the @file{testsuite.log}
diff --git a/m4/m4.m4 b/m4/m4.m4
index 975f24a..d637e92 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,4 +1,4 @@
-# m4.m4 serial 7
+# m4.m4 serial 8

 # Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
 # Inc.
@@ -32,15 +32,16 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4],
       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
       rm -f conftest.m4f],
       [AC_MSG_ERROR([no acceptable m4 could be found in \$PATH.
-GNU M4 1.4.5 or later is required; 1.4.11 is recommended])])])
+GNU M4 1.4.5 or later is required; 1.4.13 is recommended])])])
   M4=$ac_cv_path_M4
-  AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts -g], [ac_cv_prog_gnu_m4_gnu],
+  AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts --gnu],
+    [ac_cv_prog_gnu_m4_gnu],
     [case `$M4 --help < /dev/null 2>&1` in
       *--gnu*) ac_cv_prog_gnu_m4_gnu=yes ;;
       *) ac_cv_prog_gnu_m4_gnu=no ;;
     esac])
   if test "$ac_cv_prog_gnu_m4_gnu" = yes; then
-    M4_GNU=-g
+    M4_GNU=--gnu
   else
     M4_GNU=
   fi
-- 
1.6.3.3.334.g916e1