1
0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-17 12:41:05 +03:00

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.
This commit is contained in:
Daiki Ueno
2014-06-11 08:31:07 -07:00
committed by Paul Eggert
parent c6e14bbd5d
commit 9b9370caf6
3 changed files with 13 additions and 6 deletions

View File

@@ -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> 2014-06-10 Pádraig Brady <P@draigBrady.com>
select,poll: fix console handle check on windows 8 select,poll: fix console handle check on windows 8

View File

@@ -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 Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@@ -42,6 +42,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([gl_XSIZE])dnl AC_REQUIRE([gl_XSIZE])dnl
AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
AC_REQUIRE([gt_INTL_MACOSX])dnl AC_REQUIRE([gt_INTL_MACOSX])dnl
AC_REQUIRE([gl_EXTERN_INLINE])dnl
dnl Support for automake's --enable-silent-rules. dnl Support for automake's --enable-silent-rules.
case "$enable_silent_rules" in case "$enable_silent_rules" in
@@ -240,8 +241,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
dnl intl/plural.c is generated from intl/plural.y. It requires bison, 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 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 bison-2.7 for %define api.pure.
dnl compile.
dnl bison is only needed for the maintainer (who touches plural.y). But in 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 order to avoid separate Makefiles or --enable-maintainer-mode, we put
dnl the rule in general Makefile. Now, some people carelessly touch the dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -258,7 +258,7 @@ changequote(<<,>>)dnl
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; '') 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 changequote([,])dnl
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;

View File

@@ -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 Copyright (C) 1995-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
dnl Release version of the gettext macros. This is used to ensure that 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. 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 Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work. dnl because they are needed for "make dist" to work.