Move the fnmatch-posix module into the fnmatch module.

diff --git a/ChangeLog b/ChangeLog
index e0a2561..3ac13ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-05-03  Bruno Haible  <bruno@clisp.org>
 
+       * modules/fnmatch (Description, configure.ac): Taken from
+       fnmatch-posix.
+       * modules/fnmatch-posix: Turn into a symbolic reference to the
+       'fnmatch' module, and deprecate.
+       * doc/posix-functions/fnmatch.texi: Mention the fnmatch module.
+
+2009-05-03  Bruno Haible  <bruno@clisp.org>
+
        * m4/vasnprintf.m4 (gl_PREREQ_VASNPRINTF,
        gl_PREREQ_VASNPRINTF_LONG_DOUBLE): Define through AC_DEFUN_ONCE.
        Reported by Ralf Wildenhues.

diff --git a/doc/posix-functions/fnmatch.texi b/doc/posix-functions/fnmatch.texi
index df0ba9f..c242d17 100644 (file)
--- a/doc/posix-functions/fnmatch.texi
+++ b/doc/posix-functions/fnmatch.texi
@@ -4,7 +4,7 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/fnmatch.html}
 
-Gnulib module: fnmatch-posix or fnmatch-gnu
+Gnulib module: fnmatch or fnmatch-gnu
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/fnmatch b/modules/fnmatch
index 5c3d709..441d5d3 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -1,5 +1,5 @@
 Description:
-GNU implementation of the fnmatch() function.
+fnmatch() function: wildcard matching.
 
 Files:
 lib/fnmatch.in.h
@@ -20,7 +20,7 @@ mbsrtowcs
 mbsinit
 
 configure.ac:
-# No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
+gl_FUNC_FNMATCH_POSIX
 
 Makefile.am:
 BUILT_SOURCES += $(FNMATCH_H)

diff --git a/modules/fnmatch-posix b/modules/fnmatch-posix
index c439b23..b6df7da 100644 (file)
--- a/modules/fnmatch-posix
+++ b/modules/fnmatch-posix
@@ -1,13 +1,18 @@
 Description:
 fnmatch() function: wildcard matching.
 
+Status:
+obsolete
+
+Notice:
+This module is obsolete. Use the module 'fnmatch' instead.
+
 Files:
 
 Depends-on:
 fnmatch
 
 configure.ac:
-gl_FUNC_FNMATCH_POSIX
 
 Makefile.am: