From: jfa <jfa@opencascade.com>
Date: Thu, 15 Mar 2007 06:56:37 +0000 (+0000)
Subject: A patch by Paul RASCLE for ASTER cluster (64 bits).
X-Git-Tag: V3_2_6pre2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6f153f8c35721a3d444be31b7f43d8edb511a6df;p=modules%2Fgui.git

A patch by Paul RASCLE for ASTER cluster (64 bits).
---

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 0a087529c..fae498eb0 100644
--- 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.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index 942c34a4a..9053a4d06 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
@@ -40,6 +40,10 @@ ifeq ($(QT_VERS),Qt_3_3_6)
 QT_VERS = Qt_3_3_0
 endif
 
+ifeq ($(QT_VERS),Qt_3_3_7)
+QT_VERS = Qt_3_3_0
+endif
+
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
 
diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index 406187890..3f0834c8f 100644
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -38,6 +38,9 @@ endif
 ifeq ($(QT_VERS),Qt_3_3_6)
 QT_VERS = Qt_3_3_0
 endif
+ifeq ($(QT_VERS),Qt_3_3_7)
+QT_VERS = Qt_3_3_0
+endif
 
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)