From: inv <inv@opencascade.com>
Date: Tue, 15 Nov 2011 10:13:03 +0000 (+0000)
Subject: Update
X-Git-Tag: V6_4_0~20
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ae76f0ffeb7a6de4d46cb94035e0bcdfae87eebe;p=tools%2Finstall.git

Update
---

diff --git a/config_files/OCCT-6.5.2.sh b/config_files/OCCT-6.5.2.sh
index d7cbe86..df5a7e1 100755
--- a/config_files/OCCT-6.5.2.sh
+++ b/config_files/OCCT-6.5.2.sh
@@ -250,6 +250,21 @@ if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
 cd $ldir
 # 1. set libdir correctly, correct dependencies, set tcldir correctly
 tcldir=`printenv TCLHOME`
+freetypedir=`printenv FREETYPEDIR`
+ftgldir=`printenv FTGLDIR`
+gl2psdir=`printenv GL2PSHOME`
+freeimagedir=`printenv FREEIMAGEDIR`
+tbbbasedir=`printenv TBBHOME`
+
+TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
+if test `uname -m` = "x86_64" ; then
+    export TBBMODE="intel64/$TBBKERNEL"
+else
+    export TBBMODE="ia32/$TBBKERNEL"
+fi
+
+tbbdir=${tbbbasedir}/lib/$TBBMODE
+
 for l in X `find . -name "*.la"`; do
     if [ "$l" != "X" ] ; then
 	l=`basename $l`
@@ -261,17 +276,43 @@ for l in X `find . -name "*.la"`; do
 	    mv -f _$l $l
 	fi
 	chmod a+x $l
+	if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
+		-e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
+	if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
+		-e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
+	if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
+	if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
+	if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
+	if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" $l > _$l
+	    mv -f _$l $l
+	fi
+	chmod a+x $l
     fi
 done
 
 # 2. fix libGL dependencies
 
-#if test "$is_mandriva2008" = "1" && test `uname -m` = "x86_64" ; then
-
-#echo " +++++++++++ libGL dependencies are not updated"
-
-#else
-
 cd $ldir
 gllibdir="`where_gl_libs`"
 if [ "$gllibdir" != "" ] ; then
@@ -291,7 +332,6 @@ fi
 	libTKOpenGl.la > libTKOpenGl.la.new
         mv -f libTKOpenGl.la.new libTKOpenGl.la
 fi
-#fi
 
 # to generate environment script for sources
 try_preinstalled