>From 4ecaa9f2580c6d0c32d20034f4ed8602a79d7f25 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sat, 18 Aug 2018 00:54:35 -0700
Subject: [PATCH] glob-h: always build glob.h

This works around a problem reported by Reuben Thomas in:
http://lists.gnu.org/r/bug-gnulib/2018-08/msg00079.html
This workaround always builds glob.h, even on platforms that
do not need it; perhaps this could be improved someday.
* m4/glob_h.m4 (gl_GLOB_H): Do not set or use GLOB_H, since glob.h
is always created now.
* modules/glob-h (BUILT_SOURCES, glob.h): Always build glob.h.
---
 ChangeLog      | 11 +++++++++++
 m4/glob_h.m4   | 18 +-----------------
 modules/glob-h |  7 +------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcf7f6839..120b4e94e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2018-08-18  Paul Eggert  <address@hidden>
+
+	glob-h: always build glob.h
+	This works around a problem reported by Reuben Thomas in:
+	http://lists.gnu.org/r/bug-gnulib/2018-08/msg00079.html
+	This workaround always builds glob.h, even on platforms that
+	do not need it; perhaps this could be improved someday.
+	* m4/glob_h.m4 (gl_GLOB_H): Do not set or use GLOB_H, since glob.h
+	is always created now.
+	* modules/glob-h (BUILT_SOURCES, glob.h): Always build glob.h.
+
 2018-08-13  Bruno Haible  <address@hidden>
 
 	monetary: Simplify m4 code.
diff --git a/m4/glob_h.m4 b/m4/glob_h.m4
index 942efe585..9fe49c733 100644
--- a/m4/glob_h.m4
+++ b/m4/glob_h.m4
@@ -1,4 +1,4 @@
-# glob_h.m4 serial 1
+# glob_h.m4 serial 2
 dnl Copyright (C) 2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -21,22 +21,6 @@ AC_DEFUN([gl_GLOB_H],
   fi
   AC_SUBST([HAVE_GLOB_H])
 
-  m4_ifdef([gl_POSIXCHECK],
-    [GLOB_H=glob.h],
-    [GLOB_H=''
-     if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then
-       dnl Override <glob.h> always, to support the C++ GNULIB_NAMESPACE.
-       GLOB_H=glob.h
-     else
-       if test $ac_cv_header_glob_h != yes; then
-         dnl Provide a substitute <glob.h> file.
-         GLOB_H=glob.h
-       fi
-     fi
-    ])
-  AC_SUBST([GLOB_H])
-  AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <glob.h>
diff --git a/modules/glob-h b/modules/glob-h
index b490a7327..b61bc3333 100644
--- a/modules/glob-h
+++ b/modules/glob-h
@@ -20,10 +20,9 @@ configure.ac:
 gl_GLOB_H
 
 Makefile.am:
-BUILT_SOURCES += $(GLOB_H)
+BUILT_SOURCES += glob.h
 
 # We need the following in order to create <glob.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 address@hidden $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -44,10 +43,6 @@ glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
 	      < $(srcdir)/glob.in.h; \
 	} > address@hidden && \
 	mv address@hidden $@
-else
-glob.h: $(top_builddir)/config.status
-	rm -f $@
-endif
 MOSTLYCLEANFILES += glob.h glob.h-t
 
 Include:
-- 
2.17.1