From: Jim Meyering <meyering@redhat.com>
Date: Fri, 2 Oct 2009 14:09:19 +0000 (+0200)
Subject: build: fix compile error
X-Git-Tag: 1.0.73~6
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=dde81c0c0e4d6517781392310768dfe8fe4392fe;ds=sidebyside

build: fix compile error

Link demo scripts with just-build library, not the installed one.
* ocaml/examples/Makefile.am (OCAMLFINDFLAGS): New variable.
(lvs, viewer): Use it.
This fix is based on a suggestion from Rich Jones.
This addresses RHBZ#526917.
---

diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index b516647..3b9901a 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -6,15 +6,18 @@ if HAVE_OCAML
 
 noinst_SCRIPTS = lvs
 
+OCAMLFINDFLAGS = -ccopt '-L $(top_builddir)/src/.libs'
+
 lvs:	lvs.ml
-	$(OCAMLFIND) ocamlopt -warn-error A -I .. mlguestfs.cmxa $< -o $@
+	$(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) \
+          -warn-error A -I .. mlguestfs.cmxa $< -o $@
 
 if BUILD_OCAML_VIEWER
 
 noinst_SCRIPTS += viewer
 
 viewer: throbber.ml xmllight_loader.mli xmllight_loader.ml viewer.ml
-	ocamlducefind opt \
+	ocamlducefind opt $(OCAMLFINDFLAGS) \
 	  -warn-error A \
 	  -thread \
 	  -package libvirt,lablgtk2,extlib,xml-light,ocamlduce,threads -I .. \
@@ -30,4 +33,4 @@ throbber.ml: Throbber.png Throbber.gif
 
 endif
 
-endif
\ No newline at end of file
+endif