]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Fix check_tbb.m4 in case of not compiling with ifort
authorgdd <gdd>
Thu, 7 Feb 2013 16:35:08 +0000 (16:35 +0000)
committergdd <gdd>
Thu, 7 Feb 2013 16:35:08 +0000 (16:35 +0000)
salome_adm/unix/config_files/check_tbb.m4

index f9e55aa939c4b0ef816c48981d8ee2e74f36849b..f915399510eeffee04d4192885df3f98555842e6 100644 (file)
@@ -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