From: Bruno Haible <bruno@clisp.org>
Date: Sun, 3 May 2020 11:18:55 +0000 (+0200)
Subject: Update after gnulib changed.
X-Git-Tag: v0.21~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3251d1ea0d7acce857ca318499746d7b3ae21d76;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gettext-runtime/m4/intl.m4 (gt_INTL_SUBDIR_CORE): Remove redundant argument to
gl_PROG_BISON.
* gettext-tools/configure.ac: Likewise.
---

diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 766fabe3a..4147309b9 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 42 (gettext-0.21)
+# intl.m4 serial 43 (gettext-0.21)
 dnl Copyright (C) 1995-2014, 2016-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -258,7 +258,7 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
   dnl files or have a broken "make" program, hence the plural.c rule will
   dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
   dnl present or too old.
-  gl_PROG_BISON([INTLBISON], [3.0], [1.* | 2.*])
+  gl_PROG_BISON([INTLBISON], [3.0])
 ])
 
 dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 3f65ae773..90e244393 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -161,7 +161,7 @@ AM_CONDITIONAL([USE_INSTALLED_CSHARP_DLL],
   [test "$gt_use_installed_csharp_dll" != no])
 
 dnl Check for bison and set YACC. (cldr-plural.y requires bison >= 3.0.)
-gl_PROG_BISON([TOOLS_BISON], [3.0], [1.* | 2.*])
+gl_PROG_BISON([TOOLS_BISON], [3.0])
 : ${YACC="${TOOLS_BISON} -o y.tab.c"}
 gl_BISON
 dnl This line internationalizes the bison generated parsers.