<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p><br>
</p>
From 7bf3195408bf2143210e787537a4ab302f5c509c Mon Sep 17 00:00:00
2001<br>
From: =?UTF-8?q?Ozancan=20Karata=C5=9F?= <ozanc27@icloud.com><br>
Date: Wed, 26 Oct 2016 21:42:59 +0300<br>
Subject: [PATCH 2/2] m4: update gettext<br>
<br>
---<br>
m4/gettext.m4 | 35 +++++++++++++++++++++++++----------<br>
1 file changed, 25 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/m4/gettext.m4 b/m4/gettext.m4<br>
index b522a37..eef5073 100644<br>
--- a/m4/gettext.m4<br>
+++ b/m4/gettext.m4<br>
@@ -1,16 +1,16 @@<br>
-# gettext.m4 serial 67 (gettext-0.19.6)<br>
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.<br>
+# gettext.m4 serial 68 (gettext-0.19.8)<br>
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.<br>
dnl This file is free software; the Free Software Foundation<br>
dnl gives unlimited permission to copy and/or distribute it,<br>
dnl with or without modifications, as long as this notice is
preserved.<br>
dnl<br>
-dnl This file can can be used in projects which are not available
under<br>
+dnl This file can be used in projects which are not available
under<br>
dnl the GNU General Public License or the GNU Library General
Public<br>
dnl License but which still want to provide support for the GNU
gettext<br>
dnl functionality.<br>
dnl Please note that the actual code of the GNU gettext library is
covered<br>
dnl by the GNU Library General Public License, and the rest of the
GNU<br>
-dnl gettext package package is covered by the GNU General Public
License.<br>
+dnl gettext package is covered by the GNU General Public License.<br>
dnl They are *not* in the public domain.<br>
<br>
dnl Authors:<br>
@@ -161,13 +161,18 @@ changequote([,])dnl<br>
[AC_LANG_PROGRAM(<br>
[[<br>
#include <libintl.h><br>
-$gt_revision_test_code<br>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION<br>
extern int _nl_msg_cat_cntr;<br>
extern int *_nl_domain_bindings;<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr +
*_nl_domain_bindings)<br>
+#else<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0<br>
+#endif<br>
+$gt_revision_test_code<br>
]],<br>
[[<br>
bindtextdomain ("", "");<br>
-return * gettext ("")$gt_expression_test_code +
_nl_msg_cat_cntr + *_nl_domain_bindings<br>
+return * gettext ("")$gt_expression_test_code +
__GNU_GETTEXT_SYMBOL_EXPRESSION<br>
]])],<br>
[eval "$gt_func_gnugettext_libc=yes"],<br>
[eval "$gt_func_gnugettext_libc=no"])])<br>
@@ -193,17 +198,22 @@ return * gettext
("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b<br>
[AC_LANG_PROGRAM(<br>
[[<br>
#include <libintl.h><br>
-$gt_revision_test_code<br>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION<br>
extern int _nl_msg_cat_cntr;<br>
extern<br>
#ifdef __cplusplus<br>
"C"<br>
#endif<br>
const char *_nl_expand_alias (const char *);<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr +
*_nl_expand_alias (""))<br>
+#else<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0<br>
+#endif<br>
+$gt_revision_test_code<br>
]],<br>
[[<br>
bindtextdomain ("", "");<br>
-return * gettext ("")$gt_expression_test_code +
_nl_msg_cat_cntr + *_nl_expand_alias ("")<br>
+return * gettext ("")$gt_expression_test_code +
__GNU_GETTEXT_SYMBOL_EXPRESSION<br>
]])],<br>
[eval "$gt_func_gnugettext_libintl=yes"],<br>
[eval "$gt_func_gnugettext_libintl=no"])<br>
@@ -214,17 +224,22 @@ return * gettext
("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_expand_a<br>
[AC_LANG_PROGRAM(<br>
[[<br>
#include <libintl.h><br>
-$gt_revision_test_code<br>
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION<br>
extern int _nl_msg_cat_cntr;<br>
extern<br>
#ifdef __cplusplus<br>
"C"<br>
#endif<br>
const char *_nl_expand_alias (const char *);<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr +
*_nl_expand_alias (""))<br>
+#else<br>
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0<br>
+#endif<br>
+$gt_revision_test_code<br>
]],<br>
[[<br>
bindtextdomain ("", "");<br>
-return * gettext ("")$gt_expression_test_code +
_nl_msg_cat_cntr + *_nl_expand_alias ("")<br>
+return * gettext ("")$gt_expression_test_code +
__GNU_GETTEXT_SYMBOL_EXPRESSION<br>
]])],<br>
[LIBINTL="$LIBINTL $LIBICONV"<br>
LTLIBINTL="$LTLIBINTL $LTLIBICONV"<br>
-- <br>
2.10.1.windows.1<br>
<br>
</libintl.h></libintl.h></libintl.h></ozanc27@icloud.com>
</body>
</html>