X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fqt-3.3.3.sh;h=9fb1c9195284bdc561ce1bab848d80d3ac3fddce;hb=cd829a66ad0072e55ee2b9ce47d7ba6266eaefb9;hp=e1061a879c6dcbe80e40072541f01dd57aca77b1;hpb=8f86291a2e7147b9fca8d1aea5ad950017a9814b;p=tools%2Finstall.git

diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
index e1061a8..9fb1c91 100755
--- a/config_files/qt-3.3.3.sh
+++ b/config_files/qt-3.3.3.sh
@@ -143,6 +143,17 @@ for b in `find bin -mindepth 1 -maxdepth 1 -name "*"`; do
 	cp -f ${PRODUCT_WORK}/bin/$b ${PRODUCT_DIR}/bin/$b
     fi
 done
+
+# modify libGL.so flags
+has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" ${PRODUCT_DIR}/lib/libqt-mt.la`
+gllibdir="`where_gl_libs`"
+if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
+    sed -e "s%-lGL%%g" \
+	-e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
+	${PRODUCT_DIR}/lib/libqt-mt.la > ${PRODUCT_DIR}/lib/libqt-mt.la.new
+    mv -f ${PRODUCT_DIR}/lib/libqt-mt.la.new ${PRODUCT_DIR}/lib/libqt-mt.la
+fi
+
 #rm -rf ${PRODUCT_DIR}/doc
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
@@ -158,8 +169,22 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/qt-3.3.3.tar.gz -C ${INSTALL_ROOT}
 
 cd ${PRODUCT_DIR}/lib
+
+# modify libdir
 sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libqt-mt.la > libqt-mt.la.new
 mv -f libqt-mt.la.new libqt-mt.la
+
+# modify libGL.so flags
+has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libqt-mt.la`
+gllibdir="`where_gl_libs`"
+if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
+    sed -e "s%-lGL%%g" \
+	-e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
+	libqt-mt.la > libqt-mt.la.new
+    mv -f libqt-mt.la.new libqt-mt.la
+fi
+
+# modify qt package config
 cd ${PRODUCT_DIR}/lib/pkgconfig
 sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" qt-mt.pc > qt-mt.pc.new
 mv -f qt-mt.pc.new qt-mt.pc