X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=6849b4d5e37e02d2c708111d53c491f7f9168790;hb=0af2227383df6c060f2b719882474cf8e1dd7431;hp=c086b1946957151e7e27a415ddd4cf1230c88de9;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index c086b1946..6849b4d5e 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -1,30 +1,39 @@
 Description:
-GNU fnmatch() implementation.
+fnmatch() function: wildcard matching.
 
 Files:
-lib/fnmatch_.h
+lib/fnmatch.in.h
 lib/fnmatch.c
 lib/fnmatch_loop.c
 m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
+arg-nonnull
+extensions
 alloca
 stdbool
+wchar
+wctype
+memchr
+memcmp
+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)
-EXTRA_DIST += fnmatch_.h fnmatch_loop.c
 
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
-fnmatch.h: fnmatch_.h
+fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/fnmatch_.h; \
-	} > $@-t
+	  sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      < $(srcdir)/fnmatch.in.h; \
+	} > $@-t && \
 	mv -f $@-t $@
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
@@ -32,7 +41,7 @@ Include:
 <fnmatch.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all, glibc