From 418842518bf856144e2ab33abb6de417d1b60753 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 4 Jun 2011 13:13:11 +0100
Subject: [PATCH] Ubuntu: Fix compilation of virt-resize if old libguestfs
 already installed.

---
 resize/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resize/Makefile.am b/resize/Makefile.am
index f3e6aff..8418cb4 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -41,7 +41,11 @@ OBJECTS = \
 
 bin_SCRIPTS = virt-resize
 
-OCAMLPACKAGES = -package pcre -I ../ocaml
+# -I $(top_builddir)/src/.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 pcre -I $(top_builddir)/src/.libs -I ../ocaml
+
 OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
 
-- 
1.8.3.1