From be87403cff97410bf40302b84dbc345a0664519a Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 16 Dec 2005 14:19:14 +0000
Subject: [PATCH] Fix bugs with *.la files

---
 config_files/CALCULATOR_BIN.sh   |  1 +
 config_files/CAS-6.0.sh          |  5 +++++
 config_files/COMPONENT_BIN.sh    |  1 +
 config_files/GEOM_BIN.sh         |  1 +
 config_files/GHS3DPLUGIN_BIN.sh  |  1 +
 config_files/GUI_BIN.sh          |  1 +
 config_files/HELLO_BIN.sh        |  1 +
 config_files/KERNEL_BIN.sh       |  1 +
 config_files/LIGHT_BIN.sh        |  1 +
 config_files/MED_BIN.sh          |  1 +
 config_files/NETGENPLUGIN_BIN.sh |  1 +
 config_files/PYCALCULATOR_BIN.sh |  1 +
 config_files/PYHELLO_BIN.sh      |  1 +
 config_files/SMESH_BIN.sh        |  1 +
 config_files/SUPERV_BIN.sh       |  1 +
 config_files/VISU_BIN.sh         |  1 +
 config_files/common.sh           | 23 ++++++++++++++++++++++-
 config_files/med-2.2.2.sh        |  8 ++++----
 18 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/config_files/CALCULATOR_BIN.sh b/config_files/CALCULATOR_BIN.sh
index 9d4f770..bef5780 100755
--- a/config_files/CALCULATOR_BIN.sh
+++ b/config_files/CALCULATOR_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index fa13758..8ce70ae 100755
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -133,12 +133,17 @@ ldir=${PRODUCT_DIR}/lib
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
 cd $ldir
+tcldir=`printenv TCLHOME`
 for l in X `find . -name "*.la"`; do
     if [ "$l" != "X" ] ; then
 	l=`basename $l`
 	libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
 	sed -e "s%${libdir}%${ldir}%g" $l > _$l
 	mv -f _$l $l
+	if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+	    sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l
+	    mv -f _$l $l
+	fi
 	chmod a+x $l
     fi
 done
diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh
index 798ecad..d735ecc 100755
--- a/config_files/COMPONENT_BIN.sh
+++ b/config_files/COMPONENT_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/GEOM_BIN.sh b/config_files/GEOM_BIN.sh
index 4af986f..de10941 100755
--- a/config_files/GEOM_BIN.sh
+++ b/config_files/GEOM_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GEOM_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/GHS3DPLUGIN_BIN.sh b/config_files/GHS3DPLUGIN_BIN.sh
index 055ceb0..942b77a 100755
--- a/config_files/GHS3DPLUGIN_BIN.sh
+++ b/config_files/GHS3DPLUGIN_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh
index 608feb9..83238d9 100755
--- a/config_files/GUI_BIN.sh
+++ b/config_files/GUI_BIN.sh
@@ -74,6 +74,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GUI_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/HELLO_BIN.sh b/config_files/HELLO_BIN.sh
index e51adb1..457694b 100755
--- a/config_files/HELLO_BIN.sh
+++ b/config_files/HELLO_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export HELLO_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh
index 48102c7..20b5648 100755
--- a/config_files/KERNEL_BIN.sh
+++ b/config_files/KERNEL_BIN.sh
@@ -78,6 +78,7 @@ if [ -f /lib/libssl.so.0.9.7a ]; then
 fi
 
 # modify all *.la files
+export KERNEL_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/LIGHT_BIN.sh b/config_files/LIGHT_BIN.sh
index 0414554..fea73cb 100755
--- a/config_files/LIGHT_BIN.sh
+++ b/config_files/LIGHT_BIN.sh
@@ -65,6 +65,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export LIGHT_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/MED_BIN.sh b/config_files/MED_BIN.sh
index 7e894ce..a31f520 100755
--- a/config_files/MED_BIN.sh
+++ b/config_files/MED_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export MED_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/NETGENPLUGIN_BIN.sh b/config_files/NETGENPLUGIN_BIN.sh
index bbfe4f0..2939a3f 100755
--- a/config_files/NETGENPLUGIN_BIN.sh
+++ b/config_files/NETGENPLUGIN_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/PYCALCULATOR_BIN.sh b/config_files/PYCALCULATOR_BIN.sh
index d3e0c2a..e87588c 100755
--- a/config_files/PYCALCULATOR_BIN.sh
+++ b/config_files/PYCALCULATOR_BIN.sh
@@ -68,6 +68,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/PYHELLO_BIN.sh b/config_files/PYHELLO_BIN.sh
index 6b14fdb..126586a 100755
--- a/config_files/PYHELLO_BIN.sh
+++ b/config_files/PYHELLO_BIN.sh
@@ -67,6 +67,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export PYHELLO_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh
index fb39833..2596e27 100755
--- a/config_files/SMESH_BIN.sh
+++ b/config_files/SMESH_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export SMESH_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh
index c2b18d4..0c9bbb1 100755
--- a/config_files/SUPERV_BIN.sh
+++ b/config_files/SUPERV_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export SUPERV_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/VISU_BIN.sh b/config_files/VISU_BIN.sh
index 6255734..d6fdbf4 100755
--- a/config_files/VISU_BIN.sh
+++ b/config_files/VISU_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export VISU_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env
diff --git a/config_files/common.sh b/config_files/common.sh
index 3c9b217..f8c08ca 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -522,7 +522,28 @@ if [ "$l" != "X" ] ; then
 	sed -e "s%-L[^[:space:]]*python[0-9]\.[0-9]\([^[:space:]]*\)%-L${where_python}/lib/python${python_version}\1%g" $l > _$l
 	mv -f _$l $l
     fi
-    # 10. modify libdir
+    # 10. process sip dependencies
+    sipdir=`find_in_path sip.so ${LD_LIBRARY_PATH}`
+    if [ -n "${sipdir}" ] && [ -d "${sipdir}" ] ; then
+	# echo $l $sipdir
+	sed -e "s%-L[^[:space:]]*sip[^[:space:]]*%-L${sipdir}%g" $l > _$l
+	mv -f _$l $l
+    fi
+    # 11. process PyQt dependencies
+    pyqtdir=`find_in_path qt.so ${LD_LIBRARY_PATH}`
+    if [ -n "${pyqtdir}" ] && [ -d "${pyqtdir}" ] ; then
+	# echo $l $pyqtdir
+	sed -e "s%-L[^[:space:]]*PyQt[^[:space:]]*%-L${pyqtdir}%g" $l > _$l
+	mv -f _$l $l
+    fi
+    # 12. process tcl/tk dependencies
+    tcldir=`printenv TCLHOME`/lib
+    if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+	# echo $l $TCLHOME $tcldir
+	sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}%g" $l > _$l
+	mv -f _$l $l
+    fi
+    # 13. modify libdir
     sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > _$l
     mv -f _$l $l
 fi
diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh
index b454521..681619d 100755
--- a/config_files/med-2.2.2.sh
+++ b/config_files/med-2.2.2.sh
@@ -86,9 +86,9 @@ tmp=""
 if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
 mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 
 chmod 755 libmed.la
@@ -116,9 +116,9 @@ tmp=""
 if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
 mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 
 chmod 755 libmed.la
-- 
2.39.2