(AC_FUNC_FNMATCH): Add a test to detect the d*/*1 vs d/s/1 bug.

Add a couple more test cases to catch bugs in glibc 2.1.95.
Include fnmatch.h unconditionally
Mention the GNU C library.
From Paul Eggert.

diff --git a/acfunctions.m4 b/acfunctions.m4
index 41c5cb22e3d9aa93af734f8e266198e824056e83..04da6ff708f58c2546b9368775e582cecae786e7 100644 (file)
--- a/acfunctions.m4
+++ b/acfunctions.m4
@@ -343,20 +343,18 @@ fi
 # ---------------
 # We look for fnmatch.h to avoid that the test fails in C++.
 AC_DEFUN([AC_FUNC_FNMATCH],
-[AC_CHECK_HEADERS(fnmatch.h)
-AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works,
-# Some versions of Solaris or SCO have a broken fnmatch function.
+[AC_CACHE_CHECK(for working GNU-style fnmatch, ac_cv_func_fnmatch_works,
+# Some versions of Solaris, SCO, and the GNU C Library
+# have a broken or incompatible fnmatch.
 # So we run a test program.  If we are cross-compiling, take no chance.
-# Thanks to John Oleynick and Franc,ois Pinard for this test.
-[AC_TRY_RUN(
-[#if HAVE_FNMATCH_H
-# include <fnmatch.h>
-#endif
-
-int
-main ()
-{
-  exit (fnmatch ("a*", "abc", 0) != 0);
+# Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
+[AC_TRY_RUN([#include <fnmatch.h>
+main() {
+  exit (fnmatch ("a*", "abc", 0) != 0
+       || fnmatch("d*/*1", "d/s/1", FNM_FILE_NAME) != FNM_NOMATCH
+       || fnmatch("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
+       || fnmatch("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
+       || fnmatch("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0);
 }],
 ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
 ac_cv_func_fnmatch_works=no)])

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 41c5cb22e3d9aa93af734f8e266198e824056e83..04da6ff708f58c2546b9368775e582cecae786e7 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -343,20 +343,18 @@ fi
 # ---------------
 # We look for fnmatch.h to avoid that the test fails in C++.
 AC_DEFUN([AC_FUNC_FNMATCH],
-[AC_CHECK_HEADERS(fnmatch.h)
-AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works,
-# Some versions of Solaris or SCO have a broken fnmatch function.
+[AC_CACHE_CHECK(for working GNU-style fnmatch, ac_cv_func_fnmatch_works,
+# Some versions of Solaris, SCO, and the GNU C Library
+# have a broken or incompatible fnmatch.
 # So we run a test program.  If we are cross-compiling, take no chance.
-# Thanks to John Oleynick and Franc,ois Pinard for this test.
-[AC_TRY_RUN(
-[#if HAVE_FNMATCH_H
-# include <fnmatch.h>
-#endif
-
-int
-main ()
-{
-  exit (fnmatch ("a*", "abc", 0) != 0);
+# Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
+[AC_TRY_RUN([#include <fnmatch.h>
+main() {
+  exit (fnmatch ("a*", "abc", 0) != 0
+       || fnmatch("d*/*1", "d/s/1", FNM_FILE_NAME) != FNM_NOMATCH
+       || fnmatch("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
+       || fnmatch("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR) != 0
+       || fnmatch("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR) != 0);
 }],
 ac_cv_func_fnmatch_works=yes, ac_cv_func_fnmatch_works=no,
 ac_cv_func_fnmatch_works=no)])