Blame 0030-builder-Fail-if-bison-is-not-installed.patch
|
 |
d1287b2 |
From c52aab412ac2a4f3cf6578fee801ee4952e65ca8 Mon Sep 17 00:00:00 2001
|
|
|
d1287b2 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
d1287b2 |
Date: Tue, 5 Nov 2013 22:25:59 +0000
|
|
|
d1287b2 |
Subject: [PATCH] builder: Fail if bison is not installed.
|
|
|
d1287b2 |
|
|
|
d1287b2 |
This partially fixes commit a4800e2d4fc50f372a8b626333c4fbb9b8ca9633.
|
|
|
d1287b2 |
|
|
|
d1287b2 |
(cherry picked from commit f526fe1766471b51b92cad74af0103d1889db83a)
|
|
|
d1287b2 |
---
|
|
|
d1287b2 |
configure.ac | 7 ++++++-
|
|
|
d1287b2 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
d1287b2 |
|
|
|
d1287b2 |
diff --git a/configure.ac b/configure.ac
|
|
|
d1287b2 |
index 7a18b8e..2e99699 100644
|
|
|
d1287b2 |
--- a/configure.ac
|
|
|
d1287b2 |
+++ b/configure.ac
|
|
|
d1287b2 |
@@ -711,9 +711,14 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma],[
|
|
|
d1287b2 |
],
|
|
|
d1287b2 |
[AC_MSG_WARN([liblzma not found, virt-builder will be slower])])
|
|
|
d1287b2 |
|
|
|
d1287b2 |
-dnl (f)lex and bison are required for virt-builder.
|
|
|
d1287b2 |
+dnl (f)lex and bison for virt-builder (required).
|
|
|
d1287b2 |
+dnl XXX Could be optional with some work.
|
|
|
d1287b2 |
AC_PROG_LEX
|
|
|
d1287b2 |
AC_PROG_YACC
|
|
|
d1287b2 |
+dnl These macros don't fail, instead they set some useless defaults.
|
|
|
d1287b2 |
+if test "x$YACC" = "xyacc"; then
|
|
|
d1287b2 |
+ AC_MSG_FAILURE([GNU 'bison' is required (yacc won't work).])
|
|
|
d1287b2 |
+fi
|
|
|
d1287b2 |
|
|
|
d1287b2 |
dnl Check for QEMU for running binaries on this $host_cpu, fall
|
|
|
d1287b2 |
dnl back to basic 'qemu'. Allow the user to override it.
|
|
|
d1287b2 |
--
|
|
|
d1287b2 |
1.8.3.1
|
|
|
d1287b2 |
|