diff options
author | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:31:16 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:31:16 +0100 |
commit | c2c2b5a49b1ce37a42417037c3515864a808e53b (patch) | |
tree | 2fd5ace5f7ac7d306b53c7b81dd075241e8d43f4 /m4/glibc21.m4 | |
parent | a00c31bc46b639828d0decc33380c16d256f7986 (diff) |
Use Gnulib's `localcharset', with local patches.
This follows Bruno Haible's suggestion at
<http://lists.gnu.org/archive/html/guile-devel/2011-11/msg00055.html>.
* m4/gnulib-cache.m4: Add `gl_LOCAL_DIR'; use `localcharset'.
* Makefile.am (EXTRA_DIST): Add gnulib-local/lib/localcharset.[ch].diff.
(TESTS_ENVIRONMENT): New variable.
* gnulib-local/lib/localcharset.c.diff,
gnulib-local/lib/localcharset.h.diff: New files.
* test-suite/Makefile.am (TESTS_ENVIRONMENT): Add
@LOCALCHARSET_TESTS_ENVIRONMENT@.
* test-suite/standalone/Makefile.am (TESTS_ENVIRONMENT): Likewise.
Diffstat (limited to 'm4/glibc21.m4')
-rw-r--r-- | m4/glibc21.m4 | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 new file mode 100644 index 000000000..bc81c110b --- /dev/null +++ b/m4/glibc21.m4 @@ -0,0 +1,34 @@ +# glibc21.m4 serial 5 +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2011 Free Software Foundation, +dnl 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. + +# Test for the GNU C Library, version 2.1 or newer, or uClibc. +# From Bruno Haible. + +AC_DEFUN([gl_GLIBC21], + [ + AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc], + [ac_cv_gnu_library_2_1], + [AC_EGREP_CPP([Lucky], + [ +#include <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif +#ifdef __UCLIBC__ + Lucky user +#endif + ], + [ac_cv_gnu_library_2_1=yes], + [ac_cv_gnu_library_2_1=no]) + ] + ) + AC_SUBST([GLIBC21]) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) |