Mesa (11.2): configure.ac: update the path of the generated files

Emil Velikov evelikov at kemper.freedesktop.org
Thu Apr 14 19:39:07 UTC 2016


Module: Mesa
Branch: 11.2
Commit: 3840e67bf5a5c89fc644816e721d4527557ab3ef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3840e67bf5a5c89fc644816e721d4527557ab3ef

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Apr  5 14:29:41 2016 +0100

configure.ac: update the path of the generated files

... in order to determine if we need bison/flex. Failing to locate the
files will lead to mandating bison/flex even when building from a
release tarball.

CC: "11.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit c481c8f7f135d4cf17e35bb5126bdcf6b5611940)

---

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4ce99a..8109ac4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,10 +110,10 @@ LT_INIT([disable-static])
 AC_CHECK_PROG(RM, rm, [rm -f])
 
 AX_PROG_BISON([],
-              AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"],
+              AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-parse.c"],
                     [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
 AX_PROG_FLEX([],
-             AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"],
+             AS_IF([test ! -f "$srcdir/src/compiler/glsl/glcpp/glcpp-lex.c"],
                    [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])]))
 
 AC_CHECK_PROG(INDENT, indent, indent, cat)




More information about the mesa-commit mailing list