From: Bruno Haible <bruno@clisp.org>
Date: Sat, 11 Feb 2023 10:27:16 +0000 (+0100)
Subject: Fix libintl exports after build system changes in gettext-runtime/intl/ (regression... 
X-Git-Tag: v0.22~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5db07b6488545940ab13aae10c42571e9a2dc2a3;p=thirdparty%2Fgettext.git

Fix libintl exports after build system changes in gettext-runtime/intl/ (regression 2021-06-20).

On several platforms, rpl_free was exported.
On AIX 7, also rpl_newlocale, rpl_duplocale, rpl_freelocale.

* gettext-runtime/intl/configure.ac: Map more rpl_* symbols to _libintl_*.
---

diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index 7ce50c527..413e43d87 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-2016, 2018-2022 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2016, 2018-2023 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -218,6 +218,8 @@ AH_VERBATIM([0noexport], [
 #define rpl_asnprintf              _libintl_asnprintf
 /* Symbols defined by gnulib module 'float'.  */
 #define gl_LDBL_MAX                _libintl_LDBL_MAX
+/* Symbols defined by gnulib module 'free-posix'.  */
+#define rpl_free                   _libintl_free
 /* Symbols defined by gnulib module 'localename'.  */
 #define gl_locale_name_canonicalize      _nl_locale_name_canonicalize
 #define gl_locale_name_from_win32_LANGID _nl_locale_name_from_win32_LANGID
@@ -228,6 +230,9 @@ AH_VERBATIM([0noexport], [
 #define gl_locale_name_environ           _nl_locale_name_environ
 #define gl_locale_name_default           _nl_locale_name_default
 #define gl_locale_name                   _nl_locale_name
+#define rpl_newlocale                    _libintl_newlocale
+#define rpl_duplocale                    _libintl_duplocale
+#define rpl_freelocale                   _libintl_freelocale
 /* Symbols defined by gnulib module 'lock'.  */
 #define glthread_lock_init                            _libintl_lock_init
 #define glthread_lock_lock                            _libintl_lock_lock
@@ -310,6 +315,24 @@ if test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1;
   AC_DEFINE([twalk],            [_libintl_twalk],     [Hidden symbol.])
   AC_DEFINE([rpl_twalk],        [_libintl_twalk],     [Hidden symbol.])
 fi
+dnl Symbols defined by gnulib's stdio-read.c.
+dnl Actually not needed here, since the gnulib module 'nonblocking' is absent.
+if false; then
+  AC_DEFINE([rpl_fgetc],        [_libintl_fgetc],     [Hidden symbol.])
+  AC_DEFINE([rpl_fgets],        [_libintl_fgets],     [Hidden symbol.])
+  AC_DEFINE([rpl_fread],        [_libintl_fread],     [Hidden symbol.])
+  AC_DEFINE([rpl_fscanf],       [_libintl_fscanf],    [Hidden symbol.])
+fi
+dnl Symbols defined by gnulib's stdio-write.c.
+dnl Actually not needed here, since the gnulib modules 'nonblocking' and
+dnl 'sigpipe' are absent.
+if false; then
+  AC_DEFINE([rpl_fputc],        [_libintl_fputc],     [Hidden symbol.])
+  AC_DEFINE([rpl_fputs],        [_libintl_fputs],     [Hidden symbol.])
+  AC_DEFINE([rpl_fwrite],       [_libintl_fwrite],    [Hidden symbol.])
+  AC_DEFINE([rpl_fprintf],      [_libintl_fprintf],   [Hidden symbol.])
+  AC_DEFINE([rpl_vfprintf],     [_libintl_vfprintf],  [Hidden symbol.])
+fi
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([gnulib-lib/Makefile])