changeset 17703:ba9e9026f860

gettext: update macros to version 0.19 * m4/intl.m4, m4/po.m4: Update from gettext-0.19. In particular, depend on gl_EXTERN_INLINE and drop support for older Bison versions.
author Daiki Ueno <ueno@gnu.org>
date Wed, 11 Jun 2014 08:31:07 -0700
parents 77be5ed9d74f
children 208ef1a25d09
files ChangeLog m4/intl.m4 m4/po.m4
diffstat 3 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 10 23:31:39 2014 +0100
+++ b/ChangeLog	Wed Jun 11 08:31:07 2014 -0700
@@ -1,3 +1,10 @@
+2014-06-11  Daiki Ueno  <ueno@gnu.org>
+
+	gettext: update macros to version 0.19
+	* m4/intl.m4, m4/po.m4: Update from gettext-0.19.  In particular,
+	depend on gl_EXTERN_INLINE and drop support for older Bison
+	versions.
+
 2014-06-10  Pádraig Brady  <P@draigBrady.com>
 
 	select,poll: fix console handle check on windows 8
--- a/m4/intl.m4	Tue Jun 10 23:31:39 2014 +0100
+++ b/m4/intl.m4	Wed Jun 11 08:31:07 2014 -0700
@@ -1,4 +1,4 @@
-# intl.m4 serial 24 (gettext-0.18.3)
+# intl.m4 serial 26 (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,
@@ -42,6 +42,7 @@
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
   AC_REQUIRE([gt_INTL_MACOSX])dnl
+  AC_REQUIRE([gl_EXTERN_INLINE])dnl
 
   dnl Support for automake's --enable-silent-rules.
   case "$enable_silent_rules" in
@@ -240,8 +241,7 @@
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
+  dnl bison-2.7 for %define api.pure.
   dnl bison is only needed for the maintainer (who touches plural.y). But in
   dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
   dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -258,7 +258,7 @@
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+      2.[7-9]* | [3-9].*)
 changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
--- a/m4/po.m4	Tue Jun 10 23:31:39 2014 +0100
+++ b/m4/po.m4	Wed Jun 11 08:31:07 2014 -0700
@@ -1,4 +1,4 @@
-# po.m4 serial 21 (gettext-0.18.3)
+# po.m4 serial 22 (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,
@@ -30,7 +30,7 @@
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.