diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-07-12 13:57:21 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-07-13 18:37:23 +0100 |
| commit | 71be4c87c8267369f40fbfab7523ab9847154c02 (patch) | |
| tree | 56aace36e9864b99936ac0838c5940d5d0cd91a6 /m4 | |
| parent | 1051177e3c202667889628fd73aee7c3b470f99d (diff) | |
| download | gnulib-71be4c87c8267369f40fbfab7523ab9847154c02.tar.gz | |
gettext: revert "update macros to version 0.19"
This reverts commit 9b9370ca, as it currently requires that
developers of any project that explicitly uses the gettext module
or implicitly uses it through the utimens-tests or
futimens-tests modules, use gettext >= 0.19.
However there are some stability and availablity issues with
that version at present.
We can reinstate this soon, when stability is addressed
and packages are more readily available.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/intl.m4 | 8 | ||||
| -rw-r--r-- | m4/po.m4 | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/m4/intl.m4 b/m4/intl.m4 index 1fd396c18d..0c394ecad1 100644 --- a/m4/intl.m4 +++ b/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 26 (gettext-0.19) +# intl.m4 serial 27 (gettext-0.18.3) 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,7 +42,6 @@ AC_DEFUN([AM_INTL_SUBDIR], 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 @@ -241,7 +240,8 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], 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-2.7 for %define api.pure. + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. 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 @@ changequote(<<,>>)dnl 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;; - 2.[7-9]* | [3-9].*) + 1.2[6-9]* | 1.[3-9][0-9]* | [2-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;; @@ -1,4 +1,4 @@ -# po.m4 serial 22 (gettext-0.19) +# po.m4 serial 23 (gettext-0.18.3) 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 @@ AC_DEFUN([AM_PO_SUBDIRS], 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.19]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. |