Salome HOME
Update for rigth deleting -lGL
authormaintenance team <salome-mnt@opencascade.com>
Wed, 12 Nov 2008 14:39:28 +0000 (14:39 +0000)
committermaintenance team <salome-mnt@opencascade.com>
Wed, 12 Nov 2008 14:39:28 +0000 (14:39 +0000)
config_files/CAS-6.3.sh
config_files/qt-4.4.3.sh

index b61405ff21ac9ecbda6fbcc2d3a29ebc544a6f67..528f996d655f8710982e34fc8e158e863c375c18 100755 (executable)
@@ -174,8 +174,7 @@ if [ "$gllibdir" != "" ] ; then
        str_to_replace="-L${gllibdir} -lGL"
     fi
 
-    sed -e "s%-lGLU%%g"                                                         \
-        -e "s%-lGL%%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
index 8028fae9bebb8a7c207ddf97bc9a1e79d9ac8879..6bcd94590d2d36356d098951b71227584945dfc9 100755 (executable)
@@ -126,7 +126,7 @@ done
 has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
 gllibdir="`where_gl_libs`"
 if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
-    sed -e "s%-lGL%%g" \
+    sed -e "s%-lGL\b%%g" \
        -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
        libQtOpenGL.la > libQtOpenGL.la.new
     mv -f libQtOpenGL.la.new libQtOpenGL.la