diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-05-28 14:18:34 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-28 16:03:50 +0200 |
| commit | 707c839a6a0abda7310cf15eeb353a477ac83315 (patch) | |
| tree | 07618d7b67b28772da884c473a1f1240caca3238 | |
| parent | 321273ff76fa16aabec0c6b0a63039525a4fec1b (diff) | |
build: Don't fail if SWIG isn't found
People from distros have reported that packaging the newer versions is
more difficult because we now depend on SWIG. We don't have to, it's
needed for the python dumper and is an optional build dependency.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b71b1005..62268298 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,13 @@ AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" = xyes]) AC_ARG_ENABLE(dumper, AS_HELP_STRING([--disable-dumper], [Disable the python based register dumper (default: enabled)]), - [DUMPER=$enableval], [DUMPER=yes]) + [DUMPER=$enableval], [DUMPER=auto]) +if test "x$DUMPER" = xauto; then + # AX_PYTHON_DEVEL/AX_SWIG_PYTHON are not super friendly and don't + # easily allow us to introspect the result of their checks. So if we + # find SWING on the system, that's enough to try compiling the dumper. + AX_PKG_SWIG(2.0.0, [DUMPER=yes], [DUMPER=no]) +fi if test "x$DUMPER" == xyes; then AC_DEFINE(HAVE_DUMPER, 1, [Have dumper support]) # SWIG configuration |