From 9d6cfa6b59d0c22cf772ca71069f9e5f3e53d055 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Mon, 30 Dec 2013 10:41:43 -0800 Subject: [PATCH] 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 --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d665500..37f434e 100644 --- a/configure.ac +++ b/configure.ac @@ -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) # ----------------------------------------------------------------------------- -- 2.7.4