X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=modules%2Ffnmatch;h=a5a49f9d92b2c12c32a3904500003fd1387093ed;hb=75000c499c834249ea7be7a0aa2799a817d5b58c;hp=441d5d381b4a9a34eefdb5a95c0a8313f19f6e9a;hpb=feb70829404adc3e1bb1437b31077558feb1c38e;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index 441d5d381..a5a49f9d9 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -10,28 +10,40 @@ m4/fnmatch.m4
 
 Depends-on:
 extensions
-alloca
-stdbool
-wchar
-wctype
-memchr
-memcmp
-mbsrtowcs
-mbsinit
+snippet/arg-nonnull
+alloca          [test -n "$FNMATCH_H"]
+stdbool         [test -n "$FNMATCH_H"]
+wchar           [test -n "$FNMATCH_H"]
+wctype-h        [test -n "$FNMATCH_H"]
+memchr          [test -n "$FNMATCH_H"]
+memcmp          [test -n "$FNMATCH_H"]
+mbsrtowcs       [test -n "$FNMATCH_H"]
+mbsinit         [test -n "$FNMATCH_H"]
 
 configure.ac:
 gl_FUNC_FNMATCH_POSIX
+if test -n "$FNMATCH_H"; then
+  AC_LIBOBJ([fnmatch])
+  gl_PREREQ_FNMATCH
+fi
 
 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
+if GL_GENERATE_FNMATCH_H
+fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(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 $@
+else
+fnmatch.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
 Include: