From: vsr <vsr@opencascade.com>
Date: Wed, 17 May 2006 08:07:05 +0000 (+0000)
Subject: Modify boost 1.32.0 script for Mandriva 2006.0
X-Git-Tag: mergeto_SALOME_3_17May06~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e52c7c61fa65a7c4c05271e6706232cb8cee0edc;p=tools%2Finstall.git

Modify boost 1.32.0 script for Mandriva 2006.0
---

diff --git a/config_files/BOOST-1.32.0.sh b/config_files/BOOST-1.32.0.sh
index 2e8610a..72c8fff 100755
--- a/config_files/BOOST-1.32.0.sh
+++ b/config_files/BOOST-1.32.0.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 check_version(){
-if [ -n "${BOOSTDIR}" ]; then
-    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+if [ -n "${BOOSTDIR}" ] && [ -f ${BOOSTDIR}/include/boost/version.hpp ] ; then
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/include/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
     if [ "$ver" = "103200" ]; then
 	return 0
     fi
@@ -24,17 +24,14 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-boostdir="`find_in_path version.hpp /usr/include/boost`"
-if [ -z "${boostdir}" ] ; then
-    boostdir="`find_in_path version.hpp /usr/share/include/boost`"
-fi
+boostdir="`find_in_path version.hpp /usr/include/boost:/usr/share/include/boost`"
 if [ -n "${boostdir}" ] ; then
-    boostdir=`cd ${boostdir}/..; pwd`
+    boostdir=`cd ${boostdir}/../..; pwd`
     ls ${boostdir}/lib/libboost_thread* &> /dev/null
     if [ "$?" -ne "0" ] ; then 
 	return 1
     fi
-    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${boostdir}/include/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
     if [ $ver -ge 103200 ] ;  then 
 	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM