From: vsr <vsr@opencascade.com>
Date: Mon, 18 May 2009 08:46:31 +0000 (+0000)
Subject: Issue 0020352: Compatibility native qt4 on mandriva 2009.1 for check_qt
X-Git-Tag: V5_1_2rc1~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af7caec60ffbf7590233d7597d7fcad4b553accd;p=modules%2Fgeom.git

Issue 0020352: Compatibility native qt4 on mandriva 2009.1 for check_qt
---

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index 5859b6afc..a2a3d60d1 100644
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.m4
@@ -94,6 +94,15 @@ else
   else
     dnl Using QTDIR environment variable
     AC_MSG_RESULT(QTDIR is $QTDIR)
+    dnl 
+    if test $QTDIR = /usr/lib/qt3 ; then
+      if test -d /usr/lib/qt4 ; then
+        AC_MSG_RESULT(it is strange for a qt4 installation !)
+        AC_MSG_RESULT(/usr/lib/qt4 is present)
+        AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4)
+        QTDIR=/usr/lib/qt4
+      fi
+    fi
   fi
 fi
 
@@ -323,7 +332,7 @@ then
   CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
 
   LIBS_old=$LIBS
-  if test "x$QTDIR" = "x/usr"
+  if test "x$QTDIR" = "x/usr" || test "x$QTDIR" = "x/usr/lib/qt4"
   then
     QT_LIB_DIR=""
   elif test -d ${QTDIR}/lib; then