From 68a3c73fee1e83982108e84db64f13b42e33bf8e Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Tue, 19 Feb 2008 10:20:34 +0000
Subject: [PATCH] *** empty log message ***

---
 config_files/CAS-6.2sp3.sh | 54 ++++++++++++++++++++++----------------
 config_files/YACS.sh       |  2 --
 config_files/common.sh     | 37 ++++++++++++++++++--------
 3 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/config_files/CAS-6.2sp3.sh b/config_files/CAS-6.2sp3.sh
index f605de6..c2edd1a 100755
--- a/config_files/CAS-6.2sp3.sh
+++ b/config_files/CAS-6.2sp3.sh
@@ -192,6 +192,7 @@ if [ "$gllibdir" != "" ] ; then
     if [ "$str_to_replace" == "" ] ; then
 	str_to_replace="-L${gllibdir} -lGL"
     fi
+
     sed -e "s%-lGL%%g"                                                         \
 	-e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
 	-e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
@@ -251,32 +252,41 @@ 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
-    if [ -f ${gllibdir}/libGL.la ] ; then
-	libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
-	if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
-	    str_to_replace="${gllibdir}/libGL.la"
-	fi
-    fi
-    if [ "$str_to_replace" == "" ] ; then
-	str_to_replace="-L${gllibdir} -lGL"
+#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
+#    if [ -f ${gllibdir}/libGL.la ] ; then
+#	libdir=`grep "libdir=" ${gllibdir}/libGL.la | sed -e "s%libdir='\(.*\)'%\1%"`
+#	if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then
+#	    str_to_replace="${gllibdir}/libGL.la"
+#	fi
+#    fi
+#    if [ "$str_to_replace" == "" ] ; then
+#	str_to_replace="-L${gllibdir} -lGL"
+#    fi
+
+    if test `uname -m` = "x86_64" ; then
+    libGLpath=/usr/lib64/libGL.la
+    else
+    libGLpath=/usr/lib/libGL.la
     fi
-    sed -e "s%-lGL%%g"                                                         \
-	-e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
-	-e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+	sed -e "s%$libGLpath%""%g" \
 	libTKOpenGl.la > libTKOpenGl.la.new
     mv -f libTKOpenGl.la.new libTKOpenGl.la
-fi
 
-fi
+#    sed -e "s%-lGL%%g"                                                         \
+#	-e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
+#	-e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
+#	libTKOpenGl.la > libTKOpenGl.la.new
+#    mv -f libTKOpenGl.la.new libTKOpenGl.la
+#fi
+#fi
 
 # to generate environment script for sources
 try_preinstalled
diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 405d395..251c7df 100755
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -39,8 +39,6 @@ fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export YACS_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export YACSGui_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export YACSGUI_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${YACS_ROOT_DIR}/bin/salome:\${PATH}
diff --git a/config_files/common.sh b/config_files/common.sh
index a0dd45e..d3c7afa 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -668,7 +668,9 @@ if [ "$l" != "X" ] ; then
 	if [ -n "${moddir}" ] ; then
 	    #echo $l $mod $moddir
 #	    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/\(lib\|lib64\)% \1${moddir}/${myldir}%g" $l > $l"_"
-	    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
+#	    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${mod}[^[:space:]/]*/lib% \1${moddir}/lib%g" $l > $l"_"
+	    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
 	fi
     done
@@ -695,13 +697,16 @@ if [ "$l" != "X" ] ; then
     fi
     # 4. process VTK dependencies
     if test `uname -m` = "x86_64" ; then
-    vtkdir=`printenv VTKHOME`/lib64/vtk
+    vtkdir=`printenv VTKHOME`/lib64/vtk-5.0
+    vtkldir=`printenv VTKHOME`/lib64
     else
-    vtkdir=`printenv VTKHOME`/lib/vtk
+    vtkdir=`printenv VTKHOME`/lib/vtk-5.0
+    vtkldir=`printenv VTKHOME`/lib
     fi
-    if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] ; then
+    if [ -n "${VTKHOME}" ] && [ -d "${vtkdir}" ] && [ -d "${vtkldir}" ] ; then
 	# echo $l $VTKHOME $vtkdir
-	sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk%-L${vtkdir}%g" $l > $l"_"
+	sed -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)/vtk\-5\.0%-L${vtkdir}%g" \
+	    -e "s%-L[^[:space:]]*VTK[^[:space:]]*/\(lib\|lib64\)%-L${vtkldir}%g" $l > $l"_"
 	mv -f $l"_" $l
     fi
     # 5. process HDF dependencies
@@ -770,12 +775,13 @@ if [ "$l" != "X" ] ; then
 	sed -e "s%-L[^[:space:]]*boost[^[:space:]]*/lib%-L${boostdir}%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}'`
-    moddir=`printenv ${mod}_ROOT_DIR`
-    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
-    mv -f $l"_" $l
+
+#    # 14. modify libdir
+#    #sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > $l"_"
+#    mod=`basename $ldir | awk -F_ '{print $1}'`
+#    moddir=`printenv ${mod}_ROOT_DIR`
+#    sed -e "s%^libdir='[^[:space:]]*${mod}[^[:space:]]*/\(lib.*\)'%libdir='${moddir}/\1'%g" $l > $l"_"
+#    mv -f $l"_" $l
 
     # 15. process libxml dependencies
     libxmldir=`printenv LIBXML_DIR`/lib
@@ -796,6 +802,15 @@ if [ "$l" != "X" ] ; then
     sed    -e "s%-L[^[:space:]]*scotch[^[:space:]]*/bin%-L${scotchdir}%g" $l > $l"_"
     mv -f $l"_" $l 	
 
+    # 4. process libGL.la dependencies
+    if test `uname -m` = "x86_64" ; then
+    libGLpath=/usr/lib64/libGL.la
+    else
+    libGLpath=/usr/lib/libGL.la
+    fi
+	sed -e "s%$libGLpath%""%g" $l > $l"_"
+	mv -f $l"_" $l
+
 
 fi
 done
-- 
2.39.2