From: inv <inv@opencascade.com>
Date: Mon, 31 Oct 2011 11:28:02 +0000 (+0000)
Subject: Update
X-Git-Tag: V6_4_0~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=55e927e2f94e4c823f0eda14e2056991637417fa;p=tools%2Finstall.git

Update
---

diff --git a/config_files/OCCT-6.5.2.sh b/config_files/OCCT-6.5.2.sh
index eeab9c0..c6310a8 100755
--- a/config_files/OCCT-6.5.2.sh
+++ b/config_files/OCCT-6.5.2.sh
@@ -1,4 +1,4 @@
-!/bin/bash -noprofile
+#!/bin/bash -noprofile
 
 ####################################################################################
 #  File      : OCCT-6.5.2.sh
@@ -101,6 +101,8 @@ echo " +++++++++++ configure"
 is_mandriva2007=0
 is_mandriva2008=0
 is_debian40=0
+is_debian50=0
+is_debian60=0
 
 if [ -e /etc/issue ] ; then
   grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
@@ -144,10 +146,9 @@ flags="$flags --with-xmu-include=$where_xmu_include"
 if test `uname -m` = "x86_64" ; then
     flags="$flags --with-xmu-library=/usr/lib64"
 else
-    flags="$flags --with-xmu-library=/usr/X11R6/lib"
+    flags="$flags --with-xmu-library=/usr/lib"
 fi
 
-    flags="$flags LDFLAGS=-lpthread"
 glincdir="`where_gl_includes`"
 if [ $? -eq 0 ] ; then flags="$flags --with-gl-include=$glincdir"; fi
 gllibdir="`where_gl_libs`"
@@ -156,9 +157,21 @@ tcldir="`where_tcl`"
 if [ $? -eq 0 ] ; then flags="$flags --with-tcl=$tcldir"; fi
 tkdir="`where_tk`"
 if [ $? -eq 0 ] ; then flags="$flags --with-tk=$tkdir"; fi
-dpsdir="`where_dps`"
-if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-dps-library=$dpsdir/lib"; fi
-flags="$flags --disable-wrappers --disable-wok --disable-debug --enable-production"
+
+flags="$flags --with-tbb-include=${TBBHOME}/include" 
+
+if test `uname -m` = "x86_64" ; then
+    flags="$flags --with-tbb-library=${TBBHOME}/intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
+else
+    flags="$flags --with-tbb-library=${TBBHOME}/ia32/cc4.1.0_libc2.4_kernel2.6.16.21"
+fi
+
+flags="$flags --with-freetype=${FREETYPEDIR}"
+flags="$flags --with-ftgl=${FTGLDIR}"
+flags="$flags --with-freeimage=${FREEIMAGEDIR}"
+flags="$flags --with-gl2ps=${GL2PSHOME}"
+
+flags="$flags --disable-debug --enable-production"
 
 export CASROOT=${PRODUCT_SRC_DIR}