From 3b1ed4c9bcebc87fe0936655df6aa40bce5608fa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Mar 2021 08:25:59 +0000 Subject: [PATCH] build: Use correct ounit2 OCaml module. Also update common module to get the same fix. --- common | 2 +- m4/guestfs-ocaml.m4 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common b/common index ca8a16a92..7c39a06fe 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ca8a16a9264f1300c2dc72d1c7cbe5dcfd2b0e52 +Subproject commit 7c39a06fe326d0e9f3c10098f9ae42a21d12dbf9 diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index 18f95c22b..4b8a44dee 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -153,7 +153,7 @@ AS_IF([test "x$have_Hivex_OPEN_UNSAFE" = "xno"],[ AC_SUBST([HIVEX_OPEN_UNSAFE_FLAG]) OCAML_PKG_gettext=no -OCAML_PKG_oUnit=no +OCAML_PKG_ounit2=no ounit_is_v2=no have_Bytes_module=no AS_IF([test "x$OCAMLC" != "xno"],[ @@ -165,11 +165,11 @@ AS_IF([test "x$OCAMLC" != "xno"],[ GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml]) - AC_CHECK_OCAML_PKG(oUnit) + AC_CHECK_OCAML_PKG(ounit2) # oUnit >= 2 is required, so check that it has OUnit2. - if test "x$OCAML_PKG_oUnit" != "xno"; then - AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+oUnit]) + if test "x$OCAML_PKG_ounit2" != "xno"; then + AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2]) fi # Check if we have the 'Bytes' module. If not (OCaml < 4.02) then @@ -189,7 +189,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAML_PKG_gettext" != "xno"]) AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], - [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) + [test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"]) AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT],