From: adam <adam>
Date: Fri, 3 Jun 2005 06:40:23 +0000 (+0000)
Subject: sip 4.2 version availibility
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b6ac81af96353f1c0f721f9daf728e4a22a034e1;p=modules%2Fkernel.git

sip 4.2 version availibility
---

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index 84d35f629..15ff4bdce 100644
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -40,6 +40,8 @@ else
            SIP_VERS=new2 ;;
 	 4.1*)
 	   SIP_VERS=v4_1 ;;
+	 4.2*)
+	   SIP_VERS=v4_2 ;;
          *)
            AC_MSG_RESULT(sip version $version not supported)
            SIP_VERS=no ;;
@@ -86,10 +88,10 @@ else
 	SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
     fi
 
-    if test "x$SIP_VERS" = "xv4_1"
+    if test "x$SIP_VERS" = "xv4_1" || test "x$SIP_VERS" = "xv4_2"
         then
         dnl 4.1 install : includes and libs are in python install 
-        AC_MSG_RESULT(4.1 install detected)
+        AC_MSG_RESULT($SIP_VERS install detected)
 	sip_ok=yes
         AC_CHECK_FILE($PYTHON_PREFIX/include/python$PYTHON_VERSION/sip.h,sip_ok=$sip_ok,sip_ok=no)
 	SIP_INCLUDES="${PYTHON_INCLUDES}"