From 3a09d409df89d72ca476ed829739b4aacf08735d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 2 Oct 2009 16:09:19 +0200
Subject: [PATCH libguestfs] 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 <
http://bugzilla.redhat.com/526917>.
---
ocaml/examples/Makefile.am | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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
--
1.6.5.rc2.177.ga9dd6