X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fglob;h=0caaeefcd79ee9bbdeacc9dc7b81fdeac1afaf79;hb=e967460a14f47cdab5ff7d71fbcaee71e00c330b;hp=dcdf752f4426375989c51be14185e4ad2bd1182f;hpb=12a195113bbb388bd4e911ff6b507252577b4805;p=gnulib.git

diff --git a/modules/glob b/modules/glob
index dcdf752f4..0caaeefcd 100644
--- a/modules/glob
+++ b/modules/glob
@@ -10,16 +10,20 @@ m4/glob.m4
 
 Depends-on:
 alloca
+arg-nonnull
+c++defs
 d-type
 dirfd
 extensions
 fnmatch
 getlogin_r
+memchr
 mempcpy
-openat
+stdbool
 strdup
 sys_stat
 unistd
+warn-on-use
 malloc-posix
 
 configure.ac:
@@ -30,11 +34,15 @@ 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
+glob.h: glob.in.h $(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' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/glob.in.h; \
-	} > $@-t
+	} > $@-t && \
 	mv -f $@-t $@
 MOSTLYCLEANFILES += glob.h glob.h-t