From: Bruno Haible <bruno@clisp.org>
Date: Sun, 3 May 2009 22:32:52 +0000 (+0200)
Subject: Move the fnmatch-posix module into the fnmatch module.
X-Git-Tag: v0.1~5946
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=feb70829404adc3e1bb1437b31077558feb1c38e;p=gnulib.git

Move the fnmatch-posix module into the fnmatch module.
---

diff --git a/ChangeLog b/ChangeLog
index e0a2561b5..3ac13add4 100644
--- 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 df0ba9f8d..c242d174b 100644
--- 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 5c3d7090c..441d5d381 100644
--- 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 c439b2321..b6df7da38 100644
--- 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: