* doc/autoconf.texi (Systemology): Point to Tru64 docs, and the

Rosetta Stone for Unix.

diff --git a/NEWS b/NEWS
index 8b6ade7f0e07095f411f8670b48a92a7bf5e6842..1450dcac56ab6ff0509c853c1c71a72280b2ccc1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,8 +13,8 @@
 
 - AC_CONFIG_LINKS now makes copies if it can't make links.
 - AC_FUNC_FNMATCH now tests only for POSIX compatibility, reverting to
-  Autoconf 2.13 behavior.  The new macro AC_FUNC_FNMATCH_GNU also tests for
-  GNU extensions to fnmatch.
+  Autoconf 2.13 behavior.  The new macro AC_FUNC_FNMATCH_GNU also
+  tests for GNU extensions to fnmatch, and replaces fnmatch if needed.
 
 - AC_FUNC_SETVBUF_REVERSED no longer fails when cross-compiling.
 
@@ -24,7 +24,7 @@
 
 - New macros
   AC_CONFIG_LIBOBJ_DIR, AC_GNU_SOURCE, AC_PROG_EGREP, AC_PROG_FGREP,
-  AC_REPLACE_FNMATCH, AC_REPLACE_FNMATCH_GNU, AC_TYPE_MBSTATE_T.
+  AC_REPLACE_FNMATCH, AC_FUNC_FNMATCH_GNU, AC_TYPE_MBSTATE_T.
 
 - AC_FUNC_GETLOADAVG
   looks for getloadavg.c in the CONFIG_LIBOBJ_DIR.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 466c0195af97805535605df8730155091b8270c2..382e664b86c896af0a04dcf50f774cae313f800c 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -3557,9 +3557,10 @@ broken/missing @code{fnmatch}.  See @code{AC_REPLACE_FNMATCH} below.
 @acindex FUNC_FNMATCH_GNU
 @c @fuindex fnmatch
 @prindex @code{fnmatch}
-Behave like @code{AC_FUNC_FNMATCH}, but also test whether @code{fnmatch}
-supports @acronym{GNU} extensions.  Detect common implementation bugs,
-for example, the bugs in the @acronym{GNU} C Library 2.1.
+Behave like @code{AC_REPLACE_FNMATCH} (@emph{replace}) but also test
+whether @code{fnmatch} supports @acronym{GNU} extensions.  Detect common
+implementation bugs, for example, the bugs in the @acronym{GNU} C
+Library 2.1.
 @end defmac
 
 @defmac AC_FUNC_FORK
@@ -3924,14 +3925,6 @@ this source code is compiled as an @code{AC_LIBOBJ} replacement, and the
 included in place of the system @code{<fnmatch.h>}.
 @end defmac
 
-@defmac AC_REPLACE_FNMATCH_GNU
-@acindex REPLACE_FNMATCH_GNU
-@c @fuindex fnmatch
-@prindex @code{fnmatch}
-Samr as @code{AC_REPLACE_FNMATCH}, but requiring the @acronym{GNU}
-extensions to @code{fnmatch} (see @code{AC_FUNC_FNMATCH_GNU}).
-@end defmac
-
 
 
 @node Generic Functions

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 7337d3176413ab0b6abad8c0e20207c34e6c5b4b..f6f055e4ce4400019bfb532f1415949087a16711 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -392,17 +392,6 @@ AC_DEFUN([AC_FUNC_FNMATCH],
 ])# AC_FUNC_FNMATCH
 
 
-# AC_FUNC_FNMATCH_GNU
-# -------------------
-AC_DEFUN([AC_FUNC_FNMATCH_GNU],
-[AC_REQUIRE([AC_GNU_SOURCE])
-_AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu],
-                    [AC_DEFINE([HAVE_FNMATCH], 1,
-                    [Define to 1 if your system has a working GNU `fnmatch'
-                    function.])])
-])# AC_FUNC_FNMATCH_GNU
-
-
 # _AC_LIBOBJ_FNMATCH
 # ------------------
 # Prepare the replacement of fnmatch.
@@ -429,14 +418,14 @@ AC_DEFUN([AC_REPLACE_FUNC_FNMATCH],
 ])# AC_REPLACE_FUNC_FNMATCH
 
 
-# AC_REPLACE_FUNC_FNMATCH_GNU
-# ---------------------------
-AC_DEFUN([AC_REPLACE_FNMATCH_GNU],
+# AC_FUNC_FNMATCH_GNU
+# -------------------
+AC_DEFUN([AC_FUNC_FNMATCH_GNU],
 [AC_REQUIRE([AC_GNU_SOURCE])
 _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu],
                     [rm -f $ac_config_libobj_dir/fnmatch.h],
                     [_AC_LIBOBJ_FNMATCH])
-])# AC_REPLACE_FUNC_FNMATCH_GNU
+])# AC_FUNC_FNMATCH_GNU
 
 
 # AU::AM_FUNC_FNMATCH