From 1a5da55280b411270fa747f8fc04c7b43ac5a800 Mon Sep 17 00:00:00 2001 From: Francesco Lannutti Date: Sat, 17 Nov 2012 12:45:41 +0100 Subject: [PATCH] conditional compilation CLUSTER --- configure.ac | 1 + src/spicelib/analysis/Makefile.am | 8 ++++++-- src/spicelib/analysis/cluster.c | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 57eddd918..aa251623a 100644 --- a/configure.ac +++ b/configure.ac @@ -935,6 +935,7 @@ if test "x$enable_cluster" = xyes; then AC_DEFINE([CLUSTER], [], [Spice cluster support]) LIBS="$LIBS -lpthread" fi +AM_CONDITIONAL([HAVE_CLUSTER_WANTED], [test "x$enable_cluster" = xyes]) if test "x$enable_expdevices" = xyes; then AC_DEFINE([EXP_DEV], [], [Define if we want to enable experimental devices]) diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am index 86d6b7371..fef0aae88 100644 --- a/src/spicelib/analysis/Makefile.am +++ b/src/spicelib/analysis/Makefile.am @@ -94,8 +94,12 @@ libckt_la_SOURCES = \ tfsetp.c \ tranaskq.c \ traninit.c \ - transetp.c \ - cluster.c + transetp.c + + +if HAVE_CLUSTER_WANTED +libckt_la_SOURCES += cluster.c +endif if PSS_WANTED diff --git a/src/spicelib/analysis/cluster.c b/src/spicelib/analysis/cluster.c index c34f75181..72c98c39c 100644 --- a/src/spicelib/analysis/cluster.c +++ b/src/spicelib/analysis/cluster.c @@ -1,6 +1,5 @@ /* Spice hooks */ #include "ngspice/ngspice.h" -#ifdef CLUSTER #include "ngspice/inpdefs.h" #include "ngspice/cluster.h" #include "ngspice/cktdefs.h" @@ -423,4 +422,3 @@ int CLUsync(double time,double *delta, int error){ return 1; } } -#endif