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

[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=5dc7189c00f37f9542ad8dba0c9266d372b0e117

The branch, master has been updated
       via  5dc7189c00f37f9542ad8dba0c9266d372b0e117 (commit)
       via  8638bebc97ce55d0f36172c83505df00dcf2804e (commit)
       via  cf6c3c34928dba8840ffce0b6b7c3708cf01d5f7 (commit)
       via  60da8c0ad73526f7aa345890455953a10d0bd5cb (commit)
      from  a7902d0d7ff638caf59a42c0aa923b448ce42fea (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 5dc7189c00f37f9542ad8dba0c9266d372b0e117
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 25 17:02:47 2010 +0200

    Error and warning message formatting cleanups.
    
    * doc/autoconf.texi (Autoconf Language, Generic Structures):
    Do not capitalize the first word in error messages, do not end
    them with a period.
    * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS, AC_MSG_FAILURE):
    Likewise.
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Likewise.
    * lib/autotest/general.m4 (AT_INIT, at_fn_group_prepare):
    Likewise.
    * m4/m4.m4 (AC_PROG_GNU_M4): Likewise.
    * tests/base.at (AC_TRY_COMMAND): Likewise.
    * tests/torture.at (datarootdir workaround): Adjust expected
    message.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 8638bebc97ce55d0f36172c83505df00dcf2804e
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 25 14:19:13 2010 +0200

    Fix placing of ellipses in English text.
    
    * lib/autoconf/general.m4 (_AC_INIT_HELP): Be sure to add a
    space before `...' in natural language text.
    * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL_BODY):
    Likewise.
    * lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Likewise.
    * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Likewise.
    * tests/suite.at: Likewise.
    * tests/torture.at (@%:@define header templates): Likewise.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit cf6c3c34928dba8840ffce0b6b7c3708cf01d5f7
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 25 14:18:19 2010 +0200

    Ensure autotest tests have an atconfig file, for testsuite -v.
    
    * tests/autotest.at (AT_CHECK_AT_PREP): Create a default
    atconfig file in the directory of the testsuite.
    (AT_CHECK_AT_TITLE): Also check that `./micro-suite -v' output
    does not contain empty $at_srcdir expansion.
    (srcdir propagation): Remove the atconfig file generated by
    AT_CHECK_AT_PREP.  Check each suite invocation for $at_srcdir
    expansion.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 60da8c0ad73526f7aa345890455953a10d0bd5cb
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 25 14:17:27 2010 +0200

    Fix autotest testsuite -v output to print test group title.
    
    * lib/autotest/general.m4 (AT_CLEANUP): Actually print test
    title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
    regression.
    * tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
    for test title in -v output.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                |   42 ++++++++++++++++++++++++++++++++++++++++++
 doc/autoconf.texi        |   10 +++++-----
 lib/autoconf/general.m4  |   10 +++++-----
 lib/autoconf/headers.m4  |    2 +-
 lib/autoconf/libs.m4     |    2 +-
 lib/autoconf/programs.m4 |    2 +-
 lib/autoconf/status.m4   |    2 +-
 lib/autotest/general.m4  |    6 +++---
 m4/m4.m4                 |    4 ++--
 tests/autotest.at        |   29 +++++++++++++++++++++++++++++
 tests/base.at            |    4 ++--
 tests/suite.at           |    2 +-
 tests/torture.at         |    4 ++--
 13 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85d2b11..454f5aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2010-04-26  Ralf Wildenhues  <address@hidden>
+
+       Error and warning message formatting cleanups.
+       * doc/autoconf.texi (Autoconf Language, Generic Structures):
+       Do not capitalize the first word in error messages, do not end
+       them with a period.
+       * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS, AC_MSG_FAILURE):
+       Likewise.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Likewise.
+       * lib/autotest/general.m4 (AT_INIT, at_fn_group_prepare):
+       Likewise.
+       * m4/m4.m4 (AC_PROG_GNU_M4): Likewise.
+       * tests/base.at (AC_TRY_COMMAND): Likewise.
+       * tests/torture.at (datarootdir workaround): Adjust expected
+       message.
+
+       Fix placing of ellipses in English text.
+       * lib/autoconf/general.m4 (_AC_INIT_HELP): Be sure to add a
+       space before `...' in natural language text.
+       * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL_BODY):
+       Likewise.
+       * lib/autoconf/libs.m4 (_AC_PATH_X_XMKMF): Likewise.
+       * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Likewise.
+       * tests/suite.at: Likewise.
+       * tests/torture.at (@%:@define header templates): Likewise.
+
+       Ensure autotest tests have an atconfig file, for testsuite -v.
+       * tests/autotest.at (AT_CHECK_AT_PREP): Create a default
+       atconfig file in the directory of the testsuite.
+       (AT_CHECK_AT_TITLE): Also check that `./micro-suite -v' output
+       does not contain empty $at_srcdir expansion.
+       (srcdir propagation): Remove the atconfig file generated by
+       AT_CHECK_AT_PREP.  Check each suite invocation for $at_srcdir
+       expansion.
+
+       Fix autotest testsuite -v output to print test group title.
+       * lib/autotest/general.m4 (AT_CLEANUP): Actually print test
+       title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
+       regression.
+       * tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
+       for test title in -v output.
+
 2010-04-26  Eric Blake  <address@hidden>
 
        Clarify octal escapes with tr.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index fa6015f..d6a08bc 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1175,7 +1175,7 @@ For instance:
 AC_CHECK_HEADER([stdio.h],
                 [AC_DEFINE([HAVE_STDIO_H], [1],
                    [Define to 1 if you have <stdio.h>.])],
-                [AC_MSG_ERROR([Sorry, can't do anything for you])])
+                [AC_MSG_ERROR([sorry, can't do anything for you])])
 @end example
 
 @noindent
@@ -1185,7 +1185,7 @@ is quoted properly.  You may safely simplify its 
quotation to:
 AC_CHECK_HEADER([stdio.h],
                 [AC_DEFINE([HAVE_STDIO_H], 1,
                    [Define to 1 if you have <stdio.h>.])],
-                [AC_MSG_ERROR([Sorry, can't do anything for you])])
+                [AC_MSG_ERROR([sorry, can't do anything for you])])
 @end example
 
 @noindent
@@ -1204,7 +1204,7 @@ annoying, and would rewrite the example as follows:
 AC_CHECK_HEADER(stdio.h,
                 [AC_DEFINE(HAVE_STDIO_H, 1,
                    [Define to 1 if you have <stdio.h>.])],
-                [AC_MSG_ERROR([Sorry, can't do anything for you])])
+                [AC_MSG_ERROR([sorry, can't do anything for you])])
 @end example
 
 @noindent
@@ -1220,7 +1220,7 @@ The following example is wrong and dangerous, as it is 
underquoted:
 AC_CHECK_HEADER(stdio.h,
                 AC_DEFINE(HAVE_STDIO_H, 1,
                    Define to 1 if you have <stdio.h>.),
-                AC_MSG_ERROR([Sorry, can't do anything for you]))
+                AC_MSG_ERROR([sorry, can't do anything for you]))
 @end example
 
 In other cases, you may have to use text that also resembles a macro
@@ -6465,7 +6465,7 @@ If no @var{includes} are specified, the default includes 
are used
 
 @example
 AC_CHECK_MEMBER([struct passwd.pw_gecos], [],
-                [AC_MSG_ERROR([We need `passwd.pw_gecos'!])],
+                [AC_MSG_ERROR([we need `passwd.pw_gecos'])],
                 [[#include <pwd.h>]])
 @end example
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 648f606..b7ac62f 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -873,7 +873,7 @@ do
     x_libraries=$ac_optarg ;;
 
   -*) AC_MSG_ERROR([unrecognized option: `$ac_option'
-Try `$[0] --help' for more information.])
+Try `$[0] --help' for more information])
     ;;
 
   *=*)
@@ -942,8 +942,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    AC_MSG_WARN([If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used.])
+    AC_MSG_WARN([if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used])
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1027,7 +1027,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -2223,7 +2223,7 @@ m4_copy([AS_ERROR],   [AC_MSG_ERROR])
 m4_define([AC_MSG_FAILURE],
 [{ AS_MESSAGE([error: in `$ac_pwd':], 2)
 AC_MSG_ERROR([$1
-See `config.log' for more details.], [$2]); }])
+See `config.log' for more details], [$2]); }])
 
 
 # _AC_MSG_LOG_CONFTEST
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index e32954b..c8d34c0 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -125,7 +125,7 @@ esac
 #
 # This is not based on _AC_CHECK_HEADER_COMPILE and _AC_CHECK_HEADER_PREPROC
 # because it obfuscate the code to try to factor everything, in particular
-# because of the cache variables, and the `checking...' messages.
+# because of the cache variables, and the `checking ...' messages.
 AC_DEFUN([_AC_CHECK_HEADER_MONGREL],
 [AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_header_mongrel],
   [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_header_mongrel],
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 73edad5..e3fa36d 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -177,7 +177,7 @@ libdir:
        @echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; 
then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse 
us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 
's/^$ac_var=//p'\`"
     done
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 9741f7b..4b9060f 100644
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -825,7 +825,7 @@ SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 63ac5ae..b12a4bd 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -673,7 +673,7 @@ m4_ifndef([AC_DATAROOTDIR_CHECKED],
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[[        ]]*datarootdir[[        ]]*:*=/p' "$tmp/out"`; 
test -z "$ac_out"; } &&
   AC_MSG_WARN([$ac_file contains a reference to the variable `datarootdir'
-which seems to be undefined.  Please make sure it is defined.])
+which seems to be undefined.  Please make sure it is defined])
 ])dnl
 
   rm -f "$tmp/stdin"
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index c12f7d9..ac8f523 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -631,7 +631,7 @@ m4_divert_push([PARSE_ARGS_END])dnl
 done
 
 # Verify our last option didn't require an argument
-AS_IF([test -n "$at_prev"], [AS_ERROR([`$at_prev' requires an argument.])])
+AS_IF([test -n "$at_prev"], [AS_ERROR([`$at_prev' requires an argument])])
 
 # Selected test groups.
 if test -z "$at_groups"; then
@@ -1096,7 +1096,7 @@ at_fn_group_prepare ()
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   _AS_CLEAN_DIR("$at_group_dir") ||
-    AS_WARN([test directory for $at_group_normalized could not be cleaned.])
+    AS_WARN([test directory for $at_group_normalized could not be cleaned])
   # Be tolerant if the above `rm' was not able to remove the directory.
   AS_MKDIR_P(["$at_group_dir"])
 
@@ -1846,7 +1846,7 @@ m4_divert_pop([TEST_SCRIPT])dnl Back to TEST_GROUPS
 AT_xfail
 echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $1..."])
+  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $at_desc ..."])
   $at_traceon
 m4_undivert([TEST_SCRIPT])dnl Insert the code here
   set +x
diff --git a/m4/m4.m4 b/m4/m4.m4
index 4a2d0d1..277b9c0 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -51,8 +51,8 @@ GNU M4 1.4.6 or later is required; 1.4.14 is recommended])])])
   if test x$ac_had_posixly_correct = xyes; then
     POSIXLY_CORRECT=:
     if test $ac_cv_prog_gnu_m4_gnu = no; then
-      AC_MSG_WARN([The version of M4 that was found does not support -g.])
-      AC_MSG_WARN([Using it with POSIXLY_CORRECT set may cause problems.])
+      AC_MSG_WARN([the version of M4 that was found does not support -g])
+      AC_MSG_WARN([using it with POSIXLY_CORRECT set may cause problems])
     fi
   fi
   AC_CACHE_CHECK([how m4 supports trace files], [ac_cv_prog_gnu_m4_debugfile],
diff --git a/tests/autotest.at b/tests/autotest.at
index 4eca4b0..7267915 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -53,6 +53,16 @@ m4_define([AT_PACKAGE_BUGREPORT], address@hidden)
 ]])
 dnl
 AT_DATA_AUTOTEST(AT_dir[/$1.at], [$2])
+AT_CHECK([cat >m4_default([$6], [.])/atconfig <<EOF
+at_testdir=m4_default([$6], [.])
+abs_builddir='`pwd`'
+at_srcdir=.
+abs_srcdir='`pwd`'
+at_top_srcdir=.
+abs_top_srcdir='`pwd`'
+at_top_build_prefix=
+abs_top_builddir='`pwd`'
+EOF])
 m4_ifval([$6], [(cd AT_dir])
 AT_CHECK_AUTOM4TE([--language=autotest -o $1 $1.at], [$3], [$4], [$5])
 m4_ifval([$6], [)])
@@ -674,6 +684,13 @@ s/^.\{]]]m4_default($5, 53)[[[\}ok.*/ok/p
 [[$3
 ok
 ]])
+dnl This sed script checks for two things - that -v output doesn't have
+dnl an empty $at_srcdir expansion, and that the 'testing ...' line
+dnl contains the test group title.
+AT_CHECK([[$CONFIG_SHELL ./micro-suite -v |
+           sed -n 's/.*testing \(.*\) \.\.\./\1/p; /^\/micro-suite\.at:/p']],,
+[[$3
+]])
 AT_CHECK([[$CONFIG_SHELL ./micro-suite -l |
           sed -n 's/.*[0-9]: [^         ][^     ]*[     ][      ]*\(.*[^       
 ]\)[    ]*/\1/p']],,
 [[$3
@@ -1343,11 +1360,15 @@ AT_CHECK([test -f "$top_srcdir"/a && test -f 
"$srcdir"/b])
 AT_CLEANUP
 ]], [], [], [], [pkg/t])
 
+rm -f pkg/t/atconfig
+
 # Build directory totally outside source directory.
 cd vpath-outside
 AT_CHECK([../pkg/configure $configure_options], [0], [ignore])
 cd t
 AT_CHECK([../../pkg/t/suite], [0], [ignore])
+AT_CHECK([../../pkg/t/suite -v], [0], [stdout])
+AT_CHECK([grep '^\.\./\.\./pkg/t/suite.at' stdout], [0], [ignore])
 cd ../..
 
 # Build directory totally outside source directory (absolute).
@@ -1356,6 +1377,8 @@ cd vpath-abs
 AT_CHECK(["$my_srcdir"/configure $configure_options], [0], [ignore])
 cd t
 AT_CHECK(["$my_srcdir"/t/suite], [0], [ignore])
+AT_CHECK(["$my_srcdir"/t/suite -v], [0], [stdout])
+AT_CHECK([grep '..*/t/suite.at' stdout], [0], [ignore])
 cd ../..
 
 # Build directory as subdirectory of source directory.
@@ -1363,12 +1386,16 @@ cd pkg/vpath-inside
 AT_CHECK([../configure $configure_options], [0], [ignore])
 cd t
 AT_CHECK([../../t/suite], [0], [ignore])
+AT_CHECK([../../t/suite -v], [0], [stdout])
+AT_CHECK([grep '^\.\./\.\./t/suite.at' stdout], [0], [ignore])
 cd ../../..
 
 # Build directory as parent of source directory.
 AT_CHECK([pkg/configure $configure_options], [0], [ignore])
 cd t
 AT_CHECK([../pkg/t/suite], [0], [ignore])
+AT_CHECK([../pkg/t/suite -v], [0], [stdout])
+AT_CHECK([grep '^\.\./pkg/t/suite.at' stdout], [0], [ignore])
 cd ..
 
 # Build directory as source directory.
@@ -1376,6 +1403,8 @@ cd pkg
 AT_CHECK_CONFIGURE
 cd t
 AT_CHECK([./suite], [0], [ignore])
+AT_CHECK([./suite -v], [0], [stdout])
+AT_CHECK([grep '^\./suite.at' stdout], [0], [ignore])
 cd ../..
 
 AT_CLEANUP
diff --git a/tests/base.at b/tests/base.at
index 5ce3e89..19b8f88 100644
--- a/tests/base.at
+++ b/tests/base.at
@@ -291,13 +291,13 @@ if AC_TRY_COMMAND([(echo "The Cat in the Hat";
                   grep \^The\ Cat\ in\ the\ Hat\$ >/dev/null]); then
   :
 else
-  AC_MSG_ERROR([Didn't see the Cat in the Hat!])
+  AC_MSG_ERROR([didn't see the Cat in the Hat])
 fi
 
 if AC_TRY_COMMAND([(echo "The Cat in the Hat";
                    echo "The Hat in the Cat" >&2) |
                   grep \^The\ Hat\ in\ the\ Cat\$ >/dev/null]); then
-  AC_MSG_ERROR([Saw the Hat in the Cat!])
+  AC_MSG_ERROR([saw the Hat in the Cat])
 fi
 ]])
 
diff --git a/tests/suite.at b/tests/suite.at
index 3f0ce42..17bacb7 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -38,7 +38,7 @@ m4_include([base.at])
 # Testing config.status
 # ---------------------
 # Actually should be named config.status.at but I fear problems with
-# the name.  Does no `checking...' at all, but exercises only code
+# the name.  Does no `checking ...' at all, but exercises only code
 # which following section use too.  Hence, run it first.
 m4_include([torture.at])
 
diff --git a/tests/torture.at b/tests/torture.at
index 82e9452..1eefd71 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -596,7 +596,7 @@ AT_CLEANUP
 ## Require 100 AC_DEFINE and AC_SUBST and AC_SUBST_FILE with a significantly
 ## big value.  This is mostly to check that Autoconf produces portable sed
 ## scripts in config.status.  sed is used to skip the first two lines
-## `Generated by...'.
+## `Generated by ...'.
 
 # We use m4_for many times.
 m4_pattern_allow([^m4_for$])
@@ -1094,7 +1094,7 @@ AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE([], [], [],
   [config.status: WARNING:  'Foo.in' seems to ignore the --datarootdir setting
 config.status: WARNING: Bar contains a reference to the variable `datarootdir'
-which seems to be undefined.  Please make sure it is defined.
+which seems to be undefined.  Please make sure it is defined
 ])
 AT_CHECK([grep datarootdir Foo], 1, [])
 


hooks/post-receive
-- 
GNU Autoconf source repository