Mercurial > gnulib
changeset 39802:e9e2c9e0bdca
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 19 Aug 2018 21:00:35 +0200 |
| parents | 87507991a9fe |
| children | 70db3b74c10c |
| files | ChangeLog m4/glob.m4 m4/glob_h.m4 |
| diffstat | 3 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 ])
--- 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.