From: Bruno Haible Date: Thu, 7 Jan 2021 22:15:05 +0000 (+0100) Subject: Update after gnulib changed. X-Git-Tag: v0.22~273 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d8b1c460715adb9a3991f8772b313ddd3396862;p=thirdparty%2Fgettext.git Update after gnulib changed. * gettext-runtime/m4/intl.m4 (AM_INTL_SUBDIR): Test gt_localename_enhances_locale_funcs instead of gt_nameless_locales. Set ENHANCE_LOCALE_FUNCS, not HAVE_NAMELESS_LOCALES. * gettext-runtime/intl/Makefile.am (libgnuintl.h, libintl.h): Substitute ENHANCE_LOCALE_FUNCS, not HAVE_NAMELESS_LOCALES. * gettext-runtime/intl/libgnuintl.in.h: Test ENHANCE_LOCALE_FUNCS, not HAVE_NAMELESS_LOCALES. * gettext-runtime/intl/localename.c: Update from gnulib. * gettext-runtime/m4/iconv.m4: Likewise. --- diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am index ebd44dfb7..329c1410b 100644 --- a/gettext-runtime/intl/Makefile.am +++ b/gettext-runtime/intl/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the gettext-runtime/intl and gettext-tools/intl subdirectories ## of GNU gettext. -## Copyright (C) 1995-1998, 2000-2007, 2009-2020 Free Software Foundation, Inc. +## Copyright (C) 1995-1998, 2000-2007, 2009-2021 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as published by @@ -276,8 +276,8 @@ libgnuintl.h: $(srcdir)/libgnuintl.in.h $(srcdir)/export.h -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ - -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + -e 's,@''ENHANCE_LOCALE_FUNCS''@,@ENHANCE_LOCALE_FUNCS@,g' \ < $(srcdir)/libgnuintl.in.h \ | if test '@WOE32DLL@' = yes; then \ sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \ @@ -296,8 +296,8 @@ libintl.h: $(srcdir)/libgnuintl.in.h -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ - -e 's,@''HAVE_NAMELESS_LOCALES''@,@HAVE_NAMELESS_LOCALES@,g' \ -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ + -e 's,@''ENHANCE_LOCALE_FUNCS''@,@ENHANCE_LOCALE_FUNCS@,g' \ < $(srcdir)/libgnuintl.in.h > libintl.h MOSTLYCLEANFILES += libintl.h diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h index 6fb192061..7c6729197 100644 --- a/gettext-runtime/intl/libgnuintl.in.h +++ b/gettext-runtime/intl/libgnuintl.in.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000-2016, 2018-2020 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2016, 2018-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -459,7 +459,7 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); /* Support for retrieving the name of a locale_t object. */ -#if @HAVE_NAMELESS_LOCALES@ +#if @ENHANCE_LOCALE_FUNCS@ #ifndef GNULIB_defined_newlocale /* don't override gnulib */ #undef newlocale diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index 1bf47edbc..0e63da4d4 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -1,5 +1,5 @@ /* Determine name of the currently selected locale. - Copyright (C) 1995-2020 Free Software Foundation, Inc. + Copyright (C) 1995-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -38,12 +38,6 @@ #include "setlocale_null.h" #include "thread-optim.h" -/* We cannot support uselocale() on platforms where the locale_t type is fake. - See intl-thread-locale.m4 for details. */ -#if HAVE_WORKING_USELOCALE && !HAVE_FAKE_LOCALES -# define HAVE_GOOD_USELOCALE 1 -#endif - #if HAVE_GOOD_USELOCALE /* Mac OS X 10.5 defines the locale_t type in . */ # if defined __APPLE__ && defined __MACH__ @@ -2726,7 +2720,7 @@ struniq (const char *string) #endif -#if HAVE_GOOD_USELOCALE && HAVE_NAMELESS_LOCALES +#if LOCALENAME_ENHANCE_LOCALE_FUNCS /* The 'locale_t' object does not contain the names of the locale categories. We have to associate them with the object through a hash table. diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index 04e3bad44..d0e61de26 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 23 +# iconv.m4 serial 24 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -92,8 +92,9 @@ AC_DEFUN([AM_ICONV_LINK], #endif ]], [[int result = 0; - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4 index db798bbf2..42084c37d 100644 --- a/gettext-runtime/m4/intl.m4 +++ b/gettext-runtime/m4/intl.m4 @@ -1,5 +1,5 @@ -# intl.m4 serial 46 (gettext-0.21.1) -dnl Copyright (C) 1995-2014, 2016-2020 Free Software Foundation, Inc. +# intl.m4 serial 47 (gettext-0.21.1) +dnl Copyright (C) 1995-2014, 2016-2021 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. @@ -118,12 +118,12 @@ AC_DEFUN([AM_INTL_SUBDIR], AM_LANGINFO_CODESET gt_LC_MESSAGES - if test $gt_nameless_locales = yes; then - HAVE_NAMELESS_LOCALES=1 + if test $gt_localename_enhances_locale_funcs = yes; then + ENHANCE_LOCALE_FUNCS=1 else - HAVE_NAMELESS_LOCALES=0 + ENHANCE_LOCALE_FUNCS=0 fi - AC_SUBST([HAVE_NAMELESS_LOCALES]) + AC_SUBST([ENHANCE_LOCALE_FUNCS]) dnl Compilation on mingw and Cygwin needs special Makefile rules, because dnl 1. when we install a shared library, we must arrange to export