diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-08-18 00:54:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-08-18 00:54:56 -0700 |
| commit | 4ecaa9f2580c6d0c32d20034f4ed8602a79d7f25 (patch) | |
| tree | e8f1c98e97294109bdaff000be4e05d3a2302b70 /m4/glob_h.m4 | |
| parent | dd1a129ef62d10b1eeb4b40ad39771b93f368cec (diff) | |
| download | gnulib-4ecaa9f2580c6d0c32d20034f4ed8602a79d7f25.tar.gz | |
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.
Diffstat (limited to 'm4/glob_h.m4')
| -rw-r--r-- | m4/glob_h.m4 | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/m4/glob_h.m4 b/m4/glob_h.m4 index 942efe585d..9fe49c7331 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> |