X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=6849b4d5e37e02d2c708111d53c491f7f9168790;hb=fc80165c92e8b92da6e88e4fdb9c472125124fa0;hp=441d5d381b4a9a34eefdb5a95c0a8313f19f6e9a;hpb=feb70829404adc3e1bb1437b31077558feb1c38e;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index 441d5d381..6849b4d5e 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -9,6 +9,7 @@ m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
+arg-nonnull
 extensions
 alloca
 stdbool
@@ -27,10 +28,12 @@ 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