PR: merge branch CCAR_br1

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index 7808c3e6708819f22a55ec1c5d182d1259b1f2b7..a6714b238c0ac91e9fc98009a315c2715e770f82 100644 (file)
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -17,9 +17,38 @@ then
     sip_ok=no
     AC_MSG_RESULT(sip not in PATH variable)
 else
+    version=`sip -V`
+    case "$version" in
+         3.2*)
+           sip_vers=old ;;
+         3.3*)
+           sip_vers=old ;;
+         3.4*)
+           sip_vers=new ;;
+         3.5*)
+           sip_vers=new ;;
+           *)
+           sip_vers=no ;;
+    esac
+
+    sip_ok=no
+
+    if test "x$sip_vers" = "xold"
+    then
+        sip_ok=yes
        SIP_ROOT="$SIPDIR"
        SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}"
        SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -L${SIPDIR} -lsip"
+    fi
+
+    if test "x$sip_vers" = "xnew"
+    then
+        sip_ok=yes
+       SIP_ROOT="$SIPDIR"
+       SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
+       SIP_LIBS="-L${SIPDIR}/lib -lsip"
+    fi
+
 fi
 
 AC_SUBST(SIP)