From a468e8b92f495b8f97105edf40ff7675b02462ab Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Jul 2016 14:22:54 +0100
Subject: [PATCH] p2v: Set LD_LIBRARY_PATH for "remote" virt-v2v process.

In previous commit c5f12e47e4e0dc7846897cad3184ac0892f51ef8 we changed
the PATH environment variable to run the locally built virt-v2v, not
the system-installed virt-v2v.

However this meant that we were running the locally built virt-v2v
against the system-installed libguestfs.so.0.  We also need to set
LD_LIBRARY_PATH.

Fixes commit c5f12e47e4e0dc7846897cad3184ac0892f51ef8.
---
 p2v/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/p2v/Makefile.am b/p2v/Makefile.am
index 0067d5aad..8136b90b1 100644
--- a/p2v/Makefile.am
+++ b/p2v/Makefile.am
@@ -298,7 +298,7 @@ test-virt-p2v-pxe.sshd_config: test-virt-p2v-pxe.sshd_config.in
 
 test-virt-p2v-pxe.authorized_keys: test-virt-p2v-pxe.id_rsa.pub $(top_builddir)/run
 	rm -f $@ $@-t
-	$(top_builddir)/run sh -c 'echo -n environment=\"PATH=$$PATH\"\ ' > $@-t
+	$(top_builddir)/run sh -c 'echo -n environment=\"PATH=$$PATH\",environment=\"LD_LIBRARY_PATH=$(abs_top_builddir)/src/.libs\"\ ' > $@-t
 	cat $< >> $@-t
 	mv $@-t $@