From: barate <barate>
Date: Tue, 18 Dec 2012 10:04:46 +0000 (+0000)
Subject: Properly detect TBB when installed in the system (/usr)
X-Git-Tag: B4NGCMakeInt~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d32d45b27305142c042fd03718b6c45961619b20;p=modules%2Fkernel.git

Properly detect TBB when installed in the system (/usr)
---

diff --git a/salome_adm/unix/config_files/check_tbb.m4 b/salome_adm/unix/config_files/check_tbb.m4
index df1a86505..f9e55aa93 100644
--- a/salome_adm/unix/config_files/check_tbb.m4
+++ b/salome_adm/unix/config_files/check_tbb.m4
@@ -80,9 +80,9 @@ if test "x$TBBHOME" != "xno"; then
 
 dnl check tbb header
 
-    CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES/tbb"
+    CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
 
-    AC_CHECK_HEADER(tbb.h,tbb_ok=yes ,tbb_ok=no)
+    AC_CHECK_HEADER(tbb/tbb.h,tbb_ok=yes ,tbb_ok=no)
 fi
 
 if  test "x$tbb_ok" = "xyes"
@@ -92,7 +92,7 @@ dnl check TBB library
 
   LIBS_old="$LIBS"
   LIBS="$LIBS $LOCAL_LIBS"
-  AC_TRY_LINK([#include <tbb.h>],
+  AC_TRY_LINK([#include <tbb/tbb.h>],
               [tbb::simple_partitioner()],
               tbb_ok=yes,tbb_ok=no)