From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Feb 2021 10:50:26 +0000 (+0000)
Subject: configure: Fix raw bison and call it directly
X-Git-Tag: 0.9.28~1285^2~720
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee8ae80379904f7208277453c44af4f19f9d5f7;p=pakfire.git

configure: Fix raw bison and call it directly

The old YACC macro has some issues with using modern bison features and
always enables compatibility mode with yacc.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 9a602bbea..508829969 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@ scriptsdir = $(prefix)/lib/$(PACKAGE_NAME)
 
 TEST_ROOTFS = $(abs_top_builddir)/tests/.root
 
+BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -62,8 +63,6 @@ AM_LDFLAGS = $(OUR_LDFLAGS) \
 	-Wl,--gc-sections \
 	-Wl,--as-needed
 
-AM_YFLAGS = -d
-
 PAKFIRE_CPPFLAGS = -I$(top_srcdir)/src/libpakfire/include
 PAKFIRE_LIBS     = libpakfire.la
 
@@ -256,6 +255,14 @@ libpakfire_parser_la_CPPFLAGS = \
 
 src/libpakfire/parser/scanner.c: src/libpakfire/parser/grammar.h
 
+src/libpakfire/parser/grammar.h: src/libpakfire/parser/grammar.c
+
+src/libpakfire/parser/grammar.c: src/libpakfire/parser/grammar.y Makefile
+	$(AM_V_GEN) $(BISON) -Wall -t -d -o $@ $<
+
+BUILT_SOURCES += \
+	src/libpakfire/parser/grammar.h
+
 lib_LTLIBRARIES += \
 	libpakfire.la
 
diff --git a/configure.ac b/configure.ac
index 3f1ed8a87..b28ebf03a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,8 +108,8 @@ CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
 AC_SUBST([OUR_LDFLAGS], $with_ldflags)
 
 # Bison
-AC_PATH_PROG(YACC, bison)
-AC_SUBST(YACC)
+AC_PROG_YACC
+AC_PATH_PROG([BISON],[bison])
 
 # Flex
 AM_PROG_LEX