X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_adm%2Funix%2Fconfig_files%2Fcheck_sip.m4;h=245f2382ee200c658920e7c611dfef42445ea64a;hb=842cabed138075a05c8f69aa46b653b08efa2c61;hp=bb0f4527826485dc8bfb3fc9ea71fcd49770c133;hpb=2d9355adaaad12ef4c16a5a37c551f1fca4caba9;p=modules%2Fkernel.git

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index bb0f45278..245f2382e 100644
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -2,6 +2,7 @@ dnl Copyright (C) 2003  CEA/DEN, EDF R&D
 
 AC_DEFUN([CHECK_SIP],[
 AC_REQUIRE([CHECK_PYTHON])dnl
+AC_REQUIRE([CHECK_QT])dnl
 
 sip_ok=yes
 
@@ -13,24 +14,153 @@ AC_ARG_WITH(sip,
       AC_PATH_PROG(SIP, sip)
     ])
 
-if test "x$SIP" = "x"
-then
+if test "x$SIP" = "x" ; 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`
+    AC_MSG_RESULT(sip version is $version)
+    case "$version" in
+         3.2*)
+           SIP_VERS=v3_old ;;
+         3.3*)
+           SIP_VERS=v3_old ;;
+         3.4*)
+           SIP_VERS=v3_old ;;
+         3.5*)
+           SIP_VERS=v3_old ;;
+         3.6*)
+           SIP_VERS=v3_old ;;
+         3.7*)
+           SIP_VERS=v3_old ;;
+         3.8*)
+           SIP_VERS=v3_old ;;
+         3.9*)
+           SIP_VERS=v3_old ;;
+         3.10*)
+           SIP_VERS=v3_new ;;
+         4.1*)
+           SIP_VERS=v4_old ;;
+         4.2*)
+           SIP_VERS=v4_new ;;
+         *)
+           AC_MSG_RESULT(sip version $version not supported)
+           SIP_VERS=unsupported ;;
+    esac
+
+    sip_ok=no
+    dnl Search sip.h file
+    if test "x$SIPDIR" != "x" ; then
+        dnl look for sip.h in ${SIPDIR}
+        AC_CHECK_FILE(${SIPDIR}/sip.h,sip_ok=yes,sip_ok=no)
+	if test "x$sip_ok" == "xyes" ; then
+	    SIP_INCLUDES="-I${SIPDIR}"
+	fi
+        if test "x$sip_ok" == "xno" ; then
+            dnl look for sip.h in ${SIPDIR}/include/python${PYTHON_VERSION}
+	    if test -d ${SIPDIR}/include/python${PYTHON_VERSION} ; then
+		AC_CHECK_FILE(${SIPDIR}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no)
+      	        if test "x$sip_ok" == "xyes" ; then
+	            SIP_INCLUDES="-I${SIPDIR}/include/python${PYTHON_VERSION}"
+		fi
+	    fi
+	fi
+    fi
+    if test "x$sip_ok" == "xno" ; then
+        dnl look for sip.h in ${PYTHON_PREFIX}/include/python${PYTHON_VERSION}
+	if test -d ${PYTHON_PREFIX}/include/python${PYTHON_VERSION} ; then
+            AC_CHECK_FILE(${PYTHON_PREFIX}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no)
+	    if test "x$sip_ok" == "xyes" ; then
+	        SIP_INCLUDES="${PYTHON_INCLUDES}"
+            fi
+	fi
+    fi
+    if test "x$sip_ok" == "xno" ; then
+        dnl look for sip.h in /usr/include/python${PYTHON_VERSION}
+	if test -d /usr/include/python${PYTHON_VERSION} ; then
+            AC_CHECK_FILE(/usr/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no)
+	    if test "x$sip_ok" == "xyes" ; then
+	        SIP_INCLUDES="/usr/include/python${PYTHON_VERSION}"
+            fi
+	fi
+    fi
+	
+    dnl Search (lib)sip.so file
+    sip_lib_ok=no
+    if test "x$SIPDIR" != "x" ; then
+        dnl look for (lib)sip.so in ${SIPDIR}
+        AC_CHECK_FILE(${SIPDIR}/libsip.so,sip_lib_ok=yes,sip_lib_ok=no)
+	if test "x$sip_lib_ok" == "xyes" ; then
+            if test "x${SIPDIR}" = "x/usr/lib"
+            then
+              SIP_LIBS="-lsip"
+            else
+              SIP_LIBS="-L${SIPDIR} -lsip"
+            fi
 	else
-		SIP_INCLUDES="${PYTHON_INCLUDES}"
-		SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+	    AC_CHECK_FILE(${SIPDIR}/sip.so,sip_lib_ok=yes,sip_lib_ok=no)
+	    if test "x$sip_lib_ok" == "xyes" ; then
+              if test "x${SIPDIR}" = "x/usr/lib"
+              then
+                SIP_LIBS=""
+              else
+                SIP_LIBS="-L${SIPDIR}"
+              fi
+	    fi
+	fi
+
+        if test "x$sip_lib_ok" == "xno" ; then
+            dnl look for (lib)sip.so in ${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages
+	    if test -d ${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages ; then
+		AC_CHECK_FILE(${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no)
+      	        if test "x$sip_lib_ok" == "xyes" ; then
+	            SIP_LIBS="-L${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+	        else
+	            AC_CHECK_FILE(${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no)
+	            if test "x$sip_lib_ok" == "xyes" ; then
+	                SIP_LIBS="-L${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages"
+	            fi
+		fi
+	    fi
+	fi
+    fi
+    if test "x$sip_lib_ok" == "xno" ; then
+        dnl look for (lib)sip.so in ${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages
+	if test -d ${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages ; then
+            AC_CHECK_FILE(${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no)
+	    if test "x$sip_lib_ok" == "xyes" ; then
+	        SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip"
+	    else
+	        AC_CHECK_FILE(${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no)
+                if test "x$sip_lib_ok" == "xyes" ; then
+	            SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"
+                fi
+	    fi
+	fi
+    fi
+    if test "x$sip_lib_ok" == "xno" ; then
+        dnl look for (lib)sip.so in /usr/lib/python${PYTHON_VERSION}/site-packages
+	if test -d /usr/lib/python${PYTHON_VERSION}/site-packages ; then
+            AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no)
+	    if test "x$sip_lib_ok" == "xyes" ; then
+	        SIP_LIBS="-L$/usr/lib/python${PYTHON_VERSION}/site-packages -lsip"
+	    else
+	        AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no)
+                if test "x$sip_lib_ok" == "xyes" ; then
+	            SIP_LIBS="-L/usr/lib/python${PYTHON_VERSION}/site-packages"
+	        fi
+            fi
 	fi
+    fi
+    if test "x$sip_lib_ok" == "xno" ; then
+        sip_ok=no
+    fi
 fi
 
 AC_SUBST(SIP)
 AC_SUBST(SIP_INCLUDES)
 AC_SUBST(SIP_LIBS)
+AC_SUBST(SIP_VERS)
 
 AC_MSG_RESULT(for sip: $sip_ok)