gmane.comp.sysutils.autoconf.patches

[PATCH] general: deprecate 'configure.in' as autoconf input

Stefano Lattarini — 2012-05-19T08:25:16

It has been years since that has been deprecated in the documentation,
in favour of 'configure.ac':

  Previous versions of Autoconf promoted the name configure.in, which
  is somewhat ambiguous (the tool needed to process this file is not
  described by its extension), and introduces a slight confusion with
  config.h.in and so on (for which '.in' means "to be processed by
  configure"). Using configure.ac is now preferred.

It's now time to start giving runtime warning about the use of
'configure.in', so that support for it can be removed in future
versions of autoconf/automake.

* lib/Autom4te/Configure_ac.pm: Issue a warning in the 'obsolete'
category if 'configure.in' is detected.  Since this module is synced
from Automake, this change is to be backported there (and will be
soon).
* doc/autoconf.texi: Update.
* tests/tools.at: Adjust to avoid spurious failures.

Signed-off-by: Stefano Lattarini <stefano.lattarini< at >gmail.com>
---

 OK to apply?  I plan to backport the change done to Configure_ac.pm
 to the Automake's master copy as soon as this patch is accepted into
 the autoconf repository.

 Regards,
   Stefano

 NEWS                         |    2 ++
 doc/autoconf.texi            |    9 +++++----
 lib/Autom4te/Configure_ac.pm |   19 ++++++++++---------
 tests/tools.at               |   28 ++++++++++++++--------------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/NEWS b/NEWS
index 61e3bd2..5429698 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -2,6 +2,8 < at >< at > GNU Autoconf NEWS - User visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** The use of the long-deprecated name 'configure.in' for the autoconf
+   input file now elicits a warning in the 'obsolete' category.
 
 * Noteworthy changes in release 2.69 (2012-04-24) [stable]
 
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 34ca213..bc70e55 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -1004,10 +1004,9 < at >< at > a file called < at >file{config.log} containing any messages produced by
 compilers, to help debugging if < at >command{configure} makes a mistake.
 < at >end itemize
 
-< at >cindex < at >file{configure.in}
 < at >cindex < at >file{configure.ac}
-To create a < at >command{configure} script with Autoconf, you need to write an
-Autoconf input file < at >file{configure.ac} (or < at >file{configure.in}) and run
+To create a < at >command{configure} script with Autoconf, you need
+to write an Autoconf input file < at >file{configure.ac} and run
 < at >command{autoconf} on it.  If you write your own feature tests to
 supplement those that come with Autoconf, you might also write files
 called < at >file{aclocal.m4} and < at >file{acsite.m4}.  If you use a C header
< at >< at > -1095,12 +1094,14 < at >< at > Programming}.  The < at >command{autoscan} program can give you a good start
 in writing < at >file{configure.ac} (< at >pxref{autoscan Invocation}, for more
 information).
 
+< at >cindex < at >file{configure.in}
 Previous versions of Autoconf promoted the name < at >file{configure.in},
 which is somewhat ambiguous (the tool needed to process this file is not
 described by its extension), and introduces a slight confusion with
 < at >file{config.h.in} and so on (for which < at >samp{.in} means ``to be
 processed by < at >command{configure}'').  Using < at >file{configure.ac} is now
-preferred.
+preferred, while the use of < at >file{configure.in} will cause warnings
+from < at >command{autoconf}.
 
 < at >menu
 * Shell Script Compiler::       Autoconf as solution of a problem
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index 924b23c..854ee0d 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
< at >< at > -75,19 +75,21 < at >< at > sub find_configure_ac (;< at >)
   my $configure_in =
     File::Spec->canonpath (File::Spec->catfile ($directory, 'configure.in'));
 
-  if (-f $configure_ac)
+  if (-f $configure_in)
     {
-      if (-f $configure_in)
+      msg ('obsolete', "autoconf input should be named 'configure.ac'," .
+                       " not 'configure.in'");
+      if (-f $configure_ac)
 {
   msg ('unsupported',
        "'$configure_ac' and '$configure_in' both present.\n"
        . "proceeding with '$configure_ac'");
+          return $configure_ac
 }
-      return $configure_ac
-    }
-  elsif (-f $configure_in)
-    {
-      return $configure_in;
+      else
+        {
+          return $configure_in;
+        }
     }
   return $configure_ac;
 }
< at >< at > -102,8 +104,7 < at >< at > Like C<find_configure_ac>, but fail if neither is present.
 sub require_configure_ac (;$)
 {
   my $res = find_configure_ac (< at >_);
-  fatal "'configure.ac' or 'configure.in' is required"
-    unless -f $res;
+  fatal "'configure.ac' is required" unless -f $res;
   return $res
 }
 
diff --git a/tests/tools.at b/tests/tools.at
index 31d4aad..5a9ee63 100644
--- a/tests/tools.at
+++ b/tests/tools.at
< at >< at > -1135,7 +1135,7 < at >< at > AT_SETUP([autoupdating with aclocal and m4< at >&t< at >_include])
 AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore])
 
 mkdir m4 aclocal
-AT_DATA([configure.in],
+AT_DATA([configure.ac],
 [[AC_INIT(x,0)
 AC_UNCHANGED_MACRO
 AC_OLD_MACRO
< at >< at > -1169,7 +1169,7 < at >< at > AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
 AT_CHECK([[grep '[1-9]\.[0-9]' stdout || exit 77]], [], [ignore])
 AT_CHECK([test ! -f $HOME/.autom4te.cfg || exit 77], [], [ignore], [ignore])
 
-AT_DATA([configure.in],
+AT_DATA([configure.ac],
 [[AC_INIT(GNU foo, 1.0)
 AM_INIT_AUTOMAKE
 AC_CONFIG_FILES([Makefile])
< at >< at > -1294,9 +1294,9 < at >< at > do
   export TMPDIR
 
   # skip if we cannot create such a file or directory
-  AT_CHECK([mkdir "$dir" "$TMPDIR" && touch "$file.in" || exit 77])
+  AT_CHECK([mkdir "$dir" "$TMPDIR" && touch "$file.ac" || exit 77])
 
-  cat >"$file.in" <<'END'
+  cat >"$file.ac" <<'END'
 [AC_INIT(x,0)
 m4< at >&t< at >_include([foo.m4])
 AC_CONFIG_HEADERS([config.h:config.hin])
< at >< at > -1307,20 +1307,20 < at >< at > END
 [AC_DEFUN([AC_MACRO], [echo hi])]
 END
 
-  AT_CHECK_AUTOHEADER([-B "$dir" "$file.in"])
-  AT_CHECK_AUTOHEADER([--force -I "$dir" "$file.in"])
-  AT_CHECK_AUTOUPDATE([-B "$dir" "$file.in"])
-  AT_CHECK_AUTOUPDATE([--force -I "$dir" "$file.in"])
-  AT_CHECK_AUTOUPDATE([-B "$dir" - < "$file.in"], [], [ignore])
-  AT_CHECK_AUTOCONF([-B "$dir" -o "$file" "$file.in"])
-  AT_CHECK_AUTOCONF([-I "$dir" -o "$file" "$file.in"])
+  AT_CHECK_AUTOHEADER([-B "$dir" "$file.ac"])
+  AT_CHECK_AUTOHEADER([--force -I "$dir" "$file.ac"])
+  AT_CHECK_AUTOUPDATE([-B "$dir" "$file.ac"])
+  AT_CHECK_AUTOUPDATE([--force -I "$dir" "$file.ac"])
+  AT_CHECK_AUTOUPDATE([-B "$dir" - < "$file.ac"], [], [ignore])
+  AT_CHECK_AUTOCONF([-B "$dir" -o "$file" "$file.ac"])
+  AT_CHECK_AUTOCONF([-I "$dir" -o "$file" "$file.ac"])
   # In autoconf, these exercise a slightly different code path:
-  AT_CHECK_AUTOCONF([--prepend-include="$dir" -o "$file" "$file.in"])
-  AT_CHECK_AUTOCONF([--include="$dir" -o "$file" "$file.in"])
+  AT_CHECK_AUTOCONF([--prepend-include="$dir" -o "$file" "$file.ac"])
+  AT_CHECK_AUTOCONF([--include="$dir" -o "$file" "$file.ac"])
   AT_CHECK([autoscan -B "$dir"], [], [], [ignore])
   AT_CHECK([autoscan --force -I "$dir"], [], [], [ignore])
   # autoreconf requires a sane input file name.  Also, disable aclocal.
-  mv -f "$file.in" configure.in
+  mv -f "$file.ac" configure.ac
   AT_DATA([aclocal.m4])
   AT_CHECK([autoreconf -B "$dir"])
   AT_CHECK([autoreconf --force -I "$dir"])

[PATCH] doc: fix another bad < at >xref

Eric Blake — 2012-05-03T15:29:30

Obviously, I didn't fully test commit f35498d.

* doc/autoconf.texi (Limitations of Builtins): Add a comma.

Signed-off-by: Eric Blake <eblake< at >redhat.com>
---
 doc/autoconf.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 34ca213..393e38f 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -17874,7 +17874,7 < at >< at > Limitations of Builtins
 < at >samp{-}. With Solaris < at >command{ksh}, it is possible to use < at >code{print
 -r --} for this role instead.

-< at >xref{echo, , Limitations of Shell Builtins} for a discussion of
+< at >xref{echo, , Limitations of Shell Builtins}, for a discussion of
 portable alternatives to both < at >command{printf} and < at >command{echo}.

[PATCH] Improve cross-compilation guesses for glibc system hosts.

Bruno Haible — 2012-05-02T21:02:49

Hi,

Paul and Eric suggested that improving the cross-compilation guesses
for targets that are glibc systems would be welcome here [1][2], so here
is a proposed patch.

This patch modifies the cross-compilation behaviour of
  AC_FUNC_CHOWN
  AC_FUNC_GETGROUPS
  AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
  AC_FUNC_MALLOC
  AC_FUNC_MMAP
  AC_FUNC_REALLOC
  AC_FUNC_STRCOLL
so that when the target is a glibc system (or, in case of AC_FUNC_MALLOC
and AC_FUNC_REALLOC, any known "good" Unix system), the guess is
"yes it works" rather than "guessing no".

This is important because some of these macros are used in Gnulib, and
in case of "guessing no" Gnulib provides extra workaround code, and
  1) Generally, when targetting embedded systems, code size should be
     minimized,
  2) In [3], unnecessary workaround code will look like a Glibc bug.

This patch also changes the configure output to "guessing yes" or
"guessing no" in a case where the ac_cv_* variable is undocumented.

[1] http://lists.gnu.org/archive/html/bug-gnulib/2012-05/msg00010.html
[2] http://lists.gnu.org/archive/html/bug-gnulib/2012-05/msg00013.html
[3] http://sourceware.org/glibc/wiki/Testing/Gnulib


This patch was tested as follows: The simple configure.ac file
=============== configure.ac ==================
AC_INIT([dummy], [0])
AC_FUNC_CHOWN
AC_FUNC_GETGROUPS
AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
AC_FUNC_MALLOC
AC_FUNC_MMAP
AC_FUNC_REALLOC
AC_FUNC_STRCOLL
AC_OUTPUT
===============================================

produces this output when not cross-compiling:

$ ./configure --host=x86_64-pc-linux-gnu
configure: loading site script /usr/share/site/x86_64-unknown-linux-gnu
checking for x86_64-pc-linux-gnu-gcc... no
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /arch/x86-linux/gnu/bin/grep
checking for egrep... /arch/x86-linux/gnu/bin/grep -E
checking for uid_t in sys/types.h... yes
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for unistd.h... (cached) yes
checking for working chown... yes
checking type of array argument to getgroups... gid_t
checking for size_t... yes
checking for getgroups... yes
checking for working getgroups... yes
checking whether lstat correctly handles trailing slash... yes
checking for stdlib.h... (cached) yes
checking for GNU libc compatible malloc... yes
checking for stdlib.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/param.h... yes
checking for getpagesize... yes
checking for working mmap... yes
checking for stdlib.h... (cached) yes
checking for GNU libc compatible realloc... yes
checking for working strcoll... yes
configure: creating ./config.status

When cross-compiling it produces this before the patch:

$ ./configure --host=x86_64-pc-linux-gnu --build=x86_64-unknown-linux-gnu
configure: loading site script /usr/share/site/x86_64-unknown-linux-gnu
checking for x86_64-pc-linux-gnu-gcc... no
checking for gcc... gcc
configure: WARNING: using cross tools not prefixed with host triplet
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... yes
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /arch/x86-linux/gnu/bin/grep
checking for egrep... /arch/x86-linux/gnu/bin/grep -E
checking for uid_t in sys/types.h... yes
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for unistd.h... (cached) yes
checking for working chown... no
checking type of array argument to getgroups... gid_t
checking for size_t... yes
checking for getgroups... yes
checking for working getgroups... no
checking whether lstat correctly handles trailing slash... no
checking for stdlib.h... (cached) yes
checking for GNU libc compatible malloc... no
checking for stdlib.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/param.h... yes
checking for getpagesize... yes
checking for working mmap... no
checking for stdlib.h... (cached) yes
checking for GNU libc compatible realloc... no
checking for working strcoll... no
configure: creating ./config.status

and this output after the patch:

$ ./configure --host=x86_64-pc-linux-gnu --build=x86_64-unknown-linux-gnu
configure: loading site script /usr/share/site/x86_64-unknown-linux-gnu
checking for x86_64-pc-linux-gnu-gcc... no
checking for gcc... gcc
configure: WARNING: using cross tools not prefixed with host triplet
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... yes
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /arch/x86-linux/gnu/bin/grep
checking for egrep... /arch/x86-linux/gnu/bin/grep -E
checking for uid_t in sys/types.h... yes
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for unistd.h... (cached) yes
checking for working chown... yes
checking type of array argument to getgroups... gid_t
checking for size_t... yes
checking for getgroups... yes
checking for working getgroups... guessing yes
checking whether lstat correctly handles trailing slash... yes
checking for stdlib.h... (cached) yes
checking for GNU libc compatible malloc... yes
checking for stdlib.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/param.h... yes
checking for getpagesize... yes
checking for working mmap... yes
checking for stdlib.h... (cached) yes
checking for GNU libc compatible realloc... yes
checking for working strcoll... yes
configure: creating ./config.status


Patch comes here. The attachment contains the same thing in "git am" format.


Improve cross-compilation guesses for glibc system hosts.

* lib/autoconf/functions.m4 (AC_FUNC_CHOWN): Require AC_CANONICAL_HOST.
When cross-compiling to a glibc system, guess yes.
(AC_FUNC_GETGROUPS): Likewise.
(AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK): Likewise.
(AC_FUNC_STRCOLL): Likewise.
(_AC_FUNC_MALLOC_IF): Require AC_CANONICAL_HOST. When cross-compiling
to a know Unix system other than AIX and OSF/1, guess yes.
(_AC_FUNC_REALLOC_IF): Likewise.
(AC_FUNC_MMAP): Require AC_CANONICAL_HOST. When cross-compiling to a
system with a Linux kernel, guess yes.

--- lib/autoconf/functions.m4.origWed May  2 22:42:01 2012
+++ lib/autoconf/functions.m4Wed May  2 22:33:44 2012
< at >< at > -423,6 +423,7 < at >< at >
 AN_FUNCTION([chown], [AC_FUNC_CHOWN])
 AC_DEFUN([AC_FUNC_CHOWN],
 [AC_REQUIRE([AC_TYPE_UID_T])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
 AC_CHECK_HEADERS(unistd.h)
 AC_CACHE_CHECK([for working chown], ac_cv_func_chown_works,
 [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
< at >< at > -443,7 +444,12 < at >< at >
 ]])],
        [ac_cv_func_chown_works=yes],
        [ac_cv_func_chown_works=no],
-       [ac_cv_func_chown_works=no])
+       [case "$host_os" in # ((
+  # Guess yes on glibc systems.
+  *-gnu*) ac_cv_func_chown_works=yes ;;
+  # If we don't know, assume the worst.
+  *)      ac_cv_func_chown_works=no ;;
+esac])
 rm -f conftest.chown
 ])
 if test $ac_cv_func_chown_works = yes; then
< at >< at > -625,6 +631,7 < at >< at >
 AC_DEFUN([AC_FUNC_GETGROUPS],
 [AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
 AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
 AC_CHECK_FUNC(getgroups)
 
 # If we don't yet have getgroups, see if it's in -lbsd.
< at >< at > -643,15 +650,22 < at >< at >
        return getgroups (0, 0) == -1;]])],
   [ac_cv_func_getgroups_works=yes],
   [ac_cv_func_getgroups_works=no],
-  [ac_cv_func_getgroups_works=no])
+  [case "$host_os" in # ((
+     # Guess yes on glibc systems.
+     *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;;
+     # If we don't know, assume the worst.
+     *)      ac_cv_func_getgroups_works="guessing no" ;;
+   esac])
    ])
 else
   ac_cv_func_getgroups_works=no
 fi
-if test $ac_cv_func_getgroups_works = yes; then
-  AC_DEFINE(HAVE_GETGROUPS, 1,
-    [Define to 1 if your system has a working `getgroups' function.])
-fi
+case "$ac_cv_func_getgroups_works" in
+  *yes)
+    AC_DEFINE(HAVE_GETGROUPS, 1,
+      [Define to 1 if your system has a working `getgroups' function.])
+    ;;
+esac
 LIBS=$ac_save_LIBS
 ])# AC_FUNC_GETGROUPS
 
< at >< at > -847,7 +861,8 < at >< at >
 # calls lstat a second time when necessary.
 AN_FUNCTION([lstat], [AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
 AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
-[AC_CACHE_CHECK(
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+AC_CACHE_CHECK(
        [whether lstat correctly handles trailing slash],
        [ac_cv_func_lstat_dereferences_slashed_symlink],
 [rm -f conftest.sym conftest.file
< at >< at > -861,7 +876,12 < at >< at >
      return lstat ("conftest.sym/", &sbuf) == 0;])],
 [ac_cv_func_lstat_dereferences_slashed_symlink=yes],
 [ac_cv_func_lstat_dereferences_slashed_symlink=no],
-[ac_cv_func_lstat_dereferences_slashed_symlink=no])
+[case "$host_os" in # ((
+   # Guess yes on glibc systems.
+   *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;;
+   # If we don't know, assume the worst.
+   *)      ac_cv_func_lstat_dereferences_slashed_symlink=no ;;
+ esac])
 else
   # If the `ln -s' command failed, then we probably don't even
   # have an lstat function.
< at >< at > -886,6 +906,7 < at >< at >
 # If `malloc (0)' properly handled, run IF-WORKS, otherwise, IF-NOT.
 AC_DEFUN([_AC_FUNC_MALLOC_IF],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
 AC_CHECK_HEADERS(stdlib.h)
 AC_CACHE_CHECK([for GNU libc compatible malloc], ac_cv_func_malloc_0_nonnull,
 [AC_RUN_IFELSE(
< at >< at > -899,7 +920,14 < at >< at >
  [return ! malloc (0);])],
        [ac_cv_func_malloc_0_nonnull=yes],
        [ac_cv_func_malloc_0_nonnull=no],
-       [ac_cv_func_malloc_0_nonnull=no])])
+       [case "$host_os" in # ((
+  # Guess yes on platforms where we know the result.
+  *-gnu* | freebsd* | netbsd* | openbsd* \
+  | hpux* | solaris* | cygwin* | mingw*)
+    ac_cv_func_malloc_0_nonnull=yes ;;
+  # If we don't know, assume the worst.
+  *) ac_cv_func_malloc_0_nonnull=no ;;
+esac])])
 AS_IF([test $ac_cv_func_malloc_0_nonnull = yes], [$1], [$2])
 ])# _AC_FUNC_MALLOC_IF
 
< at >< at > -1199,7 +1227,8 < at >< at >
 # ------------
 AN_FUNCTION([mmap], [AC_FUNC_MMAP])
 AC_DEFUN([AC_FUNC_MMAP],
-[AC_CHECK_HEADERS_ONCE([stdlib.h unistd.h sys/param.h])
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+AC_CHECK_HEADERS_ONCE([stdlib.h unistd.h sys/param.h])
 AC_CHECK_FUNCS([getpagesize])
 AC_CACHE_CHECK([for working mmap], [ac_cv_func_mmap_fixed_mapped],
 [AC_RUN_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT]
< at >< at > -1340,7 +1369,12 < at >< at >
 }]])],
        [ac_cv_func_mmap_fixed_mapped=yes],
        [ac_cv_func_mmap_fixed_mapped=no],
-       [ac_cv_func_mmap_fixed_mapped=no])])
+       [case "$host_os" in # ((
+  # Guess yes on platforms where we know the result.
+  linux*) ac_cv_func_mmap_fixed_mapped=yes ;;
+  # If we don't know, assume the worst.
+  *)      ac_cv_func_mmap_fixed_mapped=no ;;
+esac])])
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
   AC_DEFINE([HAVE_MMAP], [1],
     [Define to 1 if you have a working `mmap' system call.])
< at >< at > -1391,6 +1425,7 < at >< at >
 # If `realloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT.
 AC_DEFUN([_AC_FUNC_REALLOC_IF],
 [AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
 AC_CHECK_HEADERS(stdlib.h)
 AC_CACHE_CHECK([for GNU libc compatible realloc], ac_cv_func_realloc_0_nonnull,
 [AC_RUN_IFELSE(
< at >< at > -1404,7 +1439,14 < at >< at >
  [return ! realloc (0, 0);])],
        [ac_cv_func_realloc_0_nonnull=yes],
        [ac_cv_func_realloc_0_nonnull=no],
-       [ac_cv_func_realloc_0_nonnull=no])])
+       [case "$host_os" in # ((
+  # Guess yes on platforms where we know the result.
+  *-gnu* | freebsd* | netbsd* | openbsd* \
+  | hpux* | solaris* | cygwin* | mingw*)
+    ac_cv_func_realloc_0_nonnull=yes ;;
+  # If we don't know, assume the worst.
+  *) ac_cv_func_realloc_0_nonnull=no ;;
+esac])])
 AS_IF([test $ac_cv_func_realloc_0_nonnull = yes], [$1], [$2])
 ])# AC_FUNC_REALLOC
 
< at >< at > -1723,14 +1765,20 < at >< at >
 # ---------------
 AN_FUNCTION([strcoll], [AC_FUNC_STRCOLL])
 AC_DEFUN([AC_FUNC_STRCOLL],
-[AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
 [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
   [[return (strcoll ("abc", "def") >= 0 ||
  strcoll ("ABC", "DEF") >= 0 ||
  strcoll ("123", "456") >= 0)]])],
        ac_cv_func_strcoll_works=yes,
        ac_cv_func_strcoll_works=no,
-       ac_cv_func_strcoll_works=no)])
+       [case "$host_os" in # ((
+  # Guess yes on glibc systems.
+  *-gnu*) ac_cv_func_strcoll_works=yes ;;
+  # If we don't know, assume the worst.
+  *)      ac_cv_func_strcoll_works=no ;;
+esac])])
 if test $ac_cv_func_strcoll_works = yes; then
   AC_DEFINE(HAVE_STRCOLL, 1,
     [Define to 1 if you have the `strcoll' function and it is properly

[PATCH] maint: drop bz2 tarball

Eric Blake — 2012-04-25T02:46:27

At 2.68b, I asked whether anyone would miss .gz and .bz2 formats.
Consensus was overwhelming that .gz still holds a place in people's
hearts, in spite of .xz compressing to smaller files, but no one
was able to make a convincing argument for .bz2.

* configure.ac (AM_INIT_AUTOMAKE): Drop bzip2; xz wins hands down.

Signed-off-by: Eric Blake <eblake< at >redhat.com>
---

See https://lists.gnu.org/archive/html/autoconf/2012-03/msg00001.html
for the long thread of discussion.

 configure.ac |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 280cc0e..696e513 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -26,8 +26,7 < at >< at > AC_CONFIG_SRCDIR([lib/autoconf/autoconf.m4])

 AC_CONFIG_AUX_DIR([build-aux])

-AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz
-readme-alpha no-texinfo.tex std-options])
+AM_INIT_AUTOMAKE([1.11 dist-xz readme-alpha no-texinfo.tex std-options])

 AB_INIT

[PATCH] doc: fix bad < at >xref uses

Eric Blake — 2012-04-25T02:13:47

Upstream gnulib maint.mk improvements caught a few issues we
should fix, as well as a few issues in files we copy from
other sources that we will just ignore here.

* doc/autoconf.texi (Generic Programs, Special Shell Variables)
(Limitations of Builtins): Use references correctly.
* cfg.mk
(exclude_file_name_regexp--sc_prohibit_undesirable_word_seq)
(exclude_file_name_regexp--sc_useless_cpp_parens): Add exemptions.
---
 cfg.mk            |    7 ++++---
 doc/autoconf.texi |    8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 3febab0..e79ff55 100644
--- a/cfg.mk
+++ b/cfg.mk
< at >< at > -129,12 +129,13 < at >< at > update-copyright-env = \
 # Prevent incorrect NEWS edits.
 old_NEWS_hash = 54ad39275441a2a3fcbe6182da4f84fb

-exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^maint\.mk$$
+exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = \
+  ^(maint\.mk|build-aux/texinfo\.tex)$$
 exclude_file_name_regexp--sc_prohibit_test_minus_ao = \
   ^(maint\.mk|doc/autoconf\.texi)$$
-
 exclude_file_name_regexp--sc_prohibit_atoi_atof = ^doc/autoconf\.texi$$
-exclude_file_name_regexp--sc_useless_cpp_parens = ^build-aux/config\.guess$$
+exclude_file_name_regexp--sc_useless_cpp_parens = \
+  ^(build-aux/config\.guess|doc/standards\.texi)$$
 exclude_file_name_regexp--sc_trailing_blank = ^build-aux/texinfo\.tex$$
 exclude_file_name_regexp--sc_two_space_separator_in_usage = \
   ^build-aux/gnupload$$
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index a629668..34ca213 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -4211,7 +4211,7 < at >< at > Generic Programs
 < at >end example

 You are strongly encouraged to declare the < at >var{variable} passed to
-< at >code{AC_CHECK_PROG} etc.< at >: as precious, < at >xref{Setting Output Variables},
+< at >code{AC_CHECK_PROG} etc.< at >: as precious.  < at >xref{Setting Output Variables},
 < at >code{AC_ARG_VAR}, for more details.

 < at >anchor{AC_CHECK_PROG}
< at >< at > -16782,7 +16782,7 < at >< at > Special Shell Variables

 < at >noindent
 (actually, there is some complication due to bugs in < at >command{unset};
-see < at >pxref{unset, , Limitations of Shell Builtins}).
+< at >pxref{unset, , Limitations of Shell Builtins}).

 < at >item FPATH
 < at >evindex FPATH
< at >< at > -17874,8 +17874,8 < at >< at > Limitations of Builtins
 < at >samp{-}. With Solaris < at >command{ksh}, it is possible to use < at >code{print
 -r --} for this role instead.

-For a discussion of portable alternatives to both < at >command{printf}
-and < at >command{echo}, < at >xref{echo, , Limitations of Shell Builtins}.
+< at >xref{echo, , Limitations of Shell Builtins} for a discussion of
+portable alternatives to both < at >command{printf} and < at >command{echo}.


 < at >item < at >command{pwd}

[PATCH] maint: resync files from upstream

Eric Blake — 2012-04-24T23:38:03

The files in lib/Autom4te/ are intentionally not synced at this
point, since this recent Automake patch:
https://lists.gnu.org/archive/html/automake-patches/2012-03/msg00111.html

was buggy regarding '-' as stdout, and also exposes some latent
bugs in autoconf where we use raw 'open' instead of XFile::open.

* build-aux/announce-gen: Resync via 'make fetch'.
* build-aux/config.sub: Likewise.
* build-aux/git-version-gen: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/move-if-change: Likewise.
* build-aux/texinfo.tex: Likewise.
* doc/standards.texi: Likewise.
* maint.mk: Likewise.
---

Ultimately, I want to fix the bugs in XFile.pm, and in autoconf's
improper use of raw 'open', but that can wait until after autoconf
2.69 and automake 1.12, as it may prove a bit disruptive.

 build-aux/announce-gen    |    5 +-
 build-aux/config.sub      |    8 +++-
 build-aux/git-version-gen |    5 +-
 build-aux/gnupload        |    2 +-
 build-aux/move-if-change  |    2 +-
 build-aux/texinfo.tex     |  101 +++++++++++++++++++++++++++++++-------------
 doc/standards.texi        |   27 +++++++++---
 maint.mk                  |   14 +++++-
 8 files changed, 118 insertions(+), 46 deletions(-)

diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 3ca90a9..8c6ed36 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
< at >< at > -3,7 +3,7 < at >< at > eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$< at >"}'
     if 0;
 # Generate a release announcement message.

-my $VERSION = '2012-01-06 07:46'; # UTC
+my $VERSION = '2012-04-19 14:36'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
< at >< at > -30,7 +30,8 < at >< at > use strict;

 use Getopt::Long;
 use Digest::MD5;
-use Digest::SHA1;
+eval { require Digest::SHA; }
+  or eval 'use Digest::SHA1';
 use POSIX qw(strftime);

 (my $ME = $0) =~ s|.*/||;
diff --git a/build-aux/config.sub b/build-aux/config.sub
index c894da4..59bb593 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
< at >< at > -4,7 +4,7 < at >< at >
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.

-timestamp='2012-02-10'
+timestamp='2012-04-18'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
< at >< at > -225,6 +225,12 < at >< at > case $os in
 -isc*)
 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 ;;
+-lynx*178)
+os=-lynxos178
+;;
+-lynx*5)
+os=-lynxos5
+;;
 -lynx*)
 os=-lynxos
 ;;
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index d5542a2..0fa9063 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
< at >< at > -1,6 +1,6 < at >< at >
 #!/bin/sh
 # Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-03-18.17; # UTC

 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
 #
< at >< at > -92,6 +92,8 < at >< at > Options:

 Running without arguments will suffice in most cases."

+prefix=v
+
 while test $# -gt 0; do
   case $1 in
     --help) echo "$usage"; exit 0;;
< at >< at > -120,7 +122,6 < at >< at > if test -z "$tarball_version_file"; then
 fi

 tag_sed_script="${tag_sed_script:-s/x/x/}"
-prefix="${prefix:-v}"

 nl='
 '
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 51e17c6..b71ddfd 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
< at >< at > -3,7 +3,7 < at >< at >

 scriptversion=2012-01-15.15; # UTC

-# Copyright (C) 2004-2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 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
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index 4d01447..8cae2b3 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
< at >< at > -8,7 +8,7 < at >< at > VERSION='2012-01-06 07:23'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.

-# Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index bee50a8..e4dca02 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
< at >< at > -3,7 +3,7 < at >< at >
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-02-28.16}
+\def\texinfoversion{2012-04-06.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
< at >< at > -1372,7 +1372,13 < at >< at > output) for that.)}
       \fi
     \fi
     \nextsp}
-  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \def\getfilename#1{%
+    \filenamelength=0
+    % If we don't expand the argument now, \skipspaces will get
+    % snagged on things like "< at >value{foo}".
+    \edef\temp{#1}%
+    \expandafter\skipspaces\temp|\relax
+  }
   \ifnum\pdftexversion < 14
     \let \startlink \pdfannotlink
   \else
< at >< at > -4445,6 +4451,7 < at >< at > end
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
+  \definedummyword\lbracechar
   \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
< at >< at > -4457,6 +4464,7 < at >< at > end
   \definedummyword\quoteleft
   \definedummyword\quoteright
   \definedummyword\quotesinglbase
+  \definedummyword\rbracechar
   \definedummyword\result
   \definedummyword\textdegree
   %
< at >< at > -4508,6 +4516,7 < at >< at > end
   \definedummyword\t
   %
   % Commands that take arguments.
+  \definedummyword\abbr
   \definedummyword\acronym
   \definedummyword\anchor
   \definedummyword\cite
< at >< at > -4519,7 +4528,9 < at >< at > end
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\image
   \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
< at >< at > -4566,7 +4577,10 < at >< at > end
   % content at all.  So for index sorting, we map < at >{ and < at >} to strings
   % starting with |, since that ASCII character is between ASCII { and }.
   \def\{{|a}%
+  \def\lbracechar{|a}%
+  %
   \def\}{|b}%
+  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
< at >< at > -7801,7 +7815,7 < at >< at > end
   \fi\fi
 }

-
+% 
 % < at >xref, < at >pxref, and < at >ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
< at >< at > -7811,16 +7825,21 < at >< at > end
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
 %
-\newbox\topbox
+\newbox\toprefbox
 \newbox\printedrefnamebox
+\newbox\infofilenamebox
 \newbox\printedmanualbox
 %
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
   \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
   %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
   \def\printedmanual{\ignorespaces #5}%
   \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
   %
< at >< at > -7853,12 +7872,20 < at >< at > end
   \ifpdf
     {\indexnofonts
      \turnoffactive
+     \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
      \edef\pdfxrefdest{#1}%
-     \txiescapepdf\pdfxrefdest
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
< at >< at > -7891,7 +7918,7 < at >< at > end
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
     \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
< at >< at > -7906,32 +7933,20 < at >< at > end
     % this is a loss.  Therefore, we give the text of the node name
     % again, so it is as if TeX is seeing it for the first time.
     % 
-    % Cross-manual reference.  Only include the "Section ``foo'' in" if
-    % the foo is neither missing or Top.  Thus, < at >xref{,,,foo,The Foo Manual}
-    % outputs simply "see The Foo Manual".
     \ifdim \wd\printedmanualbox > 0pt
-      % What is the 7sp about?  The idea is that we also want to omit
-      % the Section part if we would be printing "Top", since they are
-      % clearly trying to refer to the whole manual.  But, this being
-      % TeX, we can't easily compare strings while ignoring the possible
-      % spaces before and after in the input.  By adding the arbitrary
-      % 7sp, we make it much less likely that a real node name would
-      % happen to have the same width as "Top" (e.g., in a monospaced font).
-      % I hope it will never happen in practice.
+      % Cross-manual reference with a printed manual name.
       % 
-      % For the same basic reason, we retypeset the "Top" at every
-      % reference, since the current font is indeterminate.
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
       % 
-      \setbox\topbox = \hbox{Top\kern7sp}%
-      \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-      \ifdim \wd2 > 7sp
-        \ifdim \wd2 = \wd\topbox \else
-          \putwordSection{} ``\printedrefname'' \putwordin{}\space
-        \fi
-      \fi
-      \cite{\printedmanual}%
+      \crossmanualxref{\code{\infofilename\unskip}}%
+    %
     \else
-      % Reference in this manual.
+      % Reference within this manual.
       %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
< at >< at > -7952,11 +7967,37 < at >< at > end
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}

+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, < at >xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
diff --git a/doc/standards.texi b/doc/standards.texi
index 4ba9426..69a400e 100644
--- a/doc/standards.texi
+++ b/doc/standards.texi
< at >< at > -3,7 +3,7 < at >< at >
 < at >setfilename standards.info
 < at >settitle GNU Coding Standards
 < at >c This date is automagically updated when you save this file:
-< at >set lastupdate February 5, 2012
+< at >set lastupdate April 7, 2012
 < at >c %**end of header

 < at >dircategory GNU organization
< at >< at > -2384,6 +2384,7 < at >< at > Formatting

 < at >cindex open brace
 < at >cindex braces, in C source
+< at >cindex function definitions, formatting
 It is important to put the open-brace that starts the body of a C
 function in column one, so that they will start a defun.  Several
 tools look for open-braces in column one to find the beginnings of C
< at >< at > -2430,6 +2431,20 < at >< at > Formatting
 < at >dots{}
 < at >end example

+< at >cindex < at >code{struct} types, formatting
+< at >cindex < at >code{enum} types, formatting
+For < at >code{struct} and < at >code{enum} types, likewise put the braces in
+column one, unless the whole contents fits on one line:
+
+< at >example
+struct foo
+< at >{
+  int a, b;
+< at >}
+< at >exdent < at >r{or}
+struct foo < at >{ int a, b; < at >}
+< at >end example
+
 The rest of this section gives our recommendations for other aspects of
 C formatting style, which is also the default style of the < at >code{indent}
 program in version 1.2 and newer.  It corresponds to the options
< at >< at > -2576,7 +2591,7 < at >< at > Comments
 number NODE_NUM'' rather than ``an inode''.

 There is usually no purpose in restating the name of the function in
-the comment before it, because the reader can see that for himself.
+the comment before it, because readers can see that for themselves.
 There might be an exception when the comment is so long that the function
 itself would be off the bottom of the screen.

< at >< at > -2655,10 +2670,10 < at >< at > Syntactic Conventions
 as < at >command{lint}, < at >command{clang}, and GCC with extra warnings
 options such as < at >option{-Wconversion} and < at >option{-Wundef}.  These
 tools can help find bugs and unclear code, but they can also generate
-so many false alarms that that it hurts readability to silence them
-with unnecessary casts, wrappers, and other complications.  For
-example, please don't insert casts to < at >code{void} or calls to
-do-nothing functions merely to pacify a lint checker.
+so many false alarms that it hurts readability to silence them with
+unnecessary casts, wrappers, and other complications.  For example,
+please don't insert casts to < at >code{void} or calls to do-nothing
+functions merely to pacify a lint checker.

 Declarations of external functions and functions to appear later in the
 source file should all go in one place near the beginning of the file
diff --git a/maint.mk b/maint.mk
index a97e0bd..1c7af03 100644
--- a/maint.mk
+++ b/maint.mk
< at >< at > -279,7 +279,7 < at >< at > define _sc_search_regexp
    if test -n "$$files"; then\
      if test -n "$$prohibit"; then\
        grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \
-         | grep -vE "$${exclude-^$$}"\
+         | grep -vE "$${exclude:-^$$}"\
          && { msg="$$halt" $(_sc_say_and_exit) } || :;\
      else\
        grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \
< at >< at > -455,7 +455,8 < at >< at > sc_prohibit_quotearg_without_use:

 # Don't include quote.h unless you use one of its functions.
 sc_prohibit_quote_without_use:
-< at >h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use)
+< at >h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \
+  $(_sc_header_without_use)

 # Don't include this header unless you use one of its functions.
 sc_prohibit_long_options_without_use:
< at >< at > -931,8 +932,15 < at >< at > sc_prohibit_doubled_word:
 # A regular expression matching undesirable combinations of words like
 # "can not"; this matches them even when the two words appear on different
 # lines, but not when there is an intervening delimiter like "#" or "*".
+# Similarly undesirable, "See < at >xref{...}", since an < at >xref should start
+# a sentence.  Explicitly prohibit any prefix of "see" or "also".
+# Also prohibit a prefix matching "\w+ +".
+# < at >pxref gets the same see/also treatment and should be parenthesized;
+# presume it must *not* start a sentence.
+bad_xref_re_ ?= (?:[\w,:;] +|(?:see|also)\s+)\< at >xref\{
+bad_pxref_re_ ?= (?:[.!?]|(?:see|also))\s+\< at >pxref\{
 prohibit_undesirable_word_seq_RE_ ?=\
-  /\bcan\s+not\b/gims
+  /(?:\bcan\s+not\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims
 prohibit_undesirable_word_seq_ =\
     -e 'while ($(prohibit_undesirable_word_seq_RE_))'\
     $(perl_filename_lineno_text_)

[PATCH] remove warning for --host without --build

Bruno Haible — 2012-04-22T17:42:24

Hi,

On bi-arch systems (such as x86 / x86_64) it is often necessary to pass
the --host option together with an appropriate value for CC. But this
triggers a warning:

$ ./configure --host=i686-pc-linux-gnu CC="gcc -m32 -march=i586"
configure: WARNING: 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
...

This warning was introduced on 2000-06-30, in commit
<http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=cb2e761b8e1181f97e8e09d85526bd22078433db>
with the remark "Re-enable the old behavior of --host and --build."

This warning was meant to warn users about a changed semantics of
--build and --host. This change is now 12 years in the past; users
have had enough time to learn it. I therefore suggest to remove the
warning.

I've done lots of cross and bi-arch compilations in the last 10 years,
all with --host and without --build, and have never observed a problem
with it, except for the warning. Simply relying on config.guess is sufficient.

Therefore I suggest to remove the warning:


2012-04-22  Bruno Haible  <bruno< at >clisp.org>

AC_INIT: Remove a transitional warning.
* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Don't warn if --host
given without --build.

--- lib/autoconf/general.m4.origSun Apr 22 19:22:42 2012
+++ lib/autoconf/general.m4Sun Apr 22 19:22:27 2012
< at >< at > -949,8 +949,6 < at >< at >
 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])
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi

[PATCH] maint: avoid "make syntax-check" failure

Jim Meyering — 2012-04-11T10:07:24

I was surprised to find that "make syntax-check" was failing.
Here's the trivial fix: (I'll push it later today)

From eaa96cb8bd6dca5317329b6682df91dfda286d06 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering< at >redhat.com>
Date: Wed, 11 Apr 2012 12:05:38 +0200
Subject: [PATCH] maint: avoid "make syntax-check" failure

* cfg.mk (old_NEWS_hash): Update to reflect typo fix in old news.
---
 cfg.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfg.mk b/cfg.mk
index 41b5cbe..3febab0 100644
--- a/cfg.mk
+++ b/cfg.mk
< at >< at > -127,7 +127,7 < at >< at > update-copyright-env = \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72

 # Prevent incorrect NEWS edits.
-old_NEWS_hash = d10ae7f49f642a6dc120c135ff4844ff
+old_NEWS_hash = 54ad39275441a2a3fcbe6182da4f84fb

 exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^maint\.mk$$
 exclude_file_name_regexp--sc_prohibit_test_minus_ao = \
--
1.7.10

[patch] lib/autoconf/specific.m4: turn AC_ISC_POSIX into a NOP

Adrian Bunk — 2012-04-07T20:09:07

The platform that needed it saw it's last release in 1998,
is completely unsupported since 2006, and it was already
documented that new programs need not use AC_ISC_POSIX.

The main objective of this change is that without it autoupdate
turned AC_ISC_POSIX into AC_SEARCH_LIBS([strerror],[cposix])
in configure.ac, keeping this zombie alive forever.
---
 doc/autoconf.texi        |    5 ++---
 lib/autoconf/specific.m4 |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 2ae8bb9..a4f6666 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -23411,11 +23411,10 < at >< at > See < at >ref{AC_FUNC_GETMNTENT} and < at >ref{AC_CHECK_LIB}.
 < at >defmac AC_ISC_POSIX
 < at >acindex{ISC_POSIX}
 < at >ovindex LIBS
-This macro adds < at >option{-lcposix} to output variable < at >code{LIBS} if
+This macro added < at >option{-lcposix} to output variable < at >code{LIBS} if
 necessary for Posix facilities.  Sun dropped support for the obsolete
 INTERACTIVE Systems Corporation Unix on 2006-07-23.  New programs
-need not use this macro.  It is implemented as
-< at >code{AC_SEARCH_LIBS([strerror], [cposix])} (< at >pxref{AC_SEARCH_LIBS}).
+need not use this macro.  Since autoconf 2.69 it does nothing.
 < at >end defmac
 
 < at >defmac AC_LANG_C
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 7d6be57..18a6b52 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
< at >< at > -443,7 +443,7 < at >< at > AU_DEFUN([AC_MINIX], [AC_USE_SYSTEM_EXTENSIONS])
 
 # AC_ISC_POSIX
 # ------------
-AU_DEFUN([AC_ISC_POSIX], [AC_SEARCH_LIBS([strerror], [cposix])])
+AU_DEFUN([AC_ISC_POSIX], [])
 
 
 # AC_XENIX_DIR

[FYI] cosmetics fix imprecise comment in Autom4te::General

Stefano Lattarini — 2012-03-28T22:30:06

* lib/Autom4te/General.pm: This file is *not* used by Automake;
adjust comments accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini< at >gmail.com>
---

 Pushed to master as obvious.

 Regards,
   Stefano

 lib/Autom4te/General.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index cc5875d..ef1e987 100644
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
< at >< at > -19,7 +19,7 < at >< at > package Autom4te::General;
 
 =head1 NAME
 
-Autom4te::General - general support functions for Autoconf and Automake
+Autom4te::General - general support functions for Autoconf
 
 =head1 SYNOPSIS
 
< at >< at > -28,7 +28,7 < at >< at > Autom4te::General - general support functions for Autoconf and Automake
 =head1 DESCRIPTION
 
 This perl module provides various general purpose support functions
-used in several executables of the Autoconf and Automake packages.
+used in several executables of the Autoconf package.
 
 =cut

[PATCH] build: require perl 5.6

Eric Blake — 2012-03-07T17:49:10

This reduces the implicit requirement from 5.6.2 back to 5.6,
while raising the explicit requirement to match the actual code.

* configure.ac (PERL): Fail up front if perl is too old.
* NEWS: Document this.
* README: Likewise.
* README-hacking: Likewise.
* lib/Autom4te/ChannelDefs.pm: Likewise.
* lib/Autom4te/General.pm: Likewise.
---

I'm pushing this to match our recent decisions, and to match automake's
insistence on 5.6.

 NEWS                        |    4 +++-
 README                      |    2 +-
 README-hacking              |    2 +-
 configure.ac                |    4 ++--
 lib/Autom4te/ChannelDefs.pm |    2 +-
 lib/Autom4te/General.pm     |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 7447229..dbc19dc 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -1,7 +1,9 < at >< at >
 GNU Autoconf NEWS - User visible changes.

-* Noteworthy changes in release ?.? (????-??-??) [?]
+* Noteworthy changes in release 2.69 (????-??-??) [?]

+** Autoconf now requires perl 5.6 or better (but generated configure
+   scripts continue to run without perl).

 * Noteworthy changes in release 2.68b (2012-03-01) [beta]
   Released by Eric Blake, based on git versions 2.68.*.
diff --git a/README b/README
index 8e5eb49..6fb53a9 100644
--- a/README
+++ b/README
< at >< at > -12,7 +12,7 < at >< at > macro calls.

 Producing configuration scripts using Autoconf requires GNU M4 and
 Perl.  You should install GNU M4 (version 1.4.6 or later is required;
-1.4.14 or later is recommended) and Perl (5.005_03 or later) before
+1.4.14 or later is recommended) and Perl (5.006 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/README-hacking b/README-hacking
index da57ac4..41d128d 100644
--- a/README-hacking
+++ b/README-hacking
< at >< at > -18,7 +18,7 < at >< at > tools we depend upon, including:
 - Automake 1.10+ <http://www.gnu.org/software/automake/>
 - Help2man 1.29+ <http://www.gnu.org/software/help2man/>
 - M4 1.4.6+ <http://www.gnu.org/software/m4/>

[PATCH] tests: port AT_CHECK_ENV to hosts with flaky grep

Paul Eggert — 2012-03-07T06:58:46

* tests/local.at (AT_CHECK_ENV): Don't assume that if one grep
fails, the other will too.  It could be that 'grep' is flaky,
and fails somewhat at random.  This would explain the problems
reported for autoconf-2.68b on FreeBSD and MacOS X, for example:
<http://lists.gnu.org/archive/html/bug-autoconf/2012-03/msg00032.html>
<http://lists.gnu.org/archive/html/bug-autoconf/2012-03/msg00035.html>
<http://lists.gnu.org/archive/html/bug-autoconf/2012-03/msg00036.html>
<http://lists.gnu.org/archive/html/bug-autoconf/2012-03/msg00044.html>
---
 tests/local.at |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/local.at b/tests/local.at
index cce24f0..eb01cc0 100644
--- a/tests/local.at
+++ b/tests/local.at
< at >< at > -297,9 +297,10 < at >< at > test -f state-ls.after \
 # Compare variable space dumps.
 if test -f state-env.before && test -f state-env.after; then
   set +x
+  grep_failed=false
   for act_file in state-env.before state-env.after
   do
-    $EGREP -v '^(m4_join([|],
+    ($EGREP -v '^(m4_join([|],
       [a[cs]_.*],
       [(exec_)?prefix|DEFS|CONFIG_STATUS],
       [CC|CFLAGS|CPP|GCC|CXX|CXXFLAGS|CXXCPP|GXX|F77|FFLAGS|FLIBS|G77],
< at >< at > -323,12 +324,19 < at >< at > if test -f state-env.before && test -f state-env.after; then
       [GREP|[EF]GREP|SED],
       [[_< at >]|.[*#?$].],
       [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
-     $act_file 2>/dev/null |
+     $act_file ||
+       test $? -eq 1 || echo failed >&2
+    ) 2>stderr-$act_file |
       # There may be variables spread on several lines; remove latter lines.
-      $GREP '^m4_defn([m4_re_word])=' >clean-$act_file
+      $GREP '^m4_defn([m4_re_word])=' >clean-$act_file ||
+        test $? -eq 1 || grep_failed=:
+    if test -s stderr-$act_file; then
+      cat stderr-$act_file >&2
+      grep_failed=:
+    fi
   done
   $at_traceon
-  $at_diff clean-state-env.before clean-state-env.after
+  $grep_failed || $at_diff clean-state-env.before clean-state-env.after
 fi
 } [#]at_check_env])

[PATCH] maint: resync files from upstream

Stefano Lattarini — 2012-03-06T11:46:00

Since the perl version required in Automake::Getopt has been
recently lowered from 5.6.2 to 5.6.0, this change has the nice
effect of making autoconf compatible again with all perls in
the 5.6.x release series.

* maint.mk: Resync via 'make fetch'.
* lib/Autom4te/Channels.pm: Likewise.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/Getopt.pm: Likewise.
* lib/Autom4te/XFile.pm: Likewise.
---

 OK for master, so that it will appear in the upcoming 2.69
 release?

 Thanks,
   Stefano

 lib/Autom4te/Channels.pm     |    2 +-
 lib/Autom4te/Configure_ac.pm |    1 +
 lib/Autom4te/FileUtils.pm    |    1 +
 lib/Autom4te/Getopt.pm       |    2 +-
 lib/Autom4te/XFile.pm        |    2 +-
 maint.mk                     |    2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index d62a3f0..1f0fc1e 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
< at >< at > -66,7 +66,7 < at >< at > etc.) that can also be overridden on a per-message basis.
 
 =cut
 
-use 5.005;
+use 5.006;
 use strict;
 use Exporter;
 use Carp;
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index 2db7339..924b23c 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
< at >< at > -20,6 +20,7 < at >< at >
 
 package Autom4te::Configure_ac;
 
+use 5.006;
 use strict;
 use Exporter;
 use Autom4te::Channels;
diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index b91f653..30bbdb9 100644
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
< at >< at > -34,6 +34,7 < at >< at > This perl module provides various general purpose file handling functions.
 
 =cut
 
+use 5.006;
 use strict;
 use Exporter;
 use File::stat;
diff --git a/lib/Autom4te/Getopt.pm b/lib/Autom4te/Getopt.pm
index c880e1f..d73c5ef 100644
--- a/lib/Autom4te/Getopt.pm
+++ b/lib/Autom4te/Getopt.pm
< at >< at > -30,7 +30,7 < at >< at > line options in conformance to the GNU Coding standards.
 
 =cut
 
-use 5.006_002;
+use 5.006;
 use strict;
 use warnings FATAL => 'all';
 use Exporter ();
diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm
index bfa6a43..28d5bc6 100644
--- a/lib/Autom4te/XFile.pm
+++ b/lib/Autom4te/XFile.pm
< at >< at > -69,7 +69,7 < at >< at > and C<getlines> methods to translate C<\r\n> to C<\n>.
 
 =cut
 
-require 5.000;
+use 5.006;
 use strict;
 use vars qw($VERSION < at >EXPORT < at >EXPORT_OK $AUTOLOAD < at >ISA);
 use Carp;
diff --git a/maint.mk b/maint.mk
index 4cbd5f4..a97e0bd 100644
--- a/maint.mk
+++ b/maint.mk
< at >< at > -1332,7 +1332,7 < at >< at > alpha beta stable: $(local-check) writable-files $(submodule-checks)
 $(MAKE) vc-diff-check
 $(MAKE) news-check
 $(MAKE) distcheck
-$(MAKE) dist XZ_OPT=-9ev
+$(MAKE) dist
 $(MAKE) $(release-prep-hook) RELEASE_TYPE=$< at >
 $(MAKE) -s emit_upload_commands RELEASE_TYPE=$< at >

[PATCH] tests: fix spurious failure when CONFIG_SITE is set

Stefano Lattarini — 2012-03-04T15:31:23

* tests/m4sh.at (Configure re-execs self with CONFIG_SHELL): Export
$CONFIG_SITE to "/dev/null", to avoid spurious diffs in expected
stdout/stderr.
---

 I've pushed this as obvious.  If fixes one of the recent Solaris
 failures Ive reported (it was just a spurious failure after all).

 Regards,
   Stefano

 tests/m4sh.at |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 8e9d1fe..78fe967 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
< at >< at > -120,7 +120,10 < at >< at > exec sh "< at >S|< at >< at >"
 chmod a+x cfg-sh
 
 AT_CAPTURE_FILE([config.log])
-AT_CHECK([env CONFIG_SHELL=./cfg-sh ./configure], [0], [], [])
+# Export CONFIG_SITE to /dev/null to avoid spurious diffs in expected
+# stdout/stderr.
+AT_CHECK([env CONFIG_SITE=/dev/null CONFIG_SHELL=./cfg-sh ./configure],
+         [0], [], [])
 # ./configure re-executed itself.
 AT_CHECK([test -f cfg-sh-has-run], [0])
 # And did that not to cause extra execution of later commands.

[PATCH] fortran: clean up core files after AC_FC_CHECK_BOUNDS

Paul Eggert — 2012-03-04T05:47:55

* lib/autoconf/fortran.m4 (AC_FC_CHECK_BOUNDS): Clean up core
files, too.  Needed for Sun Fortran 95 8.2 2005/10/13 on Solaris 8.
---
 lib/autoconf/fortran.m4 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index afeb3ab..3803595 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
< at >< at > -1599,7 +1599,8 < at >< at > do
      [],
      [ac_cv_fc_check_bounds=$ac_flag; break])])])])
 done
-rm -f conftest$ac_exeext conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest$ac_exeext conftest.err conftest.$ac_objext conftest.$ac_ext \
+  core *.core core.conftest.*
 FCFLAGS=$ac_fc_check_bounds_FCFLAGS_save
 ])
 if test "x$ac_cv_fc_check_bounds" = xunknown; then

[PATCH] tests: port AS_EXECUTABLE_P test to Solaris 8 /bin/sh

Paul Eggert — 2012-03-04T05:44:17

(I pushed this to port the new test to Solaris 8 /bin/sh.)

* tests/m4sh.at (AS< at >&t< at >_EXECUTABLE): Treat any nonzero exit
status as failure.  This is needed for Solaris 8 /bin/sh,
where executing a nonexecutable file causes the shell
to say the file had exit status 1.
---
 tests/m4sh.at |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 38667e4..a24915b 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
< at >< at > -579,7 +579,7 < at >< at > st1=$?
 (./foo.sh) >/dev/null 2>&1
 st2=$?
 case $st1:$st2 in
-  1:126 | 0:0 ) echo 2 ;;
+  *[[1-9]]*:*[[1-9]]* | 0:0 ) echo 2 ;;
   *) echo "fail ($st1:$st2)" ;;
 esac
 # Now things better be executable

autoconf-2.68b/tests/m4sh.at

Tim Rice — 2012-03-03T18:32:36

This looks like a typo.
........
--- autoconf-2.68b/tests/m4sh.at.old2012-02-28 09:47:01.000000000 -0800
+++ autoconf-2.68b/tests/m4sh.at2012-03-03 10:19:11.679787006 -0800
< at >< at > -569,7 +569,7 < at >< at >
   echo 1
 fi
 cat > foo.sh <<\EOF || AS_EXIT([1])
-#/bin/sh
+#!/bin/sh
 exit 0
 EOF
 # File systems like FAT tend to fake executable permissions on all files.
........

[PATCH] maint: spelling fixes

Paul Eggert — 2012-03-02T06:46:56

I ran my little spell-checking program and pushed the following
as (I hope) obvious.  I took the liberty of replacing "facultative"
with "optional", since I hadn't a clue what "facultative" meant
until I looked it up and it does seem to be a term that's used
in biology rather than in computing.

---
 NEWS                       |    4 ++--
 bin/autom4te.in            |    2 +-
 bin/autoscan.in            |    2 +-
 doc/autoconf.texi          |   28 ++++++++++++++--------------
 lib/Autom4te/General.pm    |    2 +-
 lib/autoconf/autoupdate.m4 |    2 +-
 lib/autoconf/types.m4      |    2 +-
 lib/m4sugar/m4sh.m4        |    2 +-
 lib/m4sugar/m4sugar.m4     |    4 ++--
 tests/Makefile.am          |    2 +-
 tests/atlocal.in           |    2 +-
 tests/autotest.at          |    2 +-
 tests/foreign.at           |    2 +-
 tests/tools.at             |    2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/NEWS b/NEWS
index f0fbda3..7447229 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -1261,7 +1261,7 < at >< at > Release tips:
 ** Misc.
 
 - config.log
-  Now contains the list of ouput variables and files (AC_SUBST,
+  Now contains the list of output variables and files (AC_SUBST,
   AC_SUBST_FILES).
 
 * Major changes in Autoconf 2.53
< at >< at > -1350,7 +1350,7 < at >< at > Release tips:
 
 - AC_C_BIGENDIAN supports the cross-compiling case.
 - AC_C_BIGENDIAN accepts ACTION-IF-TRUE, ACTION-IF-FALSE, and
-  ACTION-IF-UNKNOWN arguments.  All are facultative, and the default
+  ACTION-IF-UNKNOWN arguments.  All are optional, and the default
   for ACTION-IF-TRUE is to define WORDS_BIGENDIAN like AC_C_BIGENDIAN
   always did.
 - AC_C_LONG_DOUBLE now succeeds only if `long double' has more range or
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 8c7d339..11773c9 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
< at >< at > -838,7 +838,7 < at >< at > EOF
 
   # This is dubious: should we really transform the quadrigraphs in
   # traces?  It might break balanced [ ] etc. in the output.  The
-  # consensus seeems to be that traces are more useful this way.
+  # consensus seems to be that traces are more useful this way.
   while ($_ = $in->getline)
     {
       # It makes no sense to try to transform __oline__.
diff --git a/bin/autoscan.in b/bin/autoscan.in
index 8a4a64d..a67c48d 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
< at >< at > -253,7 +253,7 < at >< at > sub scan_c_file ($)
 {
   $in_comment = 0;
 }
-      # The whole line is inside a commment.
+      # The whole line is inside a comment.
       next if $in_comment;
       # All on one line.
       s,/\*.*?\*/,,g;
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 83f24ba..da34a4e 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -1849,8 +1849,8 < at >< at > required macro is < at >code{AC_OUTPUT} (< at >pxref{Output}).
 < at >defmac AC_INIT (< at >var{package}, < at >var{version}, < at >ovar{bug-report}, < at >
   < at >ovar{tarname}, < at >ovar{url})
 < at >acindex{INIT}
-Process any command-line arguments and perform various initializations
-and verifications.
+Process any command-line arguments and perform initialization
+and verification.
 
 Set the name of the < at >var{package} and its < at >var{version}.  These are
 typically used in < at >option{--version} support, including that of
< at >< at > -2671,7 +2671,7 < at >< at > top-level directory, this is the same as < at >code{builddir}.
 < at >defvar top_build_prefix
 < at >ovindex top_build_prefix
 The relative name of the top level of the current build tree with final
-slash if nonemtpy.  This is the same as < at >code{top_builddir}, except that
+slash if nonempty.  This is the same as < at >code{top_builddir}, except that
 it contains zero or more runs of < at >code{../}, so it should not be
 appended with a slash for concatenation.  This helps for < at >command{make}
 implementations that otherwise do not treat < at >file{./file} and < at >file{file}
< at >< at > -4084,7 +4084,7 < at >< at > place.  Otherwise set < at >code{LEX} to < at >samp{lex} and < at >code{LEXLIB} to
 to < at >samp{:}; for packages that ship the generated < at >file{file.yy.c}
 alongside the source < at >file{file.l}, this default allows users without a
 lexer generator to still build the package even if the timestamp for
-< at >file{file.l} is inadvertantly changed.
+< at >file{file.l} is inadvertently changed.
 
 Define < at >code{YYTEXT_POINTER} if < at >code{yytext} defaults to < at >samp{char *} instead
 of to < at >samp{char []}.  Also set output variable < at >code{LEX_OUTPUT_ROOT} to
< at >< at > -4363,7 +4363,7 < at >< at > set to the absolute name of the candidate program.  If no invocation of
 executed.  < at >var{feature-test} will be run even when
 < at >code{ac_cv_path_< at >var{variable}} is set, to provide the ability to
 choose a better candidate found later in < at >var{path}; to accept the
-current setting and bypass all futher checks, < at >var{feature-test} can
+current setting and bypass all further checks, < at >var{feature-test} can
 execute < at >code{ac_path_< at >var{variable}_found=:}.
 
 Note that this macro has some subtle differences from
< at >< at > -8428,7 +8428,7 < at >< at > The extension, or < at >samp{unknown}, is cached in the
 < at >code{ac_cv_fc_module_ext} variable.
 < at >end defmac
 
-< at >defmac AC_FC_MODULE_FLAG (< at >ovar{action-if-sucess}, < at >
+< at >defmac AC_FC_MODULE_FLAG (< at >ovar{action-if-success}, < at >
   < at >dvar{action-if-failure, AC_MSG_FAILURE})
 < at >acindex{FC_MODULE_FLAG}
 < at >caindex fc_module_flag
< at >< at > -8473,7 +8473,7 < at >< at > The substituted value of < at >code{FC_MODINC} may refer to the
 the significant trailing whitespace in a < at >file{Makefile}.
 < at >end defmac
 
-< at >defmac AC_FC_MODULE_OUTPUT_FLAG (< at >ovar{action-if-sucess}, < at >
+< at >defmac AC_FC_MODULE_OUTPUT_FLAG (< at >ovar{action-if-success}, < at >
   < at >dvar{action-if-failure, AC_MSG_FAILURE})
 < at >acindex{FC_MODULE_OUTPUT_FLAG}
 < at >caindex fc_module_output_flag
< at >< at > -9399,7 +9399,7 < at >< at > just-compiled object file < at >file{conftest.$OBJEXT}.
 This macro uses < at >code{AC_REQUIRE} for the compiler associated with the
 current language, which means that if the compiler has not yet been
 determined, the compiler determination will be made prior to the body of
-the outermust < at >code{AC_DEFUN} macro that triggered this macro to
+the outermost < at >code{AC_DEFUN} macro that triggered this macro to
 expand (< at >pxref{Expanded Before Required}).
 < at >end defmac
 
< at >< at > -23787,7 +23787,7 < at >< at > issue.
 < at >defmac AC_SYS_SIGLIST_DECLARED
 < at >acindex{SYS_SIGLIST_DECLARED}
 This macro was renamed < at >code{AC_DECL_SYS_SIGLIST}.  However, even that
-name is obsolete, as the same functionality is now acheived via
+name is obsolete, as the same functionality is now achieved via
 < at >code{AC_CHECK_DECLS} (< at >pxref{AC_CHECK_DECLS}).
 < at >end defmac
 
< at >< at > -23929,7 +23929,7 < at >< at > function returning < at >code{void}, define < at >code{RETSIGTYPE} to be
 portable to assume C89, and that signal handlers return < at >code{void},
 without needing to use this macro or < at >code{RETSIGTYPE}.
 
-When targetting older K&R C, it is possible to define signal handlers as
+When targeting older K&R C, it is possible to define signal handlers as
 returning type < at >code{RETSIGTYPE}, and omit a return statement:
 
 < at >example
< at >< at > -25445,7 +25445,7 < at >< at > With Automake, here is a minimal example for inclusion in
 validation suite.
 
 < at >example
-# The `:;' works around a Bash 3.2 bug when the output is not writeable.
+# The `:;' works around a Bash 3.2 bug when the output is not writable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
         :;< at >{ \
           echo '# Signature of the current package.' && \
< at >< at > -26024,7 +26024,7 < at >< at > is happening, remember that the use of < at >code{AC_COMPILE_IFELSE} includes
 a call to < at >code{AC_REQUIRE([AC_PROG_CC])} under the hood.  According to
 the documented semantics of < at >code{AC_REQUIRE}, this means that
 < at >code{AC_PROG_CC} < at >emph{must} occur before the body of the outermost
-< at >code{AC_DEFUN}, which in this case is < at >code{BAR}, thus preceeding the
+< at >code{AC_DEFUN}, which in this case is < at >code{BAR}, thus preceding the
 use of < at >samp{foobar=}.  The older versions of Autoconf were broken with
 regards to the rules of < at >code{AC_REQUIRE}, which explains why the code
 changed from one over to two copies of < at >code{AC_PROG_CC} when upgrading
< at >< at > -26572,7 +26572,7 < at >< at > introduced in this document.
 < at >c  LocalWords:  linux netinet ia Tru XFree DIRENT NDIR dirent ndir multitable
 < at >c  LocalWords:  NAMLEN strlen namlen MKDEV SYSMACROS makedev RESOLV resolv DNS
 < at >c  LocalWords:  inet structs NAMESER arpa NETDB netdb UTekV UTS GCC's kB
-< at >c  LocalWords:  STDBOOL BOOL stdbool conformant cplusplus bool Bool stdarg tm
+< at >c  LocalWords:  STDBOOL BOOL stdbool cplusplus bool Bool stdarg tm
 < at >c  LocalWords:  ctype strchr strrchr rindex bcopy memmove memchr WEXITSTATUS
 < at >c  LocalWords:  WIFEXITED TIOCGWINSZ GWINSZ termios preprocess preprocessable
 < at >c  LocalWords:  DECLS strdup calloc BLKSIZE blksize RDEV rdev TZNAME tzname pw
< at >< at > -26617,7 +26617,7 < at >< at > introduced in this document.
 < at >c  LocalWords:  GOBJC OTP ERLC erl valloc decr dumpdef errprint incr
 < at >c  LocalWords:  esyscmd len maketemp pushdef substr syscmd sysval translit txt
 < at >c  LocalWords:  sinclude foreach myvar tolower toupper uniq BASENAME STDIN
-< at >c  LocalWords:  Dynix descrips basename aname cname macroexpands xno xcheck
+< at >c  LocalWords:  Dynix basename aname cname macroexpands xno xcheck
 < at >c  LocalWords:  LIBREADLINE lreadline lncurses libreadline
 
 < at >c Local Variables:
diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index 0f93042..02e3c87 100644
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
< at >< at > -76,7 +76,7 < at >< at > my < at >export_forward_subs =
 =item C<$debug>
 
 Set this variable to 1 if debug messages should be enabled.  Debug
-messages are meant for developpers only, or when tracking down an
+messages are meant for developers only, or when tracking down an
 incorrect execution.
 
 =cut
diff --git a/lib/autoconf/autoupdate.m4 b/lib/autoconf/autoupdate.m4
index c189867..8866d33 100644
--- a/lib/autoconf/autoupdate.m4
+++ b/lib/autoconf/autoupdate.m4
< at >< at > -96,7 +96,7 < at >< at > $2])])
 #
 # Moreover, we have to take care that calls without parameters are
 # expanded to calls without parameters, not with one empty parameter.
-# This is not only an aesthetical improvement of autoupdate, it also
+# This is not only an aesthetic improvement of autoupdate, it also
 # matters with poorly written macros which test for $# = 0.
 #
 m4_define([AU_ALIAS],
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 9b1d202..18fc175 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
< at >< at > -199,7 +199,7 < at >< at > m4_define([_AC_CHECK_TYPE_OLD],
 # `long', `short', `signed', or `unsigned' followed by characters
 # that are defining types.
 # Because many people have used `off_t' and `size_t' too, they are added
-# for better common-useward backward compatibility.
+# for better common-use backward compatibility.
 m4_define([_AC_CHECK_TYPE_REPLACEMENT_TYPE_P],
 [m4_bmatch([$1],
   [^\(_Bool\|bool\|char\|double\|float\|int\|long\|short\|\(un\)?signed\|[_a-zA-Z][_a-zA-Z0-9]*_t\)[][_a-zA-Z0-9() *]*$],
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 91fc0fb..be013aa 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
< at >< at > -1968,7 +1968,7 < at >< at > m4_define([_AS_VAR_ARITH_WORKS],
 # Perform the arithmetic evaluation of the arguments in EXPR, and set
 # contents of the polymorphic shell variable VAR to the result, taking
 # advantage of any shell optimizations that perform arithmetic without
-# forks.  Note that numbers occuring within EXPR must be written in
+# forks.  Note that numbers occurring within EXPR must be written in
 # decimal, and without leading zeroes; variables containing numbers
 # must be expanded prior to arithmetic evaluation; the first argument
 # must not be a negative number; there is no portable equality
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index d319358..278bc05 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
< at >< at > -950,7 +950,7 < at >< at > m4_define([m4_make_list], [m4_join([,
 # m4_noquote(STRING)
 # ------------------
 # Return the result of ignoring all quotes in STRING and invoking the
-# macros it contains.  Amongst other things, this is useful for enabling
+# macros it contains.  Among other things, this is useful for enabling
 # macro invocations inside strings with [] blocks (for instance regexps
 # and help-strings).  On the other hand, since all quotes are disabled,
 # any macro expanded during this time that relies on nested [] quoting
< at >< at > -2647,7 +2647,7 < at >< at > dnl prefix1 shorter: pad to length of prefix, and reset cursor
 [$2]m4_define([m4_Cursor], m4_Indent)],
       [m4_format([%*s], m4_max([0],
   m4_eval(m4_Indent - m4_Cursor)), [])m4_define([m4_Cursor], m4_Indent)])]],
-dnl now, for each word, compute the curser after the word is output, then
+dnl now, for each word, compute the cursor after the word is output, then
 dnl check if the cursor would exceed the wrap column
 dnl if so, reset cursor, and insert newline and prefix
 dnl if not, insert the separator (usually a space)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6e9ce77..c946773 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
< at >< at > -130,7 +130,7 < at >< at > atconfig: $(top_builddir)/config.status
 # includes $(TESTSUITE).  This is the Automake rule, plus our
 # dependency, and we silence the warning from 'automake -Wall' by
 # hiding the dependency behind a variable.
-# TODO - fix this if newer automake accomodates the dependency.
+# TODO - fix this if newer automake accommodates the dependency.
 distclean_generic = distclean-generic
 $(distclean_generic): clean-local
 
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 518058c..bf29d1c 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
< at >< at > -34,7 +34,7 < at >< at > else
   func_sanitize_file_name () { echo "$< at >" | tr -d '< at >ac_cv_unsupported_fs_chars< at >'; }
 fi
 
-# Can we create directories with trailing whitespaces in their name?
+# Can we create directories with trailing whitespace in their names?
 ac_cv_dir_trailing_space='< at >ac_cv_dir_trailing_space< at >'
 if test "$ac_cv_dir_trailing_space" = yes; then
   func_sanitize_dir_name () { echo "$< at >"; }
diff --git a/tests/autotest.at b/tests/autotest.at
index 41793ab..b56d3f8 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
< at >< at > -109,7 +109,7 < at >< at > AT_CLEANUP
 # -----------------------------------------
 # Create a test named TITLE that tries compiling SUITE with syntax
 # errors with autotest.  Expect a failed compilation, and grep for
-# MESSAGE occuring within the error output.
+# MESSAGE occurring within the error output.
 m4_define([AT_CHECK_AT_SYNTAX],
 [AT_SETUP([$1])
 AT_CHECK_AT_PREP([micro-suite], [$2], [1], [], [stderr])
diff --git a/tests/foreign.at b/tests/foreign.at
index bba9f3b..7823007 100644
--- a/tests/foreign.at
+++ b/tests/foreign.at
< at >< at > -103,7 +103,7 < at >< at > AC_OUTPUT
 
 AT_DATA([Makefile.in],
 [[SHTOOL = < at >SHTOOL< at >
-# fake these, so that we use shtool whereever possible.
+# fake these, so that we use shtool wherever possible.
 INSTALL_PROGRAM = $(ac_install_sh)
 INSTALL_DATA = $(ac_install_sh) -m 644
 prefix = < at >prefix< at >
diff --git a/tests/tools.at b/tests/tools.at
index c530321..31d4aad 100644
--- a/tests/tools.at
+++ b/tests/tools.at
< at >< at > -703,7 +703,7 < at >< at > AC_DEFINE([ANT], [< at >], [The Ant in a h< at >t.])
 # Yes, that's right: the `middle' part of `acconfig.h' is still before
 # the AH_TOP part.  But so what, you're not supposed to use the two
 # together.
-# Ignore STDERR which is the longuish complaint against autoheader junk
+# Ignore STDERR which is the longish complaint against autoheader junk
 # files.
 AT_CHECK_AUTOHEADER([--force], [], [], [ignore])
 AT_CHECK([cat config.hin], 0,

[PATCH 0/3] 2.68b is out, please test

Eric Blake — 2012-03-02T04:47:02

I'm a bit later than planned (real life strikes again), but here
is what I changed in order to make the 2.68b beta release.  In
another week or so, I plan to release the official 2.69.

Eric Blake (3):
  maint: resync files from upstream
  Release Version 2.68b.
  maint: post-release administrivia

 .prev-version                |    2 +-
 GNUmakefile                  |   14 +---
 HACKING                      |   20 ++---
 NEWS                         |    4 +
 build-aux/config.guess       |   16 +++-
 build-aux/config.sub         |   19 +++--
 build-aux/texinfo.tex        |  181 +++++++++++++++++++++++++++--------------
 build-aux/update-copyright   |   13 +++-
 cfg.mk                       |    2 +-
 doc/standards.texi           |    6 +-
 lib/Autom4te/Channels.pm     |   11 +--
 lib/Autom4te/Configure_ac.pm |    9 +-
 lib/Autom4te/FileUtils.pm    |   17 ++--
 lib/Autom4te/Getopt.pm       |    8 +-
 lib/Autom4te/Struct.pm       |    5 +-
 lib/Autom4te/XFile.pm        |   17 ++--
 maint.mk                     |   67 ++++++++++------
 17 files changed, 249 insertions(+), 162 deletions(-)

[PATCH] m4sh: make AS_EXECUTABLE_P public

Eric Blake — 2012-02-25T05:11:58

In the process of making it public, factor it into a reusable
function.  This makes constructs like AC_CHECK_PROGRAM smaller,
as well as making libtool's naughty use of $as_executable_p safer.

* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Add a shell function.
(AS_EXECUTABLE_P): Forward to shell function.
* doc/autoconf.texi (Common Shell Constructs): Document it.
* NEWS: Mention this.

Signed-off-by: Eric Blake <eblake< at >redhat.com>
---

Any thoughts about this as a followup?  I will probably apply
it prior to cutting the pre-2.69 beta later this weekend.

 NEWS                |    2 ++
 doc/autoconf.texi   |    7 +++++++
 lib/m4sugar/m4sh.m4 |   10 +++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index decad47..1a5f775 100644
--- a/NEWS
+++ b/NEWS
< at >< at > -15,6 +15,8 < at >< at > GNU Autoconf NEWS - User visible changes.
 ** AS_LITERAL_IF again treats '=' as a literal.  Regression introduced in
    2.66.

+** The macro AS_EXECUTABLE_P, present since 2.50, is now documented.
+
 ** Macros

 - AC_PROG_LN_S and AS_LN_S now fall back on 'cp -pR' (not 'cp -p') if 'ln -s'
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 9c75ab0..83f24ba 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
< at >< at > -13658,6 +13658,13 < at >< at > Common Shell Constructs
 < at >end example
 < at >end defmac

+< at >defmac AS_EXECUTABLE_P (< at >var{file})
+< at >asindex{EXECUTABLE_P}
+Emit code to probe whether < at >var{file} is a regular file with executable
+permissions (and not a directory with search permissions).  The caller
+is responsible for quoting < at >var{file}.
+< at >end defmac
+
 < at >defmac AS_EXIT (< at >dvar{status, $?})
 < at >asindex{EXIT}
 Emit code to exit the shell with < at >var{status}, defaulting to < at >samp{$?}.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 9cf1d07..fbb258e 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
< at >< at > -1097,7 +1097,7 < at >< at > m4_defun_init([AS_TEST_X],
 # Check whether a file is a regular file that has executable permissions.
 m4_defun_init([AS_EXECUTABLE_P],
 [AS_REQUIRE([_AS_TEST_PREPARE])],
-[{ test -f $1 && test -x $1; }])# AS_EXECUTABLE_P
+[as_fn_executable_p $1])# AS_EXECUTABLE_P


 # _AS_EXPR_PREPARE
< at >< at > -1378,8 +1378,12 < at >< at > m4_define([_AS_TEST_X_WORKS], [test -x /])
 # Provide back-compat to people that hooked into our undocumented
 # internals (here's looking at you, libtool).
 m4_defun([_AS_TEST_PREPARE],
+[AS_REQUIRE_SHELL_FN([as_fn_executable_p],
+  [AS_FUNCTION_DESCRIBE([as_fn_executable_p], [FILE],
+    [Test if FILE is an executable regular file.])],
+  [  test -f "$[]1" && test -x "$[]1"])]dnl
 [as_test_x='test -x'
-as_executable_p=$as_test_x
+as_executable_p=as_fn_executable_p
 ])# _AS_TEST_PREPARE

[PATCH] maint: replace FSF snail-mail addresses with URLs

Paul Eggert — 2012-02-10T07:35:41

* tests/erlang.at, tests/go.at, tests/statesave.m4:
Replace FSF snail mail addresses with URLs, as per GNU coding
standards, and for consistency with other tests.
---
 tests/erlang.at    |    4 +---
 tests/go.at        |    4 +---
 tests/statesave.m4 |    4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tests/erlang.at b/tests/erlang.at
index a73ad5f..58789b6 100644
--- a/tests/erlang.at
+++ b/tests/erlang.at
< at >< at > -15,9 +15,7 < at >< at > AT_BANNER([Erlang low level compiling and utility macros.])
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Since the macros which compile are required by most tests, check
diff --git a/tests/go.at b/tests/go.at
index b45c2b7..8733aee 100644
--- a/tests/go.at
+++ b/tests/go.at
< at >< at > -15,9 +15,7 < at >< at > AT_BANNER([Go low level compiling and utility macros.])
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Since the macros which compile are required by most tests, check
diff --git a/tests/statesave.m4 b/tests/statesave.m4
index b28c9ad..2f63ae5 100644
--- a/tests/statesave.m4
+++ b/tests/statesave.m4
< at >< at > -13,9 +13,7 < at >< at >
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # AC_STATE_SAVE(FILE)
 # -------------------