Pārlūkot izejas kodu

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 <eric@anholt.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
tags/i965-primitive-restart-v2
Matt Turner pirms 14 gadiem
vecāks
revīzija
dfb6142548
3 mainītis faili ar 11 papildinājumiem un 7 dzēšanām
  1. 1
    0
      bin/.gitignore
  2. 2
    2
      configs/autoconf.in
  3. 8
    5
      configure.ac

+ 1
- 0
bin/.gitignore Parādīt failu

@@ -1,2 +1,3 @@
/depcomp
/missing
ylwrap

+ 2
- 2
configs/autoconf.in Parādīt failu

@@ -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@

+ 8
- 5
configure.ac Parādīt failu

@@ -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.

Notiek ielāde…
Atcelt
Saglabāt