NRI : Merge from V1_2.

diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4
index cf40d464e0925ffe7e7f7c8ee263c31358f4bb8f..d66f84e6e2813bba7fdbd610e38d00f8020ecced 100644 (file)
--- a/salome_adm/unix/config_files/check_sip.m4
+++ b/salome_adm/unix/config_files/check_sip.m4
@@ -44,10 +44,16 @@ else
 
     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"
+       if test -z ${SIPDIR}/include ; then
+          sip_ok=yes
+          SIP_ROOT="$SIPDIR"
+          SIP_INCLUDES="${PYTHON_INCLUDES} -I${SIPDIR}/include"
+          SIP_LIBS="-L${SIPDIR}/lib -lsip"
+       else
+          SIP_ROOT="$SIPDIR"
+          SIP_INCLUDES="-I${SIPDIR}"
+          SIP_LIBS="-L${SIPDIR} -lsip"
+        fi
     fi
 
 fi