From 5c4bd181b6e83ec8796e8aaa0f339ccc23222009 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 30 Aug 2018 18:43:53 +0200
Subject: [PATCH] v2v: test-harness: stop using the external ocaml-libvirt

Use the embedded copy.
---
 Makefile.am                  | 2 --
 v2v/test-harness/Makefile.am | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 259e5cd93..b5f33f62b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,10 +174,8 @@ SUBDIRS += sparsify
 SUBDIRS += sysprep
 if HAVE_LIBVIRT
 SUBDIRS += v2v
-if HAVE_OCAML_PKG_LIBVIRT
 SUBDIRS += v2v/test-harness
 endif
-endif
 if HAVE_FUSE
 SUBDIRS += dib
 endif
diff --git a/v2v/test-harness/Makefile.am b/v2v/test-harness/Makefile.am
index cebee9914..2c53f538f 100644
--- a/v2v/test-harness/Makefile.am
+++ b/v2v/test-harness/Makefile.am
@@ -31,13 +31,12 @@ SOURCES_ML = \
 	v2v_test_harness.ml
 
 if HAVE_OCAML
-if HAVE_OCAML_PKG_LIBVIRT
 
 # -I $(top_builddir)/lib/.libs is a hack which forces corresponding -L
 # option to be passed to gcc, so we don't try linking against an
 # installed copy of libguestfs.
 OCAMLPACKAGES = \
-	-package str,unix,libvirt \
+	-package str,unix \
 	-I $(top_builddir)/common/utils/.libs \
 	-I $(top_builddir)/lib/.libs \
 	-I $(top_builddir)/gnulib/lib/.libs \
@@ -45,6 +44,7 @@ OCAMLPACKAGES = \
 	-I $(top_builddir)/common/mlstdutils \
 	-I $(top_builddir)/common/mlxml \
 	-I $(top_builddir)/common/mltools \
+	-I $(top_builddir)/common/mllibvirt \
 	-I $(top_builddir)/v2v
 
 OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
@@ -130,7 +130,6 @@ stamp-virt-v2v-test-harness.pod: virt-v2v-test-harness.pod
 	$(top_builddir)/ocaml-dep.sh -I .. $^
 -include .depend
 
-endif
 endif
 
 .PHONY: docs