vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use gnulib-tool to create gnulib source files.

Browse source 
* Add gnulib files generated by gnulib-tool in build-aux, m4 and
    grub-core/gnulib directories
    * .bzignore: Add **/.deps and autogenerated gnulib files
    * configure.ac: Assign auxiliary directory to build-aux, add invocation
    of gnulib macros, add grub-core/gnulib/Makefile
    * Makefile.am: Add gnulib directory in SUBDIRS (removing unnecessary .),
    include m4 directory to aclocal.
    * Makefile.util.def: Remove direct compilation of gnulib source files
    and use the new grub-core/gnulib/libgnu.a.
    * build-aux/config.rpath: move config.rpath from top directory to
    build-aux
    * conf/Makefile.common: Remove the macro _GL_UNUSED already defined
    in gnulib headers
    * conf/Makefile.extra-dist: Add m4/gnulib-cache.m4
    * grub-core/Makefile.core.def: Remove unnecessary extra_dist
    * grub-core/lib/posix_wrap/localcharset.h (locale_charset): Update
    header.
    * grub-core/lib/posix_wrap/langinfo.h (nl_langinfo): Return static
    string.
This commit is contained in:
Yves Blusseau 2010-09-20 12:35:33 +02:00
parent e511c9f591
commit 15c6926126
164 changed files with 28462 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

121
m4/fnmatch.m4 Normal file
View file

@ -0,0 +1,121 @@
# Check for fnmatch - serial 4.
# Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# 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_UNQUOTED([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])
])