X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=6849b4d5e37e02d2c708111d53c491f7f9168790;hb=c5728261c324a75f8d23dd7d10cb42dde9420227;hp=01d4c95802c17fe0ac11cfbd10da2dce9ba673aa;hpb=e7221a5e9df291dc6abbb1e3791cf8235909b1a0;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index 01d4c9580..6849b4d5e 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
@@ -9,25 +9,31 @@ 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)
 
 # 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.in.h
+fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  cat $(srcdir)/fnmatch.in.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