1 From b470270d44e8dc37a2417c1157eefdd9c3d65dd1 Mon Sep 17 00:00:00 2001
2 From: "Richard W.M. Jones" <rjones@redhat.com>
3 Date: Wed, 24 Mar 2021 18:30:45 +0000
4 Subject: [PATCH 6/7] builder: Use correct ounit2 module.
6 Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342
8 builder/Makefile.am | 2 +-
9 m4/guestfs-ocaml.m4 | 10 +++++-----
10 2 files changed, 6 insertions(+), 6 deletions(-)
12 diff --git a/builder/Makefile.am b/builder/Makefile.am
13 index 4d2e07843c..f49a3b0aaa 100644
14 --- a/builder/Makefile.am
15 +++ b/builder/Makefile.am
16 @@ -192,7 +192,7 @@ if HAVE_OCAML_PKG_GETTEXT
17 OCAMLPACKAGES += -package gettext-stub
19 if HAVE_OCAML_PKG_OUNIT
20 -OCAMLPACKAGES_TESTS += -package oUnit
21 +OCAMLPACKAGES_TESTS += -package ounit2
25 diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
26 index a2f6cada9f..f5ac7eff29 100644
27 --- a/m4/guestfs-ocaml.m4
28 +++ b/m4/guestfs-ocaml.m4
29 @@ -105,7 +105,7 @@ if test "x$OCAML_PKG_guestfs" = "xno"; then
37 AS_IF([test "x$OCAMLC" != "xno"],[
38 @@ -117,11 +117,11 @@ AS_IF([test "x$OCAMLC" != "xno"],[
40 GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml])
42 - AC_CHECK_OCAML_PKG(oUnit)
43 + AC_CHECK_OCAML_PKG(ounit2)
45 # oUnit >= 2 is required, so check that it has OUnit2.
46 - if test "x$OCAML_PKG_oUnit" != "xno"; then
47 - AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+oUnit])
48 + if test "x$OCAML_PKG_ounit2" != "xno"; then
49 + AC_CHECK_OCAML_MODULE(ounit_is_v2,[OUnit.OUnit2],OUnit2,[+ounit2])
52 # Check if we have the 'Bytes' module. If not (OCaml < 4.02) then
53 @@ -141,7 +141,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[
54 AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT],
55 [test "x$OCAML_PKG_gettext" != "xno"])
56 AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT],
57 - [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"])
58 + [test "x$OCAML_PKG_ounit2" != "xno" && test "x$ounit_is_v2" != "xno"])
60 AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no])
61 AM_CONDITIONAL([HAVE_OCAML_GETTEXT],