Update for new products (qt3.3.8, pyqt3.17.0 and sip 4.5.2 )

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index e07ead61535ce3655443f7f6d652368ab7344208..f63479879dce7340981677009dc6f17d9a52b3a8 100644 (file)
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.m4
@@ -312,12 +312,16 @@ else
   CXXFLAGS=$CXXFLAGS_old
   LIBS=$LIBS_old
 fi
+# get latest Qt version supported
+QT_VERS=`grep -e "[[[:space:]]]*Qt_[[[:digit:]_]]\+}" ${PYQT_SIPS}/versions.sip | sed -e "s/\(.*\)[[[:space:]]]*\(Qt_[[[:digit:]_]]\+\)}/\2/g"`
+AC_MSG_RESULT(Latest Qt version supported by PyQt is $QT_VERS)
 
 AC_SUBST(PYQT_INCLUDES)
 AC_SUBST(PYQT_LIBS)
 AC_SUBST(PYQT_SIPS)
 AC_SUBST(PYUIC)
 AC_SUBST(PYQT_SIPFLAGS)
+AC_SUBST(QT_VERS)
 
 AC_LANG_RESTORE
 

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index 4cf1aad8ee782b06fcf250fe97aaaadbd79c335d..1aea9c3a2b121c0789a0a0a02181cbd8a3edc0da 100644 (file)
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.m4
@@ -48,9 +48,8 @@ else
    qt_inc_ok=no
    QTINC=""
    AC_CHECK_FILE(${QTDIR}/include/qt3/qglobal.h,QTINC="/qt3",QTINC="")
-   QT_VERS=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
-   AC_MSG_RESULT(Qt version is $QT_VERS)
-   QT_VERS="Qt_"`echo $QT_VERS | sed -e 's%\"%%g' -e 's%\.%_%g'`
+   QT_VERSION=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+   AC_MSG_RESULT(Qt version is $QT_VERSION)
 fi
 
 if  test "x$qt_ok" = "xyes"
@@ -169,9 +168,7 @@ AC_SUBST(QT_INCLUDES)
 AC_SUBST(QT_MT_INCLUDES)
 AC_SUBST(QT_LIBS)
 AC_SUBST(QT_MT_LIBS)
-AC_SUBST(QT_VERS)
-
-AM_CONDITIONAL(IS_QT_3_0_0, [test $QT_VERS == Qt_3_3_3 || test $QT_VERS == Qt_3_3_4 || test $QT_VERS == Qt_3_3_6])
+AC_SUBST(QT_VERSION)
 
 AC_LANG_RESTORE
 

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 540b79a74360a520879b36804540de9d93fab16a..b9aa397fc74b7721b028204ea55db6bc299e0976 100644 (file)
--- a/adm_local/unix/config_files/check_sip.m4
+++ b/adm_local/unix/config_files/check_sip.m4
@@ -48,6 +48,8 @@ else
            SIP_VERS=v4_new ;;
          4.4*)
            SIP_VERS=v4_new ;;
+         4.5*)
+           SIP_VERS=v4_new ;;
          *)
            AC_MSG_RESULT(sip version $version not supported)
            SIP_VERS=unsupported ;;

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index 9363776784e75feb0baddf10f215d2cd4e873753..cf5e4c9985e6b7b98b390a7de97c2e7fe0c0182c 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
@@ -22,14 +22,8 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3
 # Sip flags
-if IS_QT_3_0_0
-SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-else !IS_QT_3_0_0
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-endif
-
 
 ######################
 

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am
index 06df0d1e214a4c9d6b379ad20b63ed2a01471474..4aa3c072b2e64b8079042ae294d8bb625dec1245 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.am
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am
@@ -22,13 +22,8 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3
 # Sip flags
-if IS_QT_3_0_0
-SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-else !IS_QT_3_0_0
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
-endif
 
 # Sip common sources
 SIP_SRC = sipSalomePyQtSalomePyQt.cc \