getcwd-lgpl: new module

[pspp] / modules / glob

diff --git a/modules/glob b/modules/glob
index beaf476c118b8b373cf6d6dd23fe346bb1e69575..114cb6d121d54a8e0abe1e943577ee9bf38baffb 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -30,14 +30,12 @@ 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: