From: Bruno Haible Date: Sat, 23 Aug 2003 15:10:19 +0000 (+0000) Subject: Use the fnmatch module from gnulib. X-Git-Tag: v0.13~347 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10cdab87a9384cb514205325559970524bd05c29;p=thirdparty%2Fgettext.git Use the fnmatch module from gnulib. --- diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index 14b46ab57..a6b7d87eb 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,7 @@ +2003-08-23 Bruno Haible + + * fnmatch.m4: Replace with the version from gnulib. + 2002-12-24 Bruno Haible * setenv.m4 (gt_FUNC_SETENV): New macro. diff --git a/gettext-tools/m4/fnmatch.m4 b/gettext-tools/m4/fnmatch.m4 index edd6efee5..d281d9ef2 100644 --- a/gettext-tools/m4/fnmatch.m4 +++ b/gettext-tools/m4/fnmatch.m4 @@ -1,51 +1,126 @@ -# fnmatch.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -AC_PREREQ(2.52) - -dnl Determine whether the system has a working fnmatch() function. -AC_DEFUN([gt_FUNC_FNMATCH], +# Check for fnmatch. + +# This is a modified version of autoconf's AC_FUNC_FNMATCH. +# This file should be simplified after Autoconf 2.57 is required. + +# Copyright (C) 2000-2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# _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], + [# 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, Franc,ois Pinard, and Paul Eggert for this test. + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [ +# include +# include +# define y(a, b, c) (fnmatch (a, b, c) == 0) +# define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH) + ], + [exit + (!(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) + && 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=cross])]) +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_C_CONST])dnl +AC_REQUIRE([AC_FUNC_ALLOCA])dnl +AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl +AC_CHECK_DECLS([getenv]) +AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmempcpy]) +AC_CHECK_HEADERS([wchar.h wctype.h]) +AC_LIBOBJ([fnmatch]) +FNMATCH_H=fnmatch.h +AC_DEFINE(fnmatch, rpl_fnmatch, + [Define to rpl_fnmatch if the replacement function should be used.]) +])# _AC_LIBOBJ_FNMATCH + + +# Additional prerequisites of lib/fnmatch.c, not part of _AC_LIBOBJ_FNMATCH. +AC_DEFUN([gl_PREREQ_FNMATCH_EXTRA], [ - dnl Don't use AC_FUNC_FNMATCH. In autoconf-2.52 the test is buggy and - dnl excludes all non-GNU implementations. - dnl Some versions of Solaris or SCO have a broken fnmatch function. - dnl So we run a test program. If we are cross-compiling, take no chance. - dnl Thanks to John Oleynick and Franc,ois Pinard for this test. - AC_CACHE_CHECK([for working fnmatch function], gt_cv_func_fnmatch_works, [ - AC_TRY_RUN([ -# include -# include - int main () - { - exit (fnmatch ("a*", "abc", 0) != 0 - || fnmatch ("d*/*1", "d/s/1", FNM_PATHNAME) != FNM_NOMATCH); - } - ], - gt_cv_func_fnmatch_works=yes, gt_cv_func_fnmatch_works=no, - gt_cv_func_fnmatch_works=no dnl cross-compiling - ) - ]) - if test $gt_cv_func_fnmatch_works = yes; then - AC_DEFINE([HAVE_FNMATCH], 1, - [Define if you have and a working fnmatch() function.]) - fi + AC_REQUIRE([AC_HEADER_STDC]) + AC_CHECK_HEADERS_ONCE(string.h strings.h) +]) + - dnl Now some other actions, not part of AC_FUNC_FNMATCH. - if test $gt_cv_func_fnmatch_works = yes; then - rm -f lib/fnmatch.h - else - test -d lib || mkdir lib - echo '#include "pfnmatch.h"' > lib/fnmatch.h +AC_DEFUN([gl_FUNC_FNMATCH_POSIX], +[ + FNMATCH_H= + _AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_posix], + [rm -f lib/fnmatch.h], + [_AC_LIBOBJ_FNMATCH]) + if test $ac_cv_func_fnmatch_posix != yes; then + gl_PREREQ_FNMATCH_EXTRA 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() in - dnl libgettextlib.so. + 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().]) - AC_LIBOBJ(pfnmatch) fi + AC_SUBST([FNMATCH_H]) +]) + + +AC_DEFUN([gl_FUNC_FNMATCH_GNU], +[ + dnl Persuade glibc to declare FNM_CASEFOLD etc. + AC_REQUIRE([AC_GNU_SOURCE]) + + FNMATCH_H= + _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu], + [rm -f lib/fnmatch.h], + [_AC_LIBOBJ_FNMATCH]) + if test $ac_cv_func_fnmatch_gnu != yes; then + gl_PREREQ_FNMATCH_EXTRA + 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]) ])