Author: cazfi
Date: Mon Apr 20 18:17:15 2015
New Revision: 28825
URL: http://svn.gna.org/viewcvs/freeciv?rev=28825&view=rev
Log:
Updated bootstrap files originating from gettext to ones from gettext-0.19.4
See patch #6016
Modified:
branches/S2_6/m4/iconv.m4
branches/S2_6/m4/po.m4
branches/S2_6/translations/freeciv/Makevars
branches/S2_6/translations/nations/Makevars
branches/S2_6/translations/ruledit/Makevars
Modified: branches/S2_6/m4/iconv.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/iconv.m4?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- branches/S2_6/m4/iconv.m4 (original)
+++ branches/S2_6/m4/iconv.m4 Mon Apr 20 18:17:15 2015
@@ -1,4 +1,4 @@
-# iconv.m4 serial 18 (gettext-0.18.2)
+# iconv.m4 serial 19 (gettext-0.18.2)
dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -72,27 +72,33 @@
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <iconv.h>
#include <string.h>
-int main ()
-{
- int result = 0;
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+ ]],
+ [[int result = 0;
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
returns. */
{
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
if (cd_utf8_to_88591 != (iconv_t)(-1))
{
- static const char input[] = "\342\202\254"; /* EURO SIGN */
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
size_t inbytesleft = strlen (input);
char *outptr = buf;
size_t outbytesleft = sizeof (buf);
size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
result |= 1;
@@ -105,14 +111,14 @@
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
if (cd_ascii_to_88591 != (iconv_t)(-1))
{
- static const char input[] = "\263";
+ static ICONV_CONST char input[] = "\263";
char buf[10];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
size_t inbytesleft = strlen (input);
char *outptr = buf;
size_t outbytesleft = sizeof (buf);
size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
result |= 2;
@@ -124,14 +130,14 @@
iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
if (cd_88591_to_utf8 != (iconv_t)(-1))
{
- static const char input[] = "\304";
+ static ICONV_CONST char input[] = "\304";
static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
size_t inbytesleft = 1;
char *outptr = buf;
size_t outbytesleft = 1;
size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
result |= 4;
@@ -144,14 +150,14 @@
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
if (cd_88591_to_utf8 != (iconv_t)(-1))
{
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne
Augenma\337";
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen
ohne Augenma\337";
char buf[50];
- const char *inptr = input;
+ ICONV_CONST char *inptr = input;
size_t inbytesleft = strlen (input);
char *outptr = buf;
size_t outbytesleft = sizeof (buf);
size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
+ &inptr, &inbytesleft,
&outptr, &outbytesleft);
if ((int)res > 0)
result |= 8;
@@ -171,17 +177,14 @@
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
result |= 16;
return result;
-}]])],
- [am_cv_func_iconv_works=yes],
- [am_cv_func_iconv_works=no],
- [
-changequote(,)dnl
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-changequote([,])dnl
- ])
+]])],
+ [am_cv_func_iconv_works=yes], ,
+ [case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac])
+ test "$am_cv_func_iconv_works" = no || break
+ done
LIBS="$am_save_LIBS"
])
case "$am_cv_func_iconv_works" in
Modified: branches/S2_6/m4/po.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/po.m4?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- branches/S2_6/m4/po.m4 (original)
+++ branches/S2_6/m4/po.m4 Mon Apr 20 18:17:15 2015
@@ -1,4 +1,4 @@
-# po.m4 serial 22 (gettext-0.19)
+# po.m4 serial 24 (gettext-0.19)
dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
Modified: branches/S2_6/translations/freeciv/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/Makevars?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- branches/S2_6/translations/freeciv/Makevars (original)
+++ branches/S2_6/translations/freeciv/Makevars Mon Apr 20 18:17:15 2015
@@ -11,7 +11,11 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --flag=error:3:c-format --flag=error_at_line:5:c-format
+ --flag=error:3:c-format --flag=error_at_line:5:c-format \
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format \
+ --flag=xasprintf:1:c-format --flag=error_logger:1:c-format \
+ --flag=po_error:3:c-format --flag=po_error_at_line:5:c-format \
+ --flag=po_gram_error:1:c-format --flag=po_gram_error_at_line:2:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/nations/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/Makevars?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- branches/S2_6/translations/nations/Makevars (original)
+++ branches/S2_6/translations/nations/Makevars Mon Apr 20 18:17:15 2015
@@ -11,7 +11,11 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
- --flag=error:3:c-format --flag=error_at_line:5:c-format
+ --flag=error:3:c-format --flag=error_at_line:5:c-format \
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format \
+ --flag=xasprintf:1:c-format --flag=error_logger:1:c-format \
+ --flag=po_error:3:c-format --flag=po_error_at_line:5:c-format \
+ --flag=po_gram_error:1:c-format --flag=po_gram_error_at_line:2:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/ruledit/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/Makevars?rev=28825&r1=28824&r2=28825&view=diff
==============================================================================
--- branches/S2_6/translations/ruledit/Makevars (original)
+++ branches/S2_6/translations/ruledit/Makevars Mon Apr 20 18:17:15 2015
@@ -11,8 +11,12 @@
XGETTEXT_OPTIONS = \
--keyword=_ --flag=_:1:pass-c-format \
--keyword=N_ --flag=N_:1:pass-c-format \
+ --flag=error:3:c-format --flag=error_at_line:5:c-format \
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format \
+ --flag=xasprintf:1:c-format --flag=error_logger:1:c-format \
+ --flag=po_error:3:c-format --flag=po_error_at_line:5:c-format \
+ --flag=po_gram_error:1:c-format --flag=po_gram_error_at_line:2:c-format \
--keyword=R__ --keyword=RQ_ \
- --flag=error:3:c-format --flag=error_at_line:5:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
