From: gdd <gdd>
Date: Thu, 7 Feb 2013 16:35:08 +0000 (+0000)
Subject: Fix check_tbb.m4 in case of not compiling with ifort
X-Git-Tag: V6_main_FINAL~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6c9cd6ceceb97610ce208ebf18bf5958679f4628;p=modules%2Fkernel.git

Fix check_tbb.m4 in case of not compiling with ifort
---

diff --git a/salome_adm/unix/config_files/check_tbb.m4 b/salome_adm/unix/config_files/check_tbb.m4
index f9e55aa93..f91539951 100644
--- a/salome_adm/unix/config_files/check_tbb.m4
+++ b/salome_adm/unix/config_files/check_tbb.m4
@@ -70,11 +70,17 @@ if test "x$TBBHOME" != "xno"; then
         TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
         LOCAL_INCLUDES="-I$TBBHOME/include"
         if test "x$TBBHOME" != "x/usr"; then
+	    INTEL_LOCAL_LIB=""
             if test `uname -m` = "x86_64" ; then
-                LOCAL_LIBS="-L$TBBHOME/lib/intel64/$TBBKERNEL $LOCAL_LIBS"
+                INTEL_LOCAL_LIB="$TBBHOME/lib/intel64/$TBBKERNEL"
             else
-                LOCAL_LIBS="-L$TBBHOME/lib/ia32/$TBBKERNEL $LOCAL_LIBS"
+                INTEL_LOCAL_LIB="$TBBHOME/lib/ia32/$TBBKERNEL"
             fi
+	    if test -z ${INTEL_LOCAL_LIB}; then
+                LOCAL_LIBS="-L${INTEL_LOCAL_LIB} $LOCAL_LIBS"
+	    else
+                LOCAL_LIBS="-L${TBBHOME}/lib $LOCAL_LIBS"
+	    fi
         fi
     fi