Fix linking with new mllib.cmxa in libguestfs upstream.

diff --git a/common-rules.mk b/common-rules.mk
index 1f6fd56..f7ef1c8 100644 (file)
--- a/common-rules.mk
+++ b/common-rules.mk
@@ -22,7 +22,7 @@ OCAMLFLAGS = -g -warn-error CDEFLMPSUVYZX-3-24
 if INSTALLED_TEST_HARNESS
 OCAMLLINKPKG  =
 else
-OCAMLLINKPKG  = v2v_test_harness.cmxa
+OCAMLLINKPKG  = mllib.cmxa v2v_test_harness.cmxa -cclib '-lutils -lgnu'
 endif
 
 OCAMLPACKAGES  = -package str,unix,gettext-stub,libvirt,guestfs
@@ -31,7 +31,11 @@ OCAMLLINKPKG  += -linkpkg
 if INSTALLED_TEST_HARNESS
 OCAMLPACKAGES += -package v2v_test_harness
 else
-OCAMLPACKAGES += -I $(TEST_HARNESS_DIR)
+OCAMLPACKAGES += \
+       -I $(TEST_HARNESS_DIR)/../../src/.libs \
+       -I $(TEST_HARNESS_DIR)/../../gnulib/lib/.libs \
+       -I $(TEST_HARNESS_DIR)/../../mllib \
+       -I $(TEST_HARNESS_DIR)
 endif
 
 # XXX FIXME