[mathicgb] 192/393: The configure file now accepts an option --with-tbb=no. Use it to avoid a dependency on tbb, though then times in logs will be less accurate and there will be no support for multithreading. The Makefile created by build/setup/make-Makefile.sh now accepts an option mathicgb_conf, which is passed on to configure. So you can do make rel mathicgb_conf="--with-tbb=no" to set up a release mode build without tbb.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit f10ccf023ada53a67df4d961eca35ef35f47c0bc
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Mon Mar 18 19:21:26 2013 +0100

    The configure file now accepts an option --with-tbb=no. Use it to avoid a dependency on tbb, though then times in logs will be less accurate and there will be no support for multithreading. The Makefile created by build/setup/make-Makefile.sh now accepts an option mathicgb_conf, which is passed on to configure. So you can do make rel mathicgb_conf="--with-tbb=no" to set up a release mode build without tbb.
---
 build/setup/make-Makefile.sh |  3 ++-
 configure.ac                 | 24 +++++++++++++++++++++---
 src/mathicgb/mtbb.hpp        |  2 --
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/build/setup/make-Makefile.sh b/build/setup/make-Makefile.sh
index a3fdaa1..ed418de 100755
--- a/build/setup/make-Makefile.sh
+++ b/build/setup/make-Makefile.sh
@@ -155,6 +155,7 @@ function makeTarget {
   targetLDFLAGS="${targetsLDFLAGS[targetIndex]}";
   targetMakeArgs="${targetsMakeArgs[targetIndex]}";
   targetDefault="${targetsDefault[targetIndex]}";
+  projectConfigureArgs="--prefix=\"$prefix\" \${${projectName}_conf}";
 
   dependencies="";
   for depProject in $projectDependencies; do
@@ -174,7 +175,7 @@ function makeTarget {
   echo $'\t'"  export CXXFLAGS=\"$targetCXXFLAGS\"; \\";
   echo $'\t'"  export CPPFLAGS=\"$targetCPPFLAGS\"; \\";
   echo $'\t'"  export LDFLAGS=\"$targetLDFLAGS\"; \\";
-  echo $'\t'"  ../configure --prefix=\"$prefix\"; \\"
+  echo $'\t'"  ../configure $projectConfigureArgs; \\"
   echo $'\t'"  make $targetMakeArgs install; \\"
   echo $'\t'");"
   echo "$targetName: $name";
diff --git a/configure.ac b/configure.ac
index ab8efa1..5bb8aec 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,26 @@
 dnl AC_INIT sets up autoconf and must be first macro.
 AC_INIT([mathicgb], [1.0]) # package, version, bug-report-email
 
-# Check that mathicgb is installed and locate it
-PKG_CHECK_MODULES([DEPS], [memtailor-1.0] [mathic-1.0] [tbb])
+# Check availability and location of dependencies
+PKG_CHECK_MODULES([MEMTAILOR], [memtailor-1.0])
+PKG_CHECK_MODULES([MATHIC], [mathic-1.0])
+
+AC_ARG_WITH([tbb],
+  AS_HELP_STRING(
+    [--disable-tbb],
+	[Do not use TBB. Removes support for parallel execution and precise timing.]
+  )
+)
+
+AS_IF(
+  [test "x$with_tbb" == "xno"], [TBB_CFLAGS=-DMATHICGB_NO_TBB],
+  [PKG_CHECK_MODULES([TBB], [tbb])]
+)
+
+DEPS_CFLAGS="$MEMTAILOR_CFLAGS $MATHIC_CFLAGS $TBB_CFLAGS"
+DEPS_LIBS="$MEMTAILOR_LIBS $MATHIC_LIBS $TBB_LIBS"
+AC_SUBST(DEPS_CFLAGS)
+AC_SUBST(DEPS_LIBS)
 
 # set up information about directories
 AC_CONFIG_MACRO_DIR([build/autotools/m4]) # directory of extra autoconf macroes
@@ -13,7 +31,7 @@ dnl  if autoconf is told the source code is in a directory that does not
 dnl  contain this file then it knows that the directory is wrong.
 AC_CONFIG_SRCDIR([src/cli/GBMain.cpp])
 
-# Enable optional maintainer mode (off by default)
+# Enable maintainer mode
 dnl AM_MAINTAINER_MODE turns off automatic reconstruction of the build
 dnl files if the source build files have changed. A developer will want
 dnl those automatic reconstructions to happen so that changes to the
diff --git a/src/mathicgb/mtbb.hpp b/src/mathicgb/mtbb.hpp
index 557c453..00d26a1 100644
--- a/src/mathicgb/mtbb.hpp
+++ b/src/mathicgb/mtbb.hpp
@@ -1,8 +1,6 @@
 #ifndef MATHICGB_TBB_GUARD
 #define MATHICGB_TBB_GUARD
 
-#define MATHICGB_NO_TBB
-
 #ifndef MATHICGB_NO_TBB
 #include <tbb/tbb.h>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git