Commit 9d348109 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Update gettext to 0.18.2

This supersedes commit 53c90158.
parent 3ed51c5e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the # Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable. # run time search path of shared libraries in an executable.
# #
# Copyright 1996-2010 Free Software Foundation, Inc. # Copyright 1996-2013 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001 # Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# #
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# known workaround is to choose shorter directory names for the build # known workaround is to choose shorter directory names for the build
# directory and/or the installation directory. # directory and/or the installation directory.
# All known linkers require a `.a' archive for static linking (except MSVC, # All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib'). # which needs '.lib').
libext=a libext=a
shrext=.so shrext=.so
...@@ -57,13 +57,6 @@ else ...@@ -57,13 +57,6 @@ else
aix*) aix*)
wl='-Wl,' wl='-Wl,'
;; ;;
darwin*)
case $cc_basename in
xlc*)
wl='-Wl,'
;;
esac
;;
mingw* | cygwin* | pw32* | os2* | cegcc*) mingw* | cygwin* | pw32* | os2* | cegcc*)
;; ;;
hpux9* | hpux10* | hpux11*) hpux9* | hpux10* | hpux11*)
...@@ -72,9 +65,7 @@ else ...@@ -72,9 +65,7 @@ else
irix5* | irix6* | nonstopux*) irix5* | irix6* | nonstopux*)
wl='-Wl,' wl='-Wl,'
;; ;;
newsos6) linux* | k*bsd*-gnu | kopensolaris*-gnu)
;;
linux* | k*bsd*-gnu)
case $cc_basename in case $cc_basename in
ecc*) ecc*)
wl='-Wl,' wl='-Wl,'
...@@ -85,17 +76,26 @@ else ...@@ -85,17 +76,26 @@ else
lf95*) lf95*)
wl='-Wl,' wl='-Wl,'
;; ;;
pgcc | pgf77 | pgf90) nagfor*)
wl='-Wl,-Wl,,'
;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
wl='-Wl,' wl='-Wl,'
;; ;;
ccc*) ccc*)
wl='-Wl,' wl='-Wl,'
;; ;;
xl* | bgxl* | bgf* | mpixl*)
wl='-Wl,'
;;
como) como)
wl='-lopt=' wl='-lopt='
;; ;;
*) *)
case `$CC -V 2>&1 | sed 5q` in case `$CC -V 2>&1 | sed 5q` in
*Sun\ F* | *Sun*Fortran*)
wl=
;;
*Sun\ C*) *Sun\ C*)
wl='-Wl,' wl='-Wl,'
;; ;;
...@@ -103,13 +103,24 @@ else ...@@ -103,13 +103,24 @@ else
;; ;;
esac esac
;; ;;
newsos6)
;;
*nto* | *qnx*)
;;
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)
wl='-Wl,' wl='-Wl,'
;; ;;
rdos*) rdos*)
;; ;;
solaris*) solaris*)
wl='-Wl,' case $cc_basename in
f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
wl='-Qoption ld '
;;
*)
wl='-Wl,'
;;
esac
;; ;;
sunos4*) sunos4*)
wl='-Qoption ld ' wl='-Qoption ld '
...@@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then ...@@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then
fi fi
;; ;;
amigaos*) amigaos*)
hardcode_libdir_flag_spec='-L$libdir' case "$host_cpu" in
hardcode_minus_L=yes powerpc)
# Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports ;;
# that the semantics of dynamic libraries on AmigaOS, at least up m68k)
# to version 4, is to share data among multiple programs linked hardcode_libdir_flag_spec='-L$libdir'
# with the same dynamic library. Since this doesn't match the hardcode_minus_L=yes
# behavior of shared libraries on other platforms, we cannot use ;;
# them. esac
ld_shlibs=no
;; ;;
beos*) beos*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
...@@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then ...@@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then
ld_shlibs=no ld_shlibs=no
fi fi
;; ;;
haiku*)
;;
interix[3-9]*) interix[3-9]*)
hardcode_direct=no hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir' hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;; ;;
gnu* | linux* | k*bsd*-gnu) gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
: :
else else
...@@ -325,10 +337,14 @@ else ...@@ -325,10 +337,14 @@ else
fi fi
;; ;;
amigaos*) amigaos*)
hardcode_libdir_flag_spec='-L$libdir' case "$host_cpu" in
hardcode_minus_L=yes powerpc)
# see comment about different semantics on the GNU ld section ;;
ld_shlibs=no m68k)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
;;
esac
;; ;;
bsdi[45]*) bsdi[45]*)
;; ;;
...@@ -342,24 +358,15 @@ else ...@@ -342,24 +358,15 @@ else
;; ;;
darwin* | rhapsody*) darwin* | rhapsody*)
hardcode_direct=no hardcode_direct=no
if test "$GCC" = yes ; then if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
: :
else else
case $cc_basename in ld_shlibs=no
xlc*)
;;
*)
ld_shlibs=no
;;
esac
fi fi
;; ;;
dgux*) dgux*)
hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_flag_spec='-L$libdir'
;; ;;
freebsd1*)
ld_shlibs=no
;;
freebsd2.2*) freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes hardcode_direct=yes
...@@ -420,6 +427,8 @@ else ...@@ -420,6 +427,8 @@ else
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=: hardcode_libdir_separator=:
;; ;;
*nto* | *qnx*)
;;
openbsd*) openbsd*)
if test -f /usr/libexec/ld.so; then if test -f /usr/libexec/ld.so; then
hardcode_direct=yes hardcode_direct=yes
...@@ -515,7 +524,12 @@ case "$host_os" in ...@@ -515,7 +524,12 @@ case "$host_os" in
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
amigaos*) amigaos*)
library_names_spec='$libname.a' case "$host_cpu" in
powerpc*)
library_names_spec='$libname$shrext' ;;
m68k)
library_names_spec='$libname.a' ;;
esac
;; ;;
beos*) beos*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
...@@ -534,8 +548,6 @@ case "$host_os" in ...@@ -534,8 +548,6 @@ case "$host_os" in
dgux*) dgux*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
freebsd1*)
;;
freebsd* | dragonfly*) freebsd* | dragonfly*)
case "$host_os" in case "$host_os" in
freebsd[123]*) freebsd[123]*)
...@@ -547,6 +559,9 @@ case "$host_os" in ...@@ -547,6 +559,9 @@ case "$host_os" in
gnu*) gnu*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
haiku*)
library_names_spec='$libname$shrext'
;;
hpux9* | hpux10* | hpux11*) hpux9* | hpux10* | hpux11*)
case $host_cpu in case $host_cpu in
ia64*) ia64*)
...@@ -582,7 +597,7 @@ case "$host_os" in ...@@ -582,7 +597,7 @@ case "$host_os" in
;; ;;
linux*oldld* | linux*aout* | linux*coff*) linux*oldld* | linux*aout* | linux*coff*)
;; ;;
linux* | k*bsd*-gnu) linux* | k*bsd*-gnu | kopensolaris*-gnu)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
knetbsd*-gnu) knetbsd*-gnu)
...@@ -594,7 +609,7 @@ case "$host_os" in ...@@ -594,7 +609,7 @@ case "$host_os" in
newsos6) newsos6)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
nto-qnx*) *nto* | *qnx*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
openbsd*) openbsd*)
...@@ -625,6 +640,9 @@ case "$host_os" in ...@@ -625,6 +640,9 @@ case "$host_os" in
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
tpf*)
library_names_spec='$libname$shrext'
;;
uts4*) uts4*)
library_names_spec='$libname$shrext' library_names_spec='$libname$shrext'
;; ;;
......
...@@ -413,7 +413,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ ...@@ -413,7 +413,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
dnl dnl
dnl Gettext stuff dnl Gettext stuff
dnl dnl
AM_GNU_GETTEXT_VERSION([0.18.1]) AM_GNU_GETTEXT_VERSION([0.18.2])
AM_GNU_GETTEXT([external], [need-ngettext]) AM_GNU_GETTEXT([external], [need-ngettext])
dnl dnl
......
# codeset.m4 serial 4 (gettext-0.18) # codeset.m4 serial 5 (gettext-0.18.2)
dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. dnl Copyright (C) 2000-2002, 2006, 2008-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -9,10 +9,12 @@ dnl From Bruno Haible. ...@@ -9,10 +9,12 @@ dnl From Bruno Haible.
AC_DEFUN([AM_LANGINFO_CODESET], AC_DEFUN([AM_LANGINFO_CODESET],
[ [
AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
[AC_TRY_LINK([#include <langinfo.h>], [AC_LINK_IFELSE(
[char* cs = nl_langinfo(CODESET); return !cs;], [AC_LANG_PROGRAM(
[am_cv_langinfo_codeset=yes], [[#include <langinfo.h>]],
[am_cv_langinfo_codeset=no]) [[char* cs = nl_langinfo(CODESET); return !cs;]])],
[am_cv_langinfo_codeset=yes],
[am_cv_langinfo_codeset=no])
]) ])
if test $am_cv_langinfo_codeset = yes; then if test $am_cv_langinfo_codeset = yes; then
AC_DEFINE([HAVE_LANGINFO_CODESET], [1], AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
......
# fcntl-o.m4 serial 1 # fcntl-o.m4 serial 4
dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -12,13 +12,26 @@ dnl Written by Paul Eggert. ...@@ -12,13 +12,26 @@ dnl Written by Paul Eggert.
AC_DEFUN([gl_FCNTL_O_FLAGS], AC_DEFUN([gl_FCNTL_O_FLAGS],
[ [
dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW. dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
dnl AC_GNU_SOURCE.
m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
[AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
[AC_REQUIRE([AC_GNU_SOURCE])])
AC_CHECK_HEADERS_ONCE([unistd.h])
AC_CHECK_FUNCS_ONCE([symlink])
AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
[AC_RUN_IFELSE( [AC_RUN_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[[#include <sys/types.h> [[#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #if HAVE_UNISTD_H
# include <unistd.h>
#else /* on Windows with MSVC */
# include <io.h>
# include <stdlib.h>
# defined sleep(n) _sleep ((n) * 1000)
#endif
#include <fcntl.h> #include <fcntl.h>
#ifndef O_NOATIME #ifndef O_NOATIME
#define O_NOATIME 0 #define O_NOATIME 0
...@@ -33,34 +46,74 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], ...@@ -33,34 +46,74 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
}; };
]], ]],
[[ [[
int status = !constants; int result = !constants;
#if HAVE_SYMLINK
{ {
static char const sym[] = "conftest.sym"; static char const sym[] = "conftest.sym";
if (symlink (".", sym) != 0 if (symlink ("/dev/null", sym) != 0)
|| close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0) result |= 2;
status |= 32; else
{
int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
if (fd >= 0)
{
close (fd);
result |= 4;
}
}
if (unlink (sym) != 0 || symlink (".", sym) != 0)
result |= 2;
else
{
int fd = open (sym, O_RDONLY | O_NOFOLLOW);
if (fd >= 0)
{
close (fd);
result |= 4;
}
}
unlink (sym); unlink (sym);
} }
#endif
{ {
static char const file[] = "confdefs.h"; static char const file[] = "confdefs.h";
int fd = open (file, O_RDONLY | O_NOATIME); int fd = open (file, O_RDONLY | O_NOATIME);
char c; if (fd < 0)
struct stat st0, st1; result |= 8;
if (fd < 0 else
|| fstat (fd, &st0) != 0 {
|| sleep (1) != 0 struct stat st0;
|| read (fd, &c, 1) != 1 if (fstat (fd, &st0) != 0)
|| close (fd) != 0 result |= 16;
|| stat (file, &st1) != 0 else
|| st0.st_atime != st1.st_atime) {
status |= 64; char c;
sleep (1);
if (read (fd, &c, 1) != 1)
result |= 24;
else
{
if (close (fd) != 0)
result |= 32;
else
{
struct stat st1;
if (stat (file, &st1) != 0)
result |= 40;
else
if (st0.st_atime != st1.st_atime)
result |= 64;
}
}
}
}
} }
return status;]])], return result;]])],
[gl_cv_header_working_fcntl_h=yes], [gl_cv_header_working_fcntl_h=yes],
[case $? in #( [case $? in #(
32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
*) gl_cv_header_working_fcntl_h='no';; *) gl_cv_header_working_fcntl_h='no';;
esac], esac],
[gl_cv_header_working_fcntl_h=cross-compiling])]) [gl_cv_header_working_fcntl_h=cross-compiling])])
......
# gettext.m4 serial 63 (gettext-0.18) # gettext.m4 serial 66 (gettext-0.18.2)
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is ...@@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is
dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl 'need-formatstring-macros', then GNU gettext implementations that don't
dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
dnl INTLDIR is used to find the intl libraries. If empty, dnl INTLDIR is used to find the intl libraries. If empty,
dnl the value `$(top_builddir)/intl/' is used. dnl the value '$(top_builddir)/intl/' is used.
dnl dnl
dnl The result of the configuration is one of three cases: dnl The result of the configuration is one of three cases:
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
...@@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], ...@@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
]) ])
dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
gt_INTL_MACOSX gt_INTL_MACOSX
dnl Set USE_NLS. dnl Set USE_NLS.
...@@ -157,12 +157,18 @@ changequote([,])dnl ...@@ -157,12 +157,18 @@ changequote([,])dnl
fi fi
AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
[AC_TRY_LINK([#include <libintl.h> [AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <libintl.h>
$gt_revision_test_code $gt_revision_test_code
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;], extern int *_nl_domain_bindings;
[bindtextdomain ("", ""); ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], [[
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
]])],
[eval "$gt_func_gnugettext_libc=yes"], [eval "$gt_func_gnugettext_libc=yes"],
[eval "$gt_func_gnugettext_libc=no"])]) [eval "$gt_func_gnugettext_libc=no"])])
...@@ -181,37 +187,49 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b ...@@ -181,37 +187,49 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
[gt_save_CPPFLAGS="$CPPFLAGS" [gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL" CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS" gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL $INTL_MACOSX_LIBS" LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv. dnl Now see whether libintl exists and does not depend on libiconv.
AC_TRY_LINK([#include <libintl.h> AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <libintl.h>
$gt_revision_test_code $gt_revision_test_code
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
const char *_nl_expand_alias (const char *);], const char *_nl_expand_alias (const char *);
[bindtextdomain ("", ""); ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [[
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
]])],
[eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=yes"],
[eval "$gt_func_gnugettext_libintl=no"]) [eval "$gt_func_gnugettext_libintl=no"])
dnl Now see whether libintl exists and depends on libiconv. dnl Now see whether libintl exists and depends on libiconv.
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV" LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h> AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <libintl.h>
$gt_revision_test_code $gt_revision_test_code
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
const char *_nl_expand_alias (const char *);], const char *_nl_expand_alias (const char *);
[bindtextdomain ("", ""); ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [[
[LIBINTL="$LIBINTL $LIBICONV" bindtextdomain ("", "");
LTLIBINTL="$LTLIBINTL $LTLIBICONV" return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
eval "$gt_func_gnugettext_libintl=yes" ]])],
]) [LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
eval "$gt_func_gnugettext_libintl=yes"
])
fi fi
CPPFLAGS="$gt_save_CPPFLAGS" CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"]) LIBS="$gt_save_LIBS"])
......
# glibc2.m4 serial 2 # glibc2.m4 serial 3
dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc. dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2013 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -15,7 +16,7 @@ AC_DEFUN([gt_GLIBC2], ...@@ -15,7 +16,7 @@ AC_DEFUN([gt_GLIBC2],
[ [
#include <features.h> #include <features.h>
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
#if (__GLIBC__ >= 2) #if (__GLIBC__ >= 2) && !defined __UCLIBC__
Lucky GNU user Lucky GNU user
#endif #endif
#endif #endif
......
# glibc21.m4 serial 4 # glibc21.m4 serial 5
dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc. dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2013 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
# Test for the GNU C Library, version 2.1 or newer. # Test for the GNU C Library, version 2.1 or newer, or uClibc.
# From Bruno Haible. # From Bruno Haible.
AC_DEFUN([gl_GLIBC21], AC_DEFUN([gl_GLIBC21],
[ [
AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
[ac_cv_gnu_library_2_1], [ac_cv_gnu_library_2_1],
[AC_EGREP_CPP([Lucky GNU user], [AC_EGREP_CPP([Lucky],
[ [
#include <features.h> #include <features.h>
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
Lucky GNU user Lucky GNU user
#endif #endif
#endif
#ifdef __UCLIBC__
Lucky user
#endif #endif
], ],
[ac_cv_gnu_library_2_1=yes], [ac_cv_gnu_library_2_1=yes],
......
# iconv.m4 serial 11 (gettext-0.18.1) # iconv.m4 serial 18 (gettext-0.18.2)
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
...@@ -30,27 +30,35 @@ AC_DEFUN([AM_ICONV_LINK], ...@@ -30,27 +30,35 @@ AC_DEFUN([AM_ICONV_LINK],
dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl Add $INCICONV to CPPFLAGS before performing the following checks,
dnl because if the user has installed libiconv and not disabled its use dnl because if the user has installed libiconv and not disabled its use