From: vsr <vsr@opencascade.com>
Date: Tue, 19 Mar 2013 16:06:31 +0000 (+0000)
Subject: Merge from V6_main 19/03/2013
X-Git-Tag: V7_1_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8f4bd6ecbebe828e87cd6b300a0e4ce6526bcf39;p=modules%2Fkernel.git

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 f91539951..4ba8e5119 100644
--- 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