From 30ccdadd4bff060c26afc24fa6598f44280a2559 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 19 Apr 2013 11:12:25 +0000
Subject: [PATCH] Update some important files after binary installation

---
 config_files/ParaView.sh | 9 +++++++--
 config_files/common.sh   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh
index 7a5253b..09bc901 100755
--- a/config_files/ParaView.sh
+++ b/config_files/ParaView.sh
@@ -187,8 +187,10 @@ fi
 ### Tcl/Tk settings
 #
 # TEMPORARILY DISABLE TCL WRAPPINGS DUE TO BUG IN PARAVIEW WRAPPER UTILITY!
-#
-if [ false ] && [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
+#--->
+if false ; then
+#<---
+if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
@@ -201,6 +203,9 @@ if [ false ] && [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "
 else
     CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
 fi
+#--->
+fi
+#<---
 
 ### HDF5 settings
 if [ "${HDF5HOME}" != "" ]; then
diff --git a/config_files/common.sh b/config_files/common.sh
index 0dadc57..f02f37a 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -677,7 +677,7 @@ fix_gl_libs(){
 	la_files=`find . -name "*.la"`
 	for la_file in ${la_files} XXX ; do
 	    if [ "${la_file}" = "XXX" ] ; then continue; fi
-	    grep -e "libGL.la" ${la_file} >& /dev/null || grep -e "-lGL\b" ${la_file} >& /dev/null &&
+	    grep -e "libGL.la" ${la_file} >& /dev/null || grep -e "-lGL\b" ${la_file} >& /dev/null && \
 	    sed -e "s%-lGL\b%%g"                                                       \
 		-e "s%[^[:space:]']*libGL.la[[:space:]]%%g"                            \
 		-e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
-- 
2.30.2