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 0a087529c7050fc8a7ffa83ec9d06e48e53d6ec0..fae498eb0fad16ac183c770e998217349ec3d2fb 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.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index 942c34a4a736e0a8ad87f68efec0060f87b0a04e..9053a4d064dd58568060f38b400983a1a045cd97 100644 (file)
--- 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 4061878909223450bf9c2d30793566b3ab2136ec..3f0834c8f2011e6a3dc8e89cae9f0a0baacf1f86 100644 (file)
--- 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)