From 7289f7556ded0a59137f52b27a7c77765e23be36 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Mon, 17 Nov 2008 10:11:55 +0000 Subject: [PATCH] Small update for libGL.la --- config_files/CAS-6.3.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/config_files/CAS-6.3.sh b/config_files/CAS-6.3.sh index b76e7d5..311afe5 100755 --- 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 @@ -247,25 +247,36 @@ done # if [ "`ls $libdir/libGL.so* 2>/dev/null`" ] ; then # str_to_replace="${gllibdir}/libGL.la" # fi -# fi +#fi # if [ "$str_to_replace" == "" ] ; then # str_to_replace="-L${gllibdir} -lGL" # fi +is_debian40=0 + +if [ -e /etc/issue ] ; then + grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null + if [ $? == 0 ] ; then is_debian40=1 ; fi +fi + if test `uname -m` = "x86_64" ; then - libGLpath=/usr/lib64/libGL.la + if [ $is_debian40 == 1 ] ; then + libGLpath=/usr/lib/libGL.la + else + libGLpath=/usr/lib64/libGL.la + fi else libGLpath=/usr/lib/libGL.la fi sed -e "s%$libGLpath%""%g" \ libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la + 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 +# mv -f libTKOpenGl.la.new libTKOpenGl.la #fi #fi -- 2.39.2