[Pkg-libvirt-commits] [libguestfs] 01/12: configure: Ensure oUnit version >= 2 before using it.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag upstream/1.29.42
in repository libguestfs.

commit 46bc79109bb51cfb656863da3635f1c8da5f6412
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon May 11 20:44:22 2015 +0100

    configure: Ensure oUnit version >= 2 before using it.
    
    This fixes commit e12c0dfe1f0cbbc01f8f913ac2a402b37b086029.
---
 configure.ac | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/configure.ac b/configure.ac
index 6c6d0a9..5ff151b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1146,6 +1146,19 @@ AS_IF([test "x$OCAMLC" != "xno"],[
 
     AC_CHECK_OCAML_PKG(libvirt)
     AC_CHECK_OCAML_PKG(oUnit)
+
+    # oUnit >= 2 is required.  If it's not this version, discard.
+    if test "x$OCAML_PKG_oUnit" != "xno"; then
+        AC_MSG_CHECKING([for oUnit version 2 or above])
+        ounit_version=`$OCAMLFIND query oUnit -format '%v'`
+        ounit_version_major=`echo $ounit_version | $AWK -F. '{print $1}'`
+        if test $ounit_version_major -ge 2; then
+            AC_MSG_RESULT([yes])
+        else
+            AC_MSG_RESULT([no])
+            OCAML_PKG_oUnit=no
+        fi
+    fi
 ])
 AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT],
     [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno"])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git