diff options
| author | Brian Paul <brianp@vmware.com> | 2011-05-18 07:50:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-05-18 07:51:33 -0600 |
| commit | de1df26b5c11a45f2b1ff2ddc7b8ec764356aa94 (patch) | |
| tree | 3ad505018f3628b917cd45998c5edf966640d15c /configs | |
| parent | 3e0bb02358d627e784a2b7041d6e2e23e3dfd2c5 (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.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 4 | ||||
| -rw-r--r-- | configs/default | 2 |
2 files changed, 6 insertions, 0 deletions
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 |