From fe5fa723a7945d78530639ec5a7218aa811da0c7 Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 27 Feb 2008 08:44:08 +0000
Subject: [PATCH] Small updates

---
 config_files/build.csh |  3 +++
 config_files/build.sh  |  5 ++++-
 config_files/common.sh | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/config_files/build.csh b/config_files/build.csh
index 03c0cc6..fe5ee5e 100755
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -303,6 +303,9 @@ foreach module (${modules})
     if ( ! -e ${module_src}/${cfg_file} ) then
 	set cfg_file=configure.in.base
 	set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
+	if ( "$vx" == "" ) then
+	    set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+	endif
 	else
 	set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`	
     endif
diff --git a/config_files/build.sh b/config_files/build.sh
index 4e408d9..af4e3da 100755
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -310,7 +310,10 @@ for module in ${modules}; do
 	if [ ! -e ${module_src}/${cfg_file} ] ; then
 	    cfg_file=configure.in.base
 	    vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
-	    else
+	    if [ "$vx" == "" ] ; then
+		vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+	    fi
+	else
 	    vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
 	fi
 	px=${BUILD_DIR}/${module}
diff --git a/config_files/common.sh b/config_files/common.sh
index d3c7afa..5694d98 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -672,6 +672,10 @@ if [ "$l" != "X" ] ; then
 	    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" \
 	        -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
 	    mv -f $l"_" $l
+	    for mod1 in $SALOME_MODULES; do
+		sed	-e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod1}[^[:space:]]*/${mod1}_build%%g" $l > $l"_"
+		mv -f $l"_" $l
+	    done
 	fi
     done
 
@@ -776,6 +780,13 @@ if [ "$l" != "X" ] ; then
 	mv -f $l"_" $l
     fi
 
+    blsurfdir=`printenv BLSURFHOME`/lib
+    if [ -n "${blsurfdir}" ] && [ -d "${blsurfdir}" ] ; then
+	# echo $l $BOOSTDIR $boostdir
+	sed -e "s%-L[^[:space:]]*blsurf[^[:space:]]*/lib%-L${blsurfdir}%g" $l > $l"_"
+	mv -f $l"_" $l
+    fi
+
 #    # 14. modify libdir
 #    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
 #    mod=`basename $ldir | awk -F_ '{print $1}'`
-- 
2.39.2