This commit was generated by cvs2git to create tag 'V1_4_0b2'.

[modules/kernel.git] / salome_adm / unix / config_files / check_pyqt.m4

diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4
index eb4e3fff74779fe8fb10304dd410c86e75ca2a2a..e0d320185963199119d40a40229934e3bad147aa 100644 (file)
--- a/salome_adm/unix/config_files/check_pyqt.m4
+++ b/salome_adm/unix/config_files/check_pyqt.m4
@@ -5,9 +5,28 @@ AC_REQUIRE([CHECK_PYTHON])dnl
 
 AC_CHECKING(for pyqt)
 
-pyqt_ok=yes
+pyqt_ok=no
 
-dnl were is pyqt ?
+PYTHON_SITE_PACKPYQT=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+AC_CHECK_FILES($PYTHON_SITE_PACKPYQT/qt.py $PYTHON_SITE_PACKPYQT/libqtcmodule.so,pyqt_ok=yes,pyqt_ok=no)
+if test "x$pyqt_ok" = xyes ; then
+   PYQT_INCLUDES="-I $PYTHON_SITE_PACKPYQT"
+   PYQT_LIBS="-L$PYTHON_SITE_PACKPYQT -lqtcmodule"
+fi
+
+if test "x$pyqt_ok" = xyes ; then
+   AC_CHECK_FILES(/usr/share/sip/qt/qtmod.sip,pyqt_ok=yes,pyqt_ok=no)
+   if test "x$pyqt_ok" = xyes ; then
+      PYQT_SIPS="/usr/share/sip/qt"
+   fi
+   AC_SUBST(PYQT_INCLUDES)
+   AC_SUBST(PYQT_LIBS)
+   AC_SUBST(PYQT_SIPS)
+   AC_MSG_RESULT(yes)
+else
+
+  pyqt_ok=yes
+  dnl were is pyqt ?
 
 AC_ARG_WITH(pyqt,
     [  --with-pyqt=DIR      root directory path to PyQt installation ],
@@ -53,48 +72,42 @@ 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
 ])dnl
 dnl