X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=8a46af2a7fcf5abf49909fbba8a92719eb58c1eb;hb=8b7bcee23747613b8b7a0aa0715dc4668fae68e0;hp=6849b4d5e37e02d2c708111d53c491f7f9168790;hpb=4013d14c4b1f18cb4b665a0a47ad80ce3224d25d;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index 6849b4d5e..8a46af2a7 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -11,30 +11,39 @@ m4/fnmatch.m4
 Depends-on:
 arg-nonnull
 extensions
-alloca
-stdbool
-wchar
-wctype
-memchr
-memcmp
-mbsrtowcs
-mbsinit
+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 $(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: