This commit was generated by cvs2git to create tag 'V1_4_0b1'.

[modules/kernel.git] / salome_adm / unix / config_files / check_sip.m4

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index bb0f4527826485dc8bfb3fc9ea71fcd49770c133..feecb0dde36a765e526746b4d7181d88e4fb6227 100644 (file)
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -18,14 +18,45 @@ then
     sip_ok=no
     AC_MSG_RESULT(sip not in PATH variable)
 else
-       if test $SIPDIR ; then
-               SIP_ROOT="$SIPDIR"
-               SIP_INCLUDES="-I${SIPDIR}"
-               SIP_LIBS="-L${SIPDIR} -lsip"
+    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
+       if test -d ${SIPDIR}/include ; then
+          sip_ok=yes
+          SIP_ROOT="$SIPDIR"
+          SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
+          SIP_LIBS="-L${SIPDIR}/lib -lsip"
        else
-               SIP_INCLUDES="${PYTHON_INCLUDES}"
-               SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
-       fi
+          sip_ok=yes
+          SIP_ROOT="$SIPDIR"
+          SIP_INCLUDES="-I${SIPDIR}"
+          SIP_LIBS="-L${SIPDIR} -lsip"
+        fi
+    fi
+
 fi
 
 AC_SUBST(SIP)