From: vsr <vsr@opencascade.com>
Date: Mon, 23 Oct 2006 11:03:44 +0000 (+0000)
Subject: Integrate fix from Erwan ADAM (support sip 4.3, 4.4; set SIPDIR correctly if it is... 
X-Git-Tag: V3_2_3pre1~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4db471321f42f4595c049d13cf13be0ce11aef45;p=modules%2Fgui.git

Integrate fix from Erwan ADAM (support sip 4.3, 4.4; set SIPDIR correctly if it is not set in environment)
---

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 83af9a907..0a087529c 100644
--- a/adm_local/unix/config_files/check_sip.m4
+++ b/adm_local/unix/config_files/check_sip.m4
@@ -44,11 +44,20 @@ else
            SIP_VERS=v4_old ;;
          4.2*)
            SIP_VERS=v4_new ;;
+         4.3*)
+           SIP_VERS=v4_new ;;
+         4.4*)
+           SIP_VERS=v4_new ;;
          *)
            AC_MSG_RESULT(sip version $version not supported)
            SIP_VERS=unsupported ;;
     esac
 
+    if test "x$SIPDIR" = "x" ; then
+        SIPDIR=`dirname $SIP`
+        SIPDIR=`dirname $SIPDIR`
+    fi
+
     sip_ok=no
     dnl Search sip.h file
     if test "x$SIPDIR" != "x" ; then