15c6926126
* 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.
201 lines
8.2 KiB
Text
201 lines
8.2 KiB
Text
# gnulib-common.m4 serial 20
|
|
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
# gl_COMMON
|
|
# is expanded unconditionally through gnulib-tool magic.
|
|
AC_DEFUN([gl_COMMON], [
|
|
dnl Use AC_REQUIRE here, so that the code is expanded once only.
|
|
AC_REQUIRE([gl_00GNULIB])
|
|
AC_REQUIRE([gl_COMMON_BODY])
|
|
])
|
|
AC_DEFUN([gl_COMMON_BODY], [
|
|
AH_VERBATIM([isoc99_inline],
|
|
[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
|
|
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
|
|
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
|
|
__APPLE__ && __MACH__ test for MacOS X.
|
|
__APPLE_CC__ tests for the Apple compiler and its version.
|
|
__STDC_VERSION__ tests for the C99 mode. */
|
|
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
|
|
# define __GNUC_STDC_INLINE__ 1
|
|
#endif])
|
|
AH_VERBATIM([unused_parameter],
|
|
[/* Define as a marker that can be attached to declarations that might not
|
|
be used. This helps to reduce warnings, such as from
|
|
GCC -Wunused-parameter. */
|
|
#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
|
|
# define _GL_UNUSED __attribute__ ((__unused__))
|
|
#else
|
|
# define _GL_UNUSED
|
|
#endif
|
|
/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
|
|
is a misnomer outside of parameter lists. */
|
|
#define _UNUSED_PARAMETER_ _GL_UNUSED
|
|
])
|
|
dnl Preparation for running test programs:
|
|
dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
|
|
dnl to /dev/tty, so they can be redirected to log files. Such diagnostics
|
|
dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
|
|
LIBC_FATAL_STDERR_=1
|
|
export LIBC_FATAL_STDERR_
|
|
])
|
|
|
|
# gl_MODULE_INDICATOR_CONDITION
|
|
# expands to a C preprocessor expression that evaluates to 1 or 0, depending
|
|
# whether a gnulib module that has been requested shall be considered present
|
|
# or not.
|
|
AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
|
|
|
|
# gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
|
|
# sets the shell variable that indicates the presence of the given module to
|
|
# a C preprocessor expression that will evaluate to 1.
|
|
AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
|
|
[
|
|
GNULIB_[]m4_translit([[$1]],
|
|
[abcdefghijklmnopqrstuvwxyz./-],
|
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
|
|
])
|
|
|
|
# gl_MODULE_INDICATOR([modulename])
|
|
# defines a C macro indicating the presence of the given module
|
|
# in a location where it can be used.
|
|
# | Value | Value |
|
|
# | in lib/ | in tests/ |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module present among main modules: | 1 | 1 |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module present among tests-related modules: | 0 | 1 |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module not present at all: | 0 | 0 |
|
|
# --------------------------------------------+---------+-----------+
|
|
AC_DEFUN([gl_MODULE_INDICATOR],
|
|
[
|
|
AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
|
|
[abcdefghijklmnopqrstuvwxyz./-],
|
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
|
|
[gl_MODULE_INDICATOR_CONDITION],
|
|
[Define to a C preprocessor expression that evaluates to 1 or 0,
|
|
depending whether the gnulib module $1 shall be considered present.])
|
|
])
|
|
|
|
# gl_MODULE_INDICATOR_FOR_TESTS([modulename])
|
|
# defines a C macro indicating the presence of the given module
|
|
# in lib or tests. This is useful to determine whether the module
|
|
# should be tested.
|
|
# | Value | Value |
|
|
# | in lib/ | in tests/ |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module present among main modules: | 1 | 1 |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module present among tests-related modules: | 1 | 1 |
|
|
# --------------------------------------------+---------+-----------+
|
|
# Module not present at all: | 0 | 0 |
|
|
# --------------------------------------------+---------+-----------+
|
|
AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
|
|
[
|
|
AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
|
|
[abcdefghijklmnopqrstuvwxyz./-],
|
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
|
|
[Define to 1 when the gnulib module $1 should be tested.])
|
|
])
|
|
|
|
# m4_foreach_w
|
|
# is a backport of autoconf-2.59c's m4_foreach_w.
|
|
# Remove this macro when we can assume autoconf >= 2.60.
|
|
m4_ifndef([m4_foreach_w],
|
|
[m4_define([m4_foreach_w],
|
|
[m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
|
|
|
|
# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
|
|
# ----------------------------------------------------
|
|
# Backport of autoconf-2.63b's macro.
|
|
# Remove this macro when we can assume autoconf >= 2.64.
|
|
m4_ifndef([AS_VAR_IF],
|
|
[m4_define([AS_VAR_IF],
|
|
[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
|
|
|
|
# AC_PROG_MKDIR_P
|
|
# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
|
|
# for interoperability with automake-1.9.6 from autoconf-2.62.
|
|
# Remove this macro when we can assume autoconf >= 2.62 or
|
|
# autoconf >= 2.60 && automake >= 1.10.
|
|
m4_ifdef([AC_PROG_MKDIR_P], [
|
|
dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
|
|
m4_define([AC_PROG_MKDIR_P],
|
|
m4_defn([AC_PROG_MKDIR_P])[
|
|
AC_SUBST([MKDIR_P])])], [
|
|
dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
|
|
AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
|
|
[AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
|
MKDIR_P='$(mkdir_p)'
|
|
AC_SUBST([MKDIR_P])])])
|
|
|
|
# AC_C_RESTRICT
|
|
# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
|
|
# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
|
|
# works.
|
|
# This definition can be removed once autoconf >= 2.62 can be assumed.
|
|
m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
|
|
AC_DEFUN([AC_C_RESTRICT],
|
|
[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
|
|
[ac_cv_c_restrict=no
|
|
# The order here caters to the fact that C++ does not require restrict.
|
|
for ac_kw in __restrict __restrict__ _Restrict restrict; do
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
|
[[typedef int * int_ptr;
|
|
int foo (int_ptr $ac_kw ip) {
|
|
return ip[0];
|
|
}]],
|
|
[[int s[1];
|
|
int * $ac_kw t = s;
|
|
t[0] = 0;
|
|
return foo(t)]])],
|
|
[ac_cv_c_restrict=$ac_kw])
|
|
test "$ac_cv_c_restrict" != no && break
|
|
done
|
|
])
|
|
AH_VERBATIM([restrict],
|
|
[/* Define to the equivalent of the C99 'restrict' keyword, or to
|
|
nothing if this is not supported. Do not define if restrict is
|
|
supported directly. */
|
|
#undef restrict
|
|
/* Work around a bug in Sun C++: it does not support _Restrict, even
|
|
though the corresponding Sun C compiler does, which causes
|
|
"#define restrict _Restrict" in the previous line. Perhaps some future
|
|
version of Sun C++ will work with _Restrict; if so, it'll probably
|
|
define __RESTRICT, just as Sun C does. */
|
|
#if defined __SUNPRO_CC && !defined __RESTRICT
|
|
# define _Restrict
|
|
#endif])
|
|
case $ac_cv_c_restrict in
|
|
restrict) ;;
|
|
no) AC_DEFINE([restrict], []) ;;
|
|
*) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
|
|
esac
|
|
])
|
|
])
|
|
|
|
# gl_BIGENDIAN
|
|
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
|
|
# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
|
|
# macros invoke AC_C_BIGENDIAN with arguments.
|
|
AC_DEFUN([gl_BIGENDIAN],
|
|
[
|
|
AC_C_BIGENDIAN
|
|
])
|
|
|
|
# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
|
|
# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
|
|
# output a spurious "(cached)" mark in the midst of other configure output.
|
|
# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
|
|
# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
|
|
AC_DEFUN([gl_CACHE_VAL_SILENT],
|
|
[
|
|
saved_as_echo_n="$as_echo_n"
|
|
as_echo_n=':'
|
|
AC_CACHE_VAL([$1], [$2])
|
|
as_echo_n="$saved_as_echo_n"
|
|
])
|