From: prascle <prascle>
Date: Thu, 2 Feb 2006 13:00:51 +0000 (+0000)
Subject: PR: remove -L/usr/lib
X-Git-Tag: T_3_2_0a1_pre~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=43c8bf9bdb879875f93e0c9388f87ae429412f68;hp=ec64825655b99b08182ef682868ccb732edb3c2a;p=modules%2Fkernel.git

PR: remove -L/usr/lib
---

diff --git a/salome_adm/unix/config_files/check_boost.m4 b/salome_adm/unix/config_files/check_boost.m4
index b5e475ffa..5d63bc4a0 100644
--- a/salome_adm/unix/config_files/check_boost.m4
+++ b/salome_adm/unix/config_files/check_boost.m4
@@ -61,20 +61,24 @@ else
     AC_CHECKING(for libboost_thread-mt.so library file)
     AC_CHECK_FILE(${BOOSTDIR}/lib/libboost_thread-mt.so,boost_ok=yes,boost_ok=no)
     if test "x${boost_ok}" = "xyes" ; then
-      BOOST_LIBS="-L${BOOSTDIR}/lib"
-      AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS})
       BOOST_LIBTHREAD="libboost_thread-mt.so"
       AC_MSG_RESULT(\$BOOST_LIBTHREAD = ${BOOST_LIBTHREAD})
     else
       AC_CHECKING(for libboost_thread.so library file)
       AC_CHECK_FILE(${BOOSTDIR}/lib/libboost_thread.so,boost_ok=yes,boost_ok=no)
       if test "x${boost_ok}" = "xyes" ; then
-        BOOST_LIBS="-L${BOOSTDIR}/lib"
-        AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS})
         BOOST_LIBTHREAD="libboost_thread.so"
         AC_MSG_RESULT(\$BOOST_LIBTHREAD = ${BOOST_LIBTHREAD})
       fi
     fi
+    if test "x${boost_ok}" = "xyes" ; then
+      if test "x${BOOSTDIR}" = "x/usr" ; then
+        BOOST_LIBS=""
+      else
+        BOOST_LIBS="-L${BOOSTDIR}/lib"
+      fi
+      AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS})
+    fi
   fi
 fi