[Intel-gfx] [PATCH 11/12] quick_dump: Give dumper an AM_CONDITIONAL
Ben Widawsky
ben at bwidawsk.net
Thu Feb 7 19:39:36 CET 2013
It may sometimes be undesirable to build or install the quick dumper.
This was requested by Damien.
Cc: Damien Lespiau <damien.lespiau at intel.com>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
configure.ac | 19 ++++++++++++++-----
tools/Makefile.am | 2 ++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index b8e34d3..5e2dbed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,11 +50,6 @@ AC_CHECK_FUNCS([asprintf])
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-# SWIG configuration
-AX_PKG_SWIG(2.0.0, [], [ AC_MSG_ERROR([SWIG 2.0.0 or higher is required to build..]) ])
-AX_PYTHON_DEVEL([>= '3.0'])
-AX_SWIG_PYTHON
-
# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
@@ -85,6 +80,20 @@ if test "x$NOUVEAU" = xyes; then
fi
AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes])
+#Configure options for the python quick-dumper
+AC_ARG_ENABLE(dumper,
+ AS_HELP_STRING([--disable-dumper],
+ [Disable the python based register dumper (default: enabled)]),
+ DUMPER=$enableval], [DUMPER=yes])
+if test "x$DUMPER" == xyes; then
+ AC_DEFINE(HAVE_DUMPER, 1, [Have dumper support])
+ # SWIG configuration
+ AX_PKG_SWIG(2.0.0, [], [ AC_MSG_ERROR([SWIG 2.0.0 or higher is required to build..]) ])
+ AX_PYTHON_DEVEL([>= '3.0'])
+ AX_SWIG_PYTHON
+fi
+AM_CONDITIONAL(HAVE_DUMPER, [test "x$DUMPER" = xyes])
+
# Define a configure option for the shadder debugger
AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
[Enable shader debugging support [autodetected]]),
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6088919..bb3328f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,6 @@
+if HAVE_DUMPER
SUBDIRS = quick_dump
+endif
bin_PROGRAMS = \
intel_disable_clock_gating \
--
1.8.1.2
More information about the Intel-gfx
mailing list