X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ffnmatch;h=8a46af2a7fcf5abf49909fbba8a92719eb58c1eb;hb=a292d7f866813679fb74395332df7c46bc976a9e;hp=bd13b8557f1318b66a1e01d589ea64c9200bde97;hpb=d1aadab21bf8755e0fb75a838dc650e73f6ee78d;p=gnulib.git

diff --git a/modules/fnmatch b/modules/fnmatch
index bd13b8557..8a46af2a7 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -1,38 +1,56 @@
 Description:
-GNU fnmatch() implementation.
+fnmatch() function: wildcard matching.
 
 Files:
-lib/fnmatch_.h
+lib/fnmatch.in.h
 lib/fnmatch.c
 lib/fnmatch_loop.c
 m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
-alloca
-stdbool
+arg-nonnull
+extensions
+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:
-# No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
+gl_FUNC_FNMATCH_POSIX
+if test -n "$FNMATCH_H"; then
+  AC_LIBOBJ([fnmatch])
+  gl_PREREQ_FNMATCH
+fi
 
 Makefile.am:
 BUILT_SOURCES += $(FNMATCH_H)
-EXTRA_DIST += fnmatch_.h fnmatch_loop.c
 
 # 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_.h
-	rm -f $@-t $@
-	cp $(srcdir)/fnmatch_.h $@-t
-	chmod a-x $@-t
-	mv $@-t $@
+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:
 <fnmatch.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all, glibc