Fix bugs in boost installation script: incorrect check for preinstalled or native...

diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh
index d2e6f7612a2ec6e13416cedeb7920c80844f8696..095564ed87f0e22fe6d15e683026a9b14f4aa1ca 100755 (executable)
--- a/config_files/BOOST-1.31.0.sh
+++ b/config_files/BOOST-1.31.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" = "103100" ]; 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 103100 ] ;  then 
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM