On Tue, Jan 17, 2012 at 03:48:43PM +0000, Matthew Booth wrote:
---
run.in | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/run.in b/run.in
index 7cef715..afb2b97 100755
--- a/run.in
+++ b/run.in
@@ -37,19 +37,25 @@ b=@abs_builddir@
export TMPDIR="$b"
# Set local environment relative to this script.
+library_path="$b/src/.libs:$b/gobject/.libs"
if [ -z "$LD_LIBRARY_PATH" ]; then
- LD_LIBRARY_PATH="$b/src/.libs"
+ LD_LIBRARY_PATH=$library_path
Quoting?
else
- LD_LIBRARY_PATH="$b/src/.libs:$LD_LIBRARY_PATH"
+ LD_LIBRARY_PATH="$library_path:$LD_LIBRARY_PATH"
fi
if [ -z "$PERL5LIB" ]; then
PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch"
else
PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
fi
+if [ -z "$GI_TYPELIB_PATH" ]; then
+ GI_TYPELIB_PATH="$b/gobject"
+else
+ GI_TYPELIB_PATH="$b/gobject:$GI_TYPELIB_PATH"
+fi
LIBGUESTFS_PATH="$b/appliance"
-export LD_LIBRARY_PATH PERL5LIB LIBGUESTFS_PATH
+export LD_LIBRARY_PATH PERL5LIB GI_TYPELIB_PATH LIBGUESTFS_PATH
This seems like it is two unrelated patches. If it is made atomic,
and the quoting issue above fixed, then ACK (to both).
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages.
http://libguestfs.org