From: nri <nri@opencascade.com>
Date: Thu, 10 Jul 2003 12:54:43 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: V1_4_0~48
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1b76b7f3c6bc381fb5e41b9261296392365ec572;p=modules%2Fkernel.git

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 cf40d464e..d66f84e6e 100644
--- 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