+2018-08-19 Bruno Haible <bruno@clisp.org>
+
+ glob: Fix another compilation error when glob.h is not replaced.
+ Reported by Reuben Thomas <rrt@sc3d.org> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00112.html>.
+ * m4/glob.m4 (gl_GLOB): Set GLOB_H to non-empty when needed.
+ * m4/glob_h.m4 (gl_GLOB_H): Define through AC_DEFUN_ONCE.
+
2018-08-18 Bruno Haible <bruno@clisp.org>
fnmatch: Avoid conflicting macro definitions of 'fnmatch'.
-# glob.m4 serial 19
+# glob.m4 serial 20
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,
REPLACE_GLOB_PATTERN_P=1
fi
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"])
+ fi
])
# Prerequisites of lib/glob.c and lib/globfree.c.
-# glob_h.m4 serial 3
+# glob_h.m4 serial 4
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,
dnl From Bruno Haible.
-AC_DEFUN([gl_GLOB_H],
+AC_DEFUN_ONCE([gl_GLOB_H],
[
AC_REQUIRE([gl_GLOB_H_DEFAULTS])
m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])