X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ffnmatch;h=6849b4d5e37e02d2c708111d53c491f7f9168790;hb=3361b6d48f06367906059ba220639436b50dbe4d;hp=5c3d7090c3ac0aa3557a55bc9b4a03a21f5b587d;hpb=1b27e233b2a03814157d4f5060b785f48db4f3e5;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index 5c3d7090c..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,6 +9,7 @@ m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
+arg-nonnull
 extensions
 alloca
 stdbool
@@ -20,17 +21,19 @@ 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