configure: Drop custom bison make rules

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

diff --git a/Makefile.am b/Makefile.am
index d7e80883214c8226e7d1cd940eaca678a2145885..6c12e603cf7bf8647287aac7cdbb771093afa817 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,10 @@ AM_LDFLAGS = $(OUR_LDFLAGS) \
        -Wl,--gc-sections \
        -Wl,--as-needed
 
+AM_YFLAGS = \
+       -d \
+       -Wno-yacc
+
 PAKFIRE_CPPFLAGS = -I$(top_srcdir)/src/libpakfire/include
 PAKFIRE_LIBS     = libpakfire.la
 
@@ -229,13 +233,6 @@ libpakfire_parser_la_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPAKFIRE_PRIVATE
 
-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
 

diff --git a/configure.ac b/configure.ac
index 6f32e90ca4172d12dd320077070f026aed2ba680..0a8b12bba1eccd8184afe9d1c6cd255fe253b1eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -109,11 +109,22 @@ AC_SUBST([OUR_LDFLAGS], $with_ldflags)
 
 # Bison
 AC_PROG_YACC
-AC_PATH_PROG([BISON],[bison])
+
+if test -z "${ac_cv_prog_YACC}"; then
+        echo "*** Error: No suitable bison/yacc found. ***"
+        echo "    Please install the 'bison' package."
+        exit 1
+fi
 
 # Flex
 AM_PROG_LEX
 
+if test -z "${ac_cv_prog_LEX}"; then
+        echo "*** Error: No suitable flex/lex found. ***"
+        echo "    Please install the 'flex' package."
+        exit 1
+fi
+
 # Python
 AM_PATH_PYTHON([3.6])