Migrate to omniORB 4.1.3

[tools/install.git] / config_files / CAS-6.3.sh

diff --git a/config_files/CAS-6.3.sh b/config_files/CAS-6.3.sh
index 528f996d655f8710982e34fc8e158e863c375c18..a4506df4785b75ddae8253b3c1ec7418e00a93b5 100755 (executable)
--- a/config_files/CAS-6.3.sh
+++ b/config_files/CAS-6.3.sh
@@ -174,7 +174,7 @@ if [ "$gllibdir" != "" ] ; then
        str_to_replace="-L${gllibdir} -lGL"
     fi
 
-    sed -e "s%-lGL\b%%g"                                                       \                                                     \
+    sed -e "s%-lGL\b%%g"                                                       \
        -e "s%[^[:space:]]*libGL.la[[:space:]]%%g"                             \
        -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \
        libTKOpenGl.la > libTKOpenGl.la.new
@@ -185,7 +185,8 @@ fi
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+echo "${INSTALL_PRODUCTS}" | grep -q "PatchForOpenCascade"
+if [ $? -eq 1 ] && [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
 fi
 
@@ -239,34 +240,25 @@ done
 
 #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
+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
-       sed -e "s%$libGLpath%""%g" \
-       libTKOpenGl.la > libTKOpenGl.la.new
-    mv -f libTKOpenGl.la.new libTKOpenGl.la
 
-#    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
+        sed -e "s%-lGL\b%%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