# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1534705235 -7200
# Node ID e9e2c9e0bdca552f35195c3c42d09f9464fb465a
# Parent  87507991a9fed6a2f23b3e6f6a92421c1138118d
glob-h: Formalize side effects from other modules.

* m4/glob_h.m4 (gl_REPLACE_GLOB_H): New macro.
* m4/glob.m4 (gl_GLOB): Invoke it.

diff -r 87507991a9fe -r e9e2c9e0bdca ChangeLog
--- a/ChangeLog	Sun Aug 19 20:58:58 2018 +0200
+++ b/ChangeLog	Sun Aug 19 21:00:35 2018 +0200
@@ -1,5 +1,9 @@
 2018-08-19  Bruno Haible  <bruno@clisp.org>
 
+	glob-h: Formalize side effects from other modules.
+	* m4/glob_h.m4 (gl_REPLACE_GLOB_H): New macro.
+	* m4/glob.m4 (gl_GLOB): Invoke it.
+
 	fnmatch-h: Formalize side effects from other modules.
 	* m4/fnmatch_h.m4 (gl_REPLACE_FNMATCH_H): New macro.
 	* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Invoke it.
diff -r 87507991a9fe -r e9e2c9e0bdca m4/glob.m4
--- a/m4/glob.m4	Sun Aug 19 20:58:58 2018 +0200
+++ b/m4/glob.m4	Sun Aug 19 21:00:35 2018 +0200
@@ -1,4 +1,4 @@
-# glob.m4 serial 20
+# glob.m4 serial 21
 dnl Copyright (C) 2005-2007, 2009-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,
@@ -69,8 +69,7 @@
   fi
 
   if test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1; then
-    GLOB_H=glob.h
-    AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
+    gl_REPLACE_GLOB_H
   fi
 ])
 
diff -r 87507991a9fe -r e9e2c9e0bdca m4/glob_h.m4
--- a/m4/glob_h.m4	Sun Aug 19 20:58:58 2018 +0200
+++ b/m4/glob_h.m4	Sun Aug 19 21:00:35 2018 +0200
@@ -1,4 +1,4 @@
-# glob_h.m4 serial 4
+# glob_h.m4 serial 5
 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,
@@ -44,6 +44,14 @@
     [glob globfree glob_pattern_p])
 ])
 
+dnl Unconditionally enables the replacement of <glob.h>.
+AC_DEFUN([gl_REPLACE_GLOB_H],
+[
+  AC_REQUIRE([gl_GLOB_H_DEFAULTS])
+  GLOB_H='glob.h'
+  AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
+])
+
 AC_DEFUN([gl_GLOB_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.