From de1df26b5c11a45f2b1ff2ddc7b8ec764356aa94 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 18 May 2011 07:50:21 -0600
Subject: mesa: check that flex/bison are installed

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651

NOTE: This is a candidate for the 7.10 branch.
---
 configs/autoconf.in | 4 ++++
 configs/default     | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'configs')

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 4e931a3a9c..a484bcff99 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -58,6 +58,10 @@ INSTALL = @INSTALL@
 PYTHON2 = @PYTHON2@
 PYTHON_FLAGS = -t -O -O
 
+# Flex and Bison for GLSL compiler
+FLEX = @FLEX@
+BISON = @BISON@
+
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
diff --git a/configs/default b/configs/default
index 0582a0210a..b7acfd2f1a 100644
--- a/configs/default
+++ b/configs/default
@@ -38,6 +38,8 @@ MKLIB_OPTIONS =
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
+FLEX = flex
+BISON = bison
 
 # Use MINSTALL for installing libraries, INSTALL for everything else
 MINSTALL = $(SHELL) $(TOP)/bin/minstall
-- 
cgit v1.2.3