From 6c9cd6ceceb97610ce208ebf18bf5958679f4628 Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 7 Feb 2013 16:35:08 +0000 Subject: [PATCH] Fix check_tbb.m4 in case of not compiling with ifort --- salome_adm/unix/config_files/check_tbb.m4 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 -- 2.39.2