X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fglob;h=db5410b51b3d684f3a0ec85ed1e4b081e694d462;hb=cd78e7369fe57d42e3845ef953c765ed3602ebb4;hp=beaf476c118b8b373cf6d6dd23fe346bb1e69575;hpb=abac9b73490cd4d59a1e454c6ade5fd2073f2d2f;p=gnulib.git

diff --git a/modules/glob b/modules/glob
index beaf476c1..db5410b51 100644
--- a/modules/glob
+++ b/modules/glob
@@ -9,35 +9,33 @@ lib/glob.c
 m4/glob.m4
 
 Depends-on:
-alloca
 arg-nonnull
 c++defs
-d-type
-dirfd
 extensions
-fnmatch
-getlogin_r
-memchr
-mempcpy
-stdbool
-strdup
-sys_stat
-unistd
 warn-on-use
-malloc-posix
+alloca          [test -n "$GLOB_H"]
+d-type          [test -n "$GLOB_H"]
+dirfd           [test -n "$GLOB_H"]
+fnmatch         [test -n "$GLOB_H"]
+getlogin_r      [test -n "$GLOB_H"]
+memchr          [test -n "$GLOB_H"]
+mempcpy         [test -n "$GLOB_H"]
+stdbool         [test -n "$GLOB_H"]
+strdup          [test -n "$GLOB_H"]
+sys_stat        [test -n "$GLOB_H"]
+unistd          [test -n "$GLOB_H"]
+malloc-posix    [test -n "$GLOB_H"]
 
 configure.ac:
 gl_GLOB
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GLOB_H)
-EXTRA_HEADERS += glob.h
-
 BUILT_SOURCES += $(GLOB_H)
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
-glob.h: glob.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+if GL_GENERATE_GLOB_H
+glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
@@ -47,6 +45,10 @@ glob.h: glob.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	      < $(srcdir)/glob.in.h; \
 	} > $@-t && \
 	mv -f $@-t $@
+else
+glob.h: $(top_builddir)/config.status
+	rm -f $@
+endif
 MOSTLYCLEANFILES += glob.h glob.h-t
 
 Include: