[mathicgb] 232/393: Avoid printing looking for TBB twice in configure.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Fri Apr 3 15:59:09 UTC 2015


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

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

commit bfd7765fa275aa44e5b6eff7951c290d75ceaed8
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Apr 11 14:17:48 2013 -0400

    Avoid printing looking for TBB twice in configure.
---
 configure.ac | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 205dbf3..ea6a39b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -72,15 +72,16 @@ AC_ARG_WITH([tbb], AS_HELP_STRING(
       March 2013).]
 ))
 AS_IF([test "x$with_tbb" == "x"], [with_tbb="detect"])
-AS_IF([test "x$with_tbb" == "xdetect"],
-    [PKG_CHECK_MODULES([TBB], [tbb], [with_tbb="yes"], [with_tbb="no";
-      AC_MSG_WARN([TBB not detected. Compiling without multithreading and without precise timing.])
-    ])])
 AS_IF(
-  [test "x$with_tbb" == "xyes"], [PKG_CHECK_MODULES([TBB], [tbb])],
-  [test "x$with_tbb" == "xno"], [TBB_CFLAGS="-DMATHICGB_NO_TBB"],
+  [test "x$with_tbb" == "xdetect"],
+  [PKG_CHECK_MODULES([TBB], [tbb], [with_tbb="yes"], [with_tbb="no";
+    AC_MSG_WARN([TBB not detected. Compiling without multithreading and without precise timing.])
+  ])],
+  [test "x$with_tbb" == "xyes"], [PKG_CHECK_MODULES([TBB], [tbb])],    
+  [test "x$with_tbb" == "xno"], [],
   [AC_MSG_ERROR([invalid value $with_tbb for with_tbb.])]
 )
+AS_IF([test "x$with_tbb" == "xno"], [TBB_CFLAGS="-DMATHICGB_NO_TBB"])
 
 dnl ----- The librt dependency
 dnl On Linux TBB calls clock_gettime, which requires librt, but librt is not
@@ -112,7 +113,7 @@ AS_IF([test "x$with_tbb" == "xyes"],
       [AC_MSG_RESULT([no])],
       [AC_MSG_RESULT([yes]); RT_LIBS="-lrt"]
     )],
-    [AC_MSG_WARN([AC_MSG_RESULT([no])])]
+    [AC_MSG_RESULT([no])]
   )];
   LIBS=$oldLIBS;
   CFLAGS=$oldCFLAGS;

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



More information about the debian-science-commits mailing list