--- a/ChangeLog	Tue Aug 14 02:00:05 2018 +0200
+++ b/ChangeLog	Tue Aug 14 02:29:23 2018 +0200
@@ -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>
 

--- a/m4/fnmatch.m4	Tue Aug 14 02:00:05 2018 +0200
+++ b/m4/fnmatch.m4	Tue Aug 14 02:29:23 2018 +0200
@@ -135,7 +135,6 @@
 [
   m4_divert_text([INIT_PREPARE], [gl_fnmatch_required=GNU])
 
-  AC_REQUIRE([gl_FNMATCH_H_GNU])
   AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
 ])
 

--- a/m4/fnmatch_h.m4	Tue Aug 14 02:00:05 2018 +0200
+++ b/m4/fnmatch_h.m4	Tue Aug 14 02:29:23 2018 +0200
@@ -6,7 +6,6 @@
 
 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 @@
     [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.