Fix build with new Bison versions.

New Bison needs additional options to work.  Pull in dxcommon updates to
get relevant configure tests and adapt the build recipes accordingly.

diff --git a/Makefile.am b/Makefile.am
index da056d798a288fd75dadb52e5f928409e724fe69..ef816f2f239940e10a48829baeca91548bfce3ab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2011-2013,2019-2020 Nick Bowler
+# Copyright © 2011-2013, 2019-2021 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 # For Gnulib
 MOSTLYCLEANFILES =
-noinst_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
        -I$(top_builddir)/lib -I$(top_srcdir)/lib \
@@ -164,7 +164,7 @@ FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 
 .y.stamp:
        $(AM_V_at) touch $@.tmp
-       $(BISON_V) $(BISON) -o $*.c --defines=$*.h.tmp $(BISONFLAGS) $<
+       $(BISON_V) $(BISON) $(BISON_COMPAT) -o $*.c --defines=$*.h.tmp $(BISONFLAGS) $<
        $(AM_V_at) if cmp $*.h.tmp $*.h >/dev/null 2>&1; then \
                rm -f $*.h.tmp; \
        else \

diff --git a/common b/common
index 92a89700c65e52fac8c2cace51a7112d60b3f42f..8dc6be89e724f1255b5332f0dac012b304377645 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 92a89700c65e52fac8c2cace51a7112d60b3f42f
+Subproject commit 8dc6be89e724f1255b5332f0dac012b304377645

diff --git a/configure.ac b/configure.ac
index fa00e02bdd36d98f300bf866aed4d1a52a5752ff..a0bf6b12831ab175e4686a36fc53ab09320c994a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2011-2013, 2020 Nick Bowler
+dnl Copyright © 2011-2013, 2020-2021 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
@@ -48,15 +48,18 @@ m4_traceoff([AM_GNU_GETTEXT])
 AM_GNU_GETTEXT([external])
 DX_LINGUAS
 
-AC_ARG_VAR([FLEX], [Command to invoke flex.  Defaults to flex.])
-AC_ARG_VAR([FLEXFLAGS], [Additional options to pass to flex.])
-AC_CHECK_PROGS([FLEX], [flex], [flex])
-
-AC_ARG_VAR([BISON], [Command to invoke GNU Bison.  Defaults to bison.])
-AC_ARG_VAR([BISONFLAGS], [Additional options to pass to Bison.])
-AC_CHECK_PROGS([BISON], [bison], [bison])
+DX_PROG_FLEX([], [], [FLEX=false])
+DX_PROG_BISON([], [], [BISON=false])
+DX_BISON_COMPAT
 BISON_I18N
 
+BISON_COMPAT=
+AS_IF([test x"$dx_cv_bison_api_header_include" = x"yes"],
+  [BISON_COMPAT="'--define=api.header.include={\"\$(*F).h\"}'"])
+AS_IF([test x"$dx_cv_bison_warn_no_deprecated" = x"yes"],
+  [AS_VAR_APPEND([BISON_COMPAT], ["${BISON_COMPAT:+ }-Wno-deprecated"])])
+AC_SUBST([BISON_COMPAT])
+
 AH_TOP([#include <conf_pre.h>])
 AH_BOTTOM([#include <conf_post.h>])