configure.ac: Fixup conditional shader debugger

The original patch was incomplete. Testing no assembler build is a pain
for me. Sorry for the mess.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2013-12-30 10:41:43 -08:00
parent 3ed4b5bd11
commit 9d6cfa6b59

View File

@ -141,9 +141,10 @@ AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
# Shader debugger depends on python3, intel-genasm and objcopy
if test "x$BUILD_SHADER_DEBUGGER" != xno; then
# Check that the assembler is built
if test "$enable_assembler" = xno; then
AC_MSG_ERROR([Shader debugger requested, but assembler not build not found.])
BUILD_SHADER_DEBUGGER=no
if test "x$enable_assembler" = xno; then
if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
AC_MSG_ERROR([Shader debugger requested, but assembler not enabled.])
fi
fi
# Check Python 3 is installed
@ -169,6 +170,8 @@ fi
AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno])
AS_IF([test "x$BUILD_SHADER_DEBUGGER" != xno],
[enable_debugger=yes], [enable_debugger=no])
AS_IF([test "x$enable_assembler" = xno],
[enable_debugger=no], 1)
# -----------------------------------------------------------------------------