PR: BUG KERNEL4781

diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4
index 09d4e426c71f7353d00f17c5851e8295f4ec9d9d..e0d320185963199119d40a40229934e3bad147aa 100644 (file)
--- a/salome_adm/unix/config_files/check_pyqt.m4
+++ b/salome_adm/unix/config_files/check_pyqt.m4
@@ -72,46 +72,39 @@ if test -z $PYUIC; then
    PYUIC="/usr/bin/pyuic"      
 fi
 
-AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
+PYQT_ROOT=$PYQTDIR
+PYQT_INCLUDES="-I$PYQT_SIPS"
+PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
+
+AC_CHECK_FILES($PYQTDIR/qt.py $PYQTDIR/qt/qt.py $PYQTDIR/lib/qt.py,pyqt_ok=yes,pyqt_ok=no)
 if test "x$pyqt_ok" = xno ; then
-   AC_MSG_RESULT(no)
-   AC_MSG_WARN(pyqt not found)
+   AC_MSG_WARN(qt.py not found)
 else
    AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
-   if test "x$pyqt_ok" = xno ; then
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN(pyqt not found)
-   else
+   if test "x$pyqt_ok" = xyes ; then
       PYQT_ROOT=$PYQTDIR
       PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
    fi
-   AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no)
    if test "x$pyqt_ok" = xno ; then
-      AC_MSG_RESULT(no)
-      AC_MSG_WARN(pyqt not found)
-   else
-      PYQT_INCLUDES="-I$PYQT_SIPS"
+      AC_CHECK_FILE("$PYQTDIR/lib/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
+      if test "x$pyqt_ok" = xyes ; then
+         PYQT_ROOT=$PYQTDIR
+         PYQT_LIBS="-L$PYQTDIR/lib -lqtcmodule"
+      fi
    fi
 
-   AC_SUBST(PYQT_ROOT)
-   AC_SUBST(PYQT_INCLUDES)
-   AC_SUBST(PYQT_LIBS)
-
-   AC_MSG_RESULT(yes)
+   AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=$pyqt_ok,pyqt_ok=no)
+   if test "x$pyqt_ok" = xyes ; then
+      PYQT_INCLUDES="-I$PYQT_SIPS"
+   fi
 fi
 
-PYQT_ROOT=$PYQTDIR
-PYQT_INCLUDES="-I$PYQT_SIPS"
-PYQT_LIBS="-L$PYQTDIR -lqtcmodule"
-
 AC_SUBST(PYQT_ROOT)
 AC_SUBST(PYQT_INCLUDES)
 AC_SUBST(PYUIC)
 AC_SUBST(PYQT_SIPS)
 AC_SUBST(PYQT_LIBS)
 
-
-
 AC_MSG_RESULT(for pyqt: $pyqt_ok)
 
 fi