diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | m4/fnmatch.m4 | 1 | ||||
| -rw-r--r-- | m4/fnmatch_h.m4 | 22 |
3 files changed, 0 insertions, 25 deletions
@@ -6,8 +6,6 @@ and by Paul J. Lucas <paul@lucasmail.org> in <https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00069.html>. * m4/fnmatch_h.m4 (gl_FNMATCH_H): Define through AC_DEFUN_ONCE. - (gl_FNMATCH_H_GNU): New macro. - * m4/fnmatch.m4 (gl_FUNC_FNMATCH_GNU): Require gl_FNMATCH_H_GNU. 2018-08-11 Bruno Haible <bruno@clisp.org> diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 2dbfa04475..94145141da 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -135,7 +135,6 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU], [ m4_divert_text([INIT_PREPARE], [gl_fnmatch_required=GNU]) - AC_REQUIRE([gl_FNMATCH_H_GNU]) AC_REQUIRE([gl_FUNC_FNMATCH_POSIX]) ]) diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4 index f36557822a..afa59fe0a5 100644 --- a/m4/fnmatch_h.m4 +++ b/m4/fnmatch_h.m4 @@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -# Request a POSIX compliant <fnmatch.h> include file. AC_DEFUN_ONCE([gl_FNMATCH_H], [ AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) @@ -50,27 +49,6 @@ AC_DEFUN_ONCE([gl_FNMATCH_H], [fnmatch]) ]) -# Request a POSIX compliant <fnmatch.h> include file with GNU extensions. -AC_DEFUN([gl_FNMATCH_H_GNU], -[ - AC_REQUIRE([gl_FNMATCH_H]) - if test -z "$FNMATCH_H"; then - AC_CACHE_CHECK([whether <fnmatch.h> has the GNU extensions], - [gl_cv_header_fnmatch_h_gnu], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <fnmatch.h>]], - [[int gnu_flags = FNM_FILE_NAME | FNM_LEADING_DIR | FNM_CASEFOLD | FNM_EXTMATCH;]])], - [gl_cv_header_fnmatch_h_gnu=yes], - [gl_cv_header_fnmatch_h_gnu=no]) - ]) - if test $gl_cv_header_fnmatch_h_gnu != yes; then - FNMATCH_H=fnmatch.h - AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"]) - fi - fi -]) - AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR], [ dnl Use AC_REQUIRE here, so that the default settings are expanded once only. |