We had a long-standing incompatibility between the modules fnmatch-gnu and
fnmatch-posix: It was not possible to both in the same configure.ac. This
fixes it.
2009-05-02 Bruno Haible <br...@clisp.org>
Remove incompatibility between modules fnmatch-posix and fnmatch-gnu.
* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX, gl_FUNC_FNMATCH_GNU): Use a
shell variable gl_fnmatch_required to detect which variant is
requested.
(_AC_FUNC_FNMATCH_IF, _AC_LIBOBJ_FNMATCH): Remove macros. Inlined into
gl_FUNC_FNMATCH_POSIX.
* gnulib-tool (func_create_testdir, func_create_megatestdir): Don't
exclude fnmatch-posix.
*** m4/fnmatch.m4.orig 2009-05-02 13:25:36.000000000 +0200
--- m4/fnmatch.m4 2009-05-02 13:22:28.000000000 +0200
***************
*** 1,4 ****
! # Check for fnmatch - serial 3.
# Copyright (C) 2000-2007, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
--- 1,4 ----
! # Check for fnmatch - serial 4.
# Copyright (C) 2000-2007, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
***************
*** 8,126 ****
# Autoconf defines AC_FUNC_FNMATCH, but that is obsolescent.
# New applications should use the macros below instead.
! # _AC_FUNC_FNMATCH_IF([STANDARD = GNU | POSIX], [CACHE_VAR], [IF-TRUE],
[IF-FALSE])
! # -------------------------------------------------------------------------
! # If a STANDARD compliant fnmatch is found, run IF-TRUE, otherwise
! # IF-FALSE. Use CACHE_VAR.
! AC_DEFUN([_AC_FUNC_FNMATCH_IF],
! [AC_CACHE_CHECK(
! [for working $1 fnmatch],
! [$2],
! [dnl Some versions of Solaris, SCO, and the GNU C Library
! dnl have a broken or incompatible fnmatch.
! dnl So we run a test program. If we are cross-compiling, take no chance.
! dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this
test.
! AC_RUN_IFELSE(
! [AC_LANG_PROGRAM(
! [[#include <fnmatch.h>
! static int
! y (char const *pattern, char const *string, int flags)
! {
! return fnmatch (pattern, string, flags) == 0;
! }
! static int
! n (char const *pattern, char const *string, int flags)
! {
! return fnmatch (pattern, string, flags) == FNM_NOMATCH;
! }
! ]],
! [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
! char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
! static char const A_1[] = { 'A' - 1, 0 };
! static char const A01[] = { 'A' + 1, 0 };
! static char const a_1[] = { 'a' - 1, 0 };
! static char const a01[] = { 'a' + 1, 0 };
! static char const bs_1[] = { '\\\\' - 1, 0 };
! static char const bs01[] = { '\\\\' + 1, 0 };
! return
! !(n ("a*", "", 0)
! && y ("a*", "abc", 0)
! && n ("d*/*1", "d/s/1", FNM_PATHNAME)
! && y ("a\\\\bc", "abc", 0)
! && n ("a\\\\bc", "abc", FNM_NOESCAPE)
! && y ("*x", ".x", 0)
! && n ("*x", ".x", FNM_PERIOD)
! && y (Apat, "\\\\", 0) && y (Apat, "A", 0)
! && y (apat, "\\\\", 0) && y (apat, "a", 0)
! && n (Apat, A_1, 0) == ('A' < '\\\\')
! && n (apat, a_1, 0) == ('a' < '\\\\')
! && y (Apat, A01, 0) == ('A' < '\\\\')
! && y (apat, a01, 0) == ('a' < '\\\\')
! && y (Apat, bs_1, 0) == ('A' < '\\\\')
! && y (apat, bs_1, 0) == ('a' < '\\\\')
! && n (Apat, bs01, 0) == ('A' < '\\\\')
! && n (apat, bs01, 0) == ('a' < '\\\\')
! && ]m4_if([$1], [GNU],
! [y ("xxXX", "xXxX", FNM_CASEFOLD)
! && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)
! && n ("d*/*1", "d/s/1", FNM_FILE_NAME)
! && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)
! && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)
! && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)],
! 1))[;]])],
! [$2=yes],
! [$2=no],
! [$2="guessing no"])])
! AS_IF([test "$$2" = yes], [$3], [$4])
! ])# _AC_FUNC_FNMATCH_IF
!
!
! # _AC_LIBOBJ_FNMATCH
! # ------------------
! # Prepare the replacement of fnmatch.
! AC_DEFUN([_AC_LIBOBJ_FNMATCH],
! [AC_REQUIRE([AC_FUNC_ALLOCA])dnl
! AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
! AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
! AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy
wmempcpy])
! AC_CHECK_HEADERS_ONCE([wctype.h])
! AC_LIBOBJ([fnmatch])
! FNMATCH_H=fnmatch.h
! ])# _AC_LIBOBJ_FNMATCH
!
!
AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
[
FNMATCH_H=
! _AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_posix],
! [rm -f "$gl_source_base/fnmatch.h"],
! [_AC_LIBOBJ_FNMATCH])
! if test "$ac_cv_func_fnmatch_posix" != yes; then
dnl We must choose a different name for our function, since on ELF systems
dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
dnl compiled into a shared library.
! AC_DEFINE([fnmatch], [posix_fnmatch],
[Define to a replacement function name for fnmatch().])
fi
AC_SUBST([FNMATCH_H])
])
!
AC_DEFUN([gl_FUNC_FNMATCH_GNU],
[
! dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
! AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
! FNMATCH_H=
! _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu],
! [rm -f "$gl_source_base/fnmatch.h"],
! [_AC_LIBOBJ_FNMATCH])
! if test "$ac_cv_func_fnmatch_gnu" != yes; then
! dnl We must choose a different name for our function, since on ELF systems
! dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
! dnl compiled into a shared library.
! AC_DEFINE([fnmatch], [gnu_fnmatch],
! [Define to a replacement function name for fnmatch().])
! fi
! AC_SUBST([FNMATCH_H])
])
--- 8,121 ----
# Autoconf defines AC_FUNC_FNMATCH, but that is obsolescent.
# New applications should use the macros below instead.
! # Request a POSIX compliant fnmatch function.
AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
[
+ m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
+
+ dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
+ dnl This is only needed if gl_fnmatch_required = GNU. It would be possible
+ dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting
+ dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file.
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
FNMATCH_H=
! gl_fnmatch_required_lowercase=`echo $gl_fnmatch_required | tr 'A-Z' 'a-z'`
! gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
! AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
! [$gl_fnmatch_cache_var],
! [dnl Some versions of Solaris, SCO, and the GNU C Library
! dnl have a broken or incompatible fnmatch.
! dnl So we run a test program. If we are cross-compiling, take no chance.
! dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this
! dnl test.
! if test $gl_fnmatch_required = GNU; then
! gl_fnmatch_gnu_start=
! gl_fnmatch_gnu_end=
! else
! gl_fnmatch_gnu_start='#if 0'
! gl_fnmatch_gnu_end='#endif'
! fi
! AC_RUN_IFELSE(
! [AC_LANG_PROGRAM(
! [[#include <fnmatch.h>
! static int
! y (char const *pattern, char const *string, int flags)
! {
! return fnmatch (pattern, string, flags) == 0;
! }
! static int
! n (char const *pattern, char const *string, int flags)
! {
! return fnmatch (pattern, string, flags) == FNM_NOMATCH;
! }
! ]],
! [[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
! char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
! static char const A_1[] = { 'A' - 1, 0 };
! static char const A01[] = { 'A' + 1, 0 };
! static char const a_1[] = { 'a' - 1, 0 };
! static char const a01[] = { 'a' + 1, 0 };
! static char const bs_1[] = { '\\\\' - 1, 0 };
! static char const bs01[] = { '\\\\' + 1, 0 };
! return
! !(n ("a*", "", 0)
! && y ("a*", "abc", 0)
! && n ("d*/*1", "d/s/1", FNM_PATHNAME)
! && y ("a\\\\bc", "abc", 0)
! && n ("a\\\\bc", "abc", FNM_NOESCAPE)
! && y ("*x", ".x", 0)
! && n ("*x", ".x", FNM_PERIOD)
! && y (Apat, "\\\\", 0) && y (Apat, "A", 0)
! && y (apat, "\\\\", 0) && y (apat, "a", 0)
! && n (Apat, A_1, 0) == ('A' < '\\\\')
! && n (apat, a_1, 0) == ('a' < '\\\\')
! && y (Apat, A01, 0) == ('A' < '\\\\')
! && y (apat, a01, 0) == ('a' < '\\\\')
! && y (Apat, bs_1, 0) == ('A' < '\\\\')
! && y (apat, bs_1, 0) == ('a' < '\\\\')
! && n (Apat, bs01, 0) == ('A' < '\\\\')
! && n (apat, bs01, 0) == ('a' < '\\\\')
! $gl_fnmatch_gnu_start
! && y ("xxXX", "xXxX", FNM_CASEFOLD)
! && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)
! && n ("d*/*1", "d/s/1", FNM_FILE_NAME)
! && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)
! && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)
! && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)
! $gl_fnmatch_gnu_end
! );
! ]])],
! [eval "$gl_fnmatch_cache_var=yes"],
! [eval "$gl_fnmatch_cache_var=no"],
! [eval "$gl_fnmatch_cache_var=\"guessing no\""])
! ])
! eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
! if test "$gl_fnmatch_result" = yes; then
! dnl Not strictly necessary. Only to avoid spurious leftover files if
people
! dnl don't do "make distclean".
! rm -f "$gl_source_base/fnmatch.h"
! else
! FNMATCH_H=fnmatch.h
! AC_LIBOBJ([fnmatch])
dnl We must choose a different name for our function, since on ELF systems
dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
dnl compiled into a shared library.
! AC_DEFINE([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
[Define to a replacement function name for fnmatch().])
+ dnl Prerequisites of lib/fnmatch.c.
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
+ AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr
wmemcpy wmempcpy])
+ AC_CHECK_HEADERS_ONCE([wctype.h])
fi
AC_SUBST([FNMATCH_H])
])
! # Request a POSIX compliant fnmatch function with GNU extensions.
AC_DEFUN([gl_FUNC_FNMATCH_GNU],
[
! m4_divert_text([INIT_PREPARE], [gl_fnmatch_required=GNU])
! AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
])
*** gnulib-tool.orig 2009-05-02 13:25:36.000000000 +0200
--- gnulib-tool 2009-05-02 13:25:19.000000000 +0200
***************
*** 3796,3805 ****
if test -z "$modules"; then
# All modules together.
# Except config-h, which breaks all modules which use HAVE_CONFIG_H.
- # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
# Except ftruncate, mountlist, which abort the configuration on mingw.
FIXME.
modules=`func_all_modules`
! modules=`for m in $modules; do case $m in config-h | fnmatch-posix |
ftruncate | mountlist) ;; *) echo $m;; esac; done`
fi
modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u`
--- 3796,3804 ----
if test -z "$modules"; then
# All modules together.
# Except config-h, which breaks all modules which use HAVE_CONFIG_H.
# Except ftruncate, mountlist, which abort the configuration on mingw.
FIXME.
modules=`func_all_modules`
! modules=`for m in $modules; do case $m in config-h | ftruncate |
mountlist) ;; *) echo $m;; esac; done`
fi
modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u`
***************
*** 4288,4295 ****
done
# Then, all modules all together.
# Except config-h, which breaks all modules which use HAVE_CONFIG_H.
! # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
! allmodules=`for m in $allmodules; do if test $m != config-h && test $m !=
fnmatch-posix; then echo $m; fi; done`
func_create_testdir "$megatestdir/ALL" "$allmodules"
func_append megasubdirs "ALL"
--- 4287,4293 ----
done
# Then, all modules all together.
# Except config-h, which breaks all modules which use HAVE_CONFIG_H.
! allmodules=`for m in $allmodules; do if test $m != config-h; then echo $m;
fi; done`
func_create_testdir "$megatestdir/ALL" "$allmodules"
func_append megasubdirs "ALL"
