X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=a5a49f9d92b2c12c32a3904500003fd1387093ed;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=cff8bad5a00336566919324b455dcfa5fbf55da0;hpb=abac9b73490cd4d59a1e454c6ade5fd2073f2d2f;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index cff8bad5a..a5a49f9d9 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -9,35 +9,41 @@ m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
-arg-nonnull
 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:
-nodist_pkginclude_HEADERS += $(FNMATCH_H)
-EXTRA_HEADERS += fnmatch.h
-
 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 $(ARG_NONNULL_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! */'; \
 	  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: