diff options
| author | Matt Turner <[email protected]> | 2012-01-13 14:31:39 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-30 21:09:32 -0500 |
| commit | dfb6142548df0dccbe6eed2c57986e208eb0d437 (patch) | |
| tree | 61d4d262dcc3ccb99d2682ff81e4008d2b615d74 | |
| parent | 4ff8fd93e8e91672bb02543ecaa0c6e462a87551 (diff) | |
autoconf: use AC_PROG_YACC/LEX
Needed for automake. Using AC_PROG_PATH(bison/flex) causes automake to
fail to build .y and .l files.
It is up to the builder to use bison/flex instead of yacc/lex.
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Eric Anholt <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
| -rw-r--r-- | bin/.gitignore | 1 | ||||
| -rw-r--r-- | configs/autoconf.in | 4 | ||||
| -rw-r--r-- | configure.ac | 13 |
3 files changed, 11 insertions, 7 deletions
diff --git a/bin/.gitignore b/bin/.gitignore index 3b3f168e4ba..5cf62d9e079 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ /depcomp /missing +ylwrap diff --git a/configs/autoconf.in b/configs/autoconf.in index a8aa42dd887..bb8f2c3c901 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -63,8 +63,8 @@ PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O # Flex and Bison for GLSL compiler -FLEX = @FLEX@ -BISON = @BISON@ +FLEX = @LEX@ +BISON = @YACC@ # Library names (base name) GL_LIB = @GL_LIB@ diff --git a/configure.ac b/configure.ac index 94817987713..1700058338d 100644 --- a/configure.ac +++ b/configure.ac @@ -54,11 +54,14 @@ if test "x$MKDEP" = "x"; then AC_MSG_ERROR([makedepend is required to build Mesa]) fi -AC_PATH_PROG([FLEX], [flex]) -test "x$FLEX" = "x" && AC_MSG_ERROR([flex is needed to build Mesa]) - -AC_PATH_PROG([BISON], [bison]) -test "x$BISON" = "x" && AC_MSG_ERROR([bison is needed to build Mesa]) +AC_PROG_YACC +AC_PATH_PROG([YACC_INST], $YACC) +if test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.y"; then + if test -z "$YACC_INST"; then + AC_MSG_ERROR([yacc not found - unable to compile glcpp-parse.y]) + fi +fi +AC_PROG_LEX dnl Our fallback install-sh is a symlink to minstall. Use the existing dnl configuration in that case. |