From: vsr <vsr@opencascade.com>
Date: Fri, 9 Oct 2009 11:50:41 +0000 (+0000)
Subject: Issue 0020010: EDF GUI : Some remarks on GUI configure step
X-Git-Tag: V5_1_3rc1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4576e75b995f4e944ee1bd17eebdef96ae7c40dc;p=modules%2Fgui.git

Issue 0020010: EDF GUI : Some remarks on GUI configure step
Additional fix for native Qt4 detection on Mandriva 2009
---

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index 44f238b49..d98fff260 100644
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.m4
@@ -330,13 +330,14 @@ then
   CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
 
   LIBS_old=$LIBS
-  if test "x$QTDIR" = "x/usr"
-  then
+  if test "x$QTDIR" = "x/usr" ; then
     QT_LIB_DIR=""
   elif test -d ${QTDIR}/lib; then
     QT_LIB_DIR="-L$QTDIR/lib"
   elif test -d ${QTDIR}/lib64; then
     QT_LIB_DIR="-L$QTDIR/lib64"
+  elif test "x$QTDIR" = "x/usr/lib/qt4" ; then
+    QT_LIB_DIR=""
   else
     AC_MSG_ERROR(Can't detect of Qt library directory )
     qt_ok=no