Don't use guestfs package

This avoids build errors:
,----
| ocamlfind: Package `guestfs' not found
`----

Apparently, ocamlfind only looks for the guestfs package in
system-wide preconfigured search paths, not in paths specified with -I.

Gbp-Pq: Name Don-t-use-guestfs-package.patch

diff --git a/common/mlcustomize/Makefile.am b/common/mlcustomize/Makefile.am
index cd7d8971ee067a401217f0a16ca54d1678de341c..2beb147f98e63829a881046af9f967f74ef823fa 100644 (file)
--- a/common/mlcustomize/Makefile.am
+++ b/common/mlcustomize/Makefile.am
@@ -82,7 +82,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
 XOBJECTS = $(BOBJECTS:.cmo=.cmx)
 
 OCAMLPACKAGES = \
-       -package str,unix,guestfs \
+       -package str,unix \
        -I $(top_builddir)/common/utils/.libs \
        -I $(top_builddir)/ocaml \
        -I $(top_builddir)/common/mlstdutils \

diff --git a/common/mlprogress/Makefile.am b/common/mlprogress/Makefile.am
index 3f3424e04e1817ec80b43f707e489095c48e09bc..e24c62f8131038aea76d21a6e46fb74578f239dc 100644 (file)
--- a/common/mlprogress/Makefile.am
+++ b/common/mlprogress/Makefile.am
@@ -67,7 +67,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
 XOBJECTS = $(BOBJECTS:.cmo=.cmx)
 
 OCAMLPACKAGES = \
-       -package str,unix,guestfs \
+       -package str,unix \
        -I $(top_builddir)/common/utils/.libs \
        -I $(top_builddir)/ocaml \
        -I $(builddir)

diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am
index 343fd92451fab7a9f47684b732c4ca3b1ee665d7..c03ddfdb514bc49d6b4256f02ace54259c327681 100644 (file)
--- a/common/mltools/Makefile.am
+++ b/common/mltools/Makefile.am
@@ -114,7 +114,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
 XOBJECTS = $(BOBJECTS:.cmo=.cmx)
 
 OCAMLPACKAGES = \
-       -package str,unix,guestfs \
+       -package str,unix \
        -I $(top_builddir)/common/utils/.libs \
        -I $(top_builddir)/gnulib/lib/.libs \
        -I $(top_builddir)/ocaml \

diff --git a/common/mlvisit/Makefile.am b/common/mlvisit/Makefile.am
index a20cbc9df121e959ce0f2365fac8084d09cc0471..fc0e484a49423ebe84bbfd771f2e9a7dbe9c0858 100644 (file)
--- a/common/mlvisit/Makefile.am
+++ b/common/mlvisit/Makefile.am
@@ -68,7 +68,7 @@ BOBJECTS = $(SOURCES_ML:.ml=.cmo)
 XOBJECTS = $(BOBJECTS:.cmo=.cmx)
 
 OCAMLPACKAGES = \
-       -package str,unix,guestfs \
+       -package str,unix \
        -I $(top_builddir)/common/mlutils \
        -I $(top_builddir)/ocaml \
        -I $(top_builddir)/common/utils/.libs \