From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 4 Jun 2011 12:13:11 +0000 (+0100)
Subject: Ubuntu: Fix compilation of virt-resize if old libguestfs already installed.
X-Git-Tag: 1.10.4~21
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8177e1a912894fd149156c4935f7efdb7b51dbc4;p=libguestfs.git

Ubuntu: Fix compilation of virt-resize if old libguestfs already installed.
(cherry picked from commit 418842518bf856144e2ab33abb6de417d1b60753)
---

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)