From a705c75b9339b24c0a810158bc35d730c987e32b Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <mikael@djurfeldt.com>
Date: Tue, 18 Oct 2016 19:16:34 +0200
Subject: [PATCH] Don't break build if configured with --disable-mpi
---
configure.ac | 9 +++++++--
testsuite/Makefile.am | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index c49992a..803b2de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,6 +252,8 @@ else
OPTIONAL_UTILS=""
EXAMPLESDIR=""
fi
+AM_CONDITIONAL([COND_USE_MPI], [test x$MUSIC_USE_MPI = x1])
+
AC_ARG_ENABLE(isend,
[ --disable-isend disable isend],
MUSIC_ISENDWAITALL="$enableval", MUSIC_ISENDWAITALL="yes")
@@ -260,6 +262,7 @@ if test $MUSIC_ISENDWAITALL = yes ; then
else
MUSIC_ISENDWAITALL=0
fi
+
AC_ARG_ENABLE(anysource,
[ --disable-anysource disable any source receive],
MUSIC_ANYSOURCE="$enableval", MUSIC_ANYSOURCE="yes")
@@ -323,12 +326,13 @@ AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing],
[PYMUSIC_CXXFLAGS="-fno-strict-aliasing"; PYBUFFER_CXXFLAGS="-fno-strict-aliasing"],
[])
+PYMUSIC_SUBDIR=""
+if test -z "${COND_USE_MPI_TRUE}"; then
+
# FIXME: this means that --without-python make will not recurse into pymusic subdir
if test "x$have_python" = "xyes"; then
MUSICCONFIGDIR="music-config"
PYMUSIC_SUBDIR="pymusic"
-else
- PYMUSIC_SUBDIR=""
fi
AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
@@ -339,6 +343,7 @@ if test "x$have_python" = "xyes" ; then
AC_CONFIG_FILES(pymusic/setup.py)
fi
+fi
AC_SUBST([HAVE_PYTHON])
AC_SUBST([MUSICCONFIGDIR])
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 2ed406b..a54063e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,4 +1,6 @@
+if COND_USE_MPI
SUBDIRS = unittests/catch sanitytests
+endif
#runtestdir = $(bindir)
#dist_runtest_DATA = music_tests.sh
--
GitLab