Update some important files after binary installation

diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh
index 7a5253be2966309fd8f20714907c4717b085cffb..09bc901ee250f7eeabf84ade41328b4514e6af0e 100755 (executable)
--- 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 0dadc57fbf26fb258ecf5b1b59bb0ff7e214a074..f02f37a3274f08b556a9195680f524248aeb10b2 100755 (executable)
--- 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%" \