Integrate fix from Erwan ADAM (support sip 4.3, 4.4; set SIPDIR correctly if it is...

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 83af9a907589fbcec47688ccca5c3218a82b25c9..0a087529c7050fc8a7ffa83ec9d06e48e53d6ec0 100644 (file)
--- 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