From: Bruno Haible <bruno@clisp.org>
Date: Fri, 1 May 2020 18:38:24 +0000 (+0200)
Subject: build: Simplify bison detection.
X-Git-Tag: v0.21~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de70fa53318d38918c83ad7310db0b90b69a32c3;p=thirdparty%2Fgettext.git

build: Simplify bison detection.

* autogen.sh (GNULIB_MODULES_RUNTIME_OTHER): Add bison.
* gettext-runtime/configure.ac: Don't invoke AC_PROG_YACC.
* gettext-runtime/m4/intl.m4 (gt_INTL_SUBDIR_CORE): Invoke gl_PROG_BISON.
---

diff --git a/autogen.sh b/autogen.sh
index 343a6e4bf..e1e01a535 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -94,6 +94,7 @@ if ! $skip_gnulib; then
   GNULIB_MODULES_RUNTIME_OTHER='
     gettext-runtime-misc
     ansi-c++-opt
+    bison
     csharpcomp-script
     java
     javacomp-script
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 48b4d5ce9..b2bfda5e1 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -31,7 +31,6 @@ test "$docdir" != '${datarootdir}/doc/${PACKAGE_TARNAME}' || docdir='${datarootd
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_YACC
 
 gt_JAVA_CHOICE
 
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 0b382b71a..0cc0e3234 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 40 (gettext-0.20.2)
+# intl.m4 serial 41 (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,26 +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.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-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;;
-      1.* | 2.[0-6] | 2.[0-6].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
+  gl_PROG_BISON([INTLBISON], [2.7], [1.* | 2.[0-6] | 2.[0-6].*])
 ])
 
 dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from