summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-06-02 12:42:28 -0600
committerBrian Paul <[email protected]>2011-06-10 13:07:03 -0600
commit5ec931eb7de639682abc992be56d533997c656e0 (patch)
tree23ca1e50688846a63814bd9fb45352742f4d9e97 /configs
parent9c7e1b054da5df93643156ab26dd313836a43752 (diff)
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. (cherry picked from commit de1df26b5c11a45f2b1ff2ddc7b8ec764356aa94)
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in4
-rw-r--r--configs/default2
2 files changed, 6 insertions, 0 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 1538d9af9f4..1bebd2516e0 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -53,6 +53,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 2301a68113b..0e0450208eb 100644
--- a/configs/default
+++ b/configs/default
@@ -37,6 +37,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