Merge from V6_main 19/03/2013

diff --git a/salome_adm/unix/config_files/check_tbb.m4 b/salome_adm/unix/config_files/check_tbb.m4
index f915399510eeffee04d4192885df3f98555842e6..4ba8e511994c468b2fc46fba026d5a2344ce7d32 100644 (file)
--- a/salome_adm/unix/config_files/check_tbb.m4
+++ b/salome_adm/unix/config_files/check_tbb.m4
@@ -76,10 +76,11 @@ if test "x$TBBHOME" != "xno"; then
             else
                 INTEL_LOCAL_LIB="$TBBHOME/lib/ia32/$TBBKERNEL"
             fi
-           if test -z ${INTEL_LOCAL_LIB}; then
+           if test ! -d ${INTEL_LOCAL_LIB} ; then
+               INTEL_LOCAL_LIB="${TBBHOME}/lib"
+           fi
+           if test -d ${INTEL_LOCAL_LIB} ; then
                 LOCAL_LIBS="-L${INTEL_LOCAL_LIB} $LOCAL_LIBS"
-           else
-                LOCAL_LIBS="-L${TBBHOME}/lib $LOCAL_LIBS"
            fi
         fi
     fi