Libguestfs - Jan 2012 - Some more fixes from building libguestfs for Debian

Here are two more patches that I had missed before.

This fixes...

    configure: error: conditional "INSTALL_DAEMON" was never defined.

... when specifying --disable-daemon
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 499b7a4..3e364b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,9 +263,9 @@ if test "x$enable_daemon" = "xyes"; then
                   [enable installing the daemon under $sbindir
@<:@default=no@:>@])],
                 [],
                 [enable_install_daemon=no])
-        AM_CONDITIONAL([INSTALL_DAEMON],[test
"x$enable_install_daemon" = "xyes"])
         AC_MSG_RESULT([$enable_install_daemon])
 fi
+AM_CONDITIONAL([INSTALL_DAEMON],[test "x$enable_install_daemon" =
"xyes"])
 
 dnl Build the appliance?
 AC_MSG_CHECKING([if we should build the appliance])
-- 
1.7.8.3

---
 resize/Makefile.am   |    2 +-
 sparsify/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resize/Makefile.am b/resize/Makefile.am
index 48240d1..ce9186f 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -39,7 +39,7 @@ SOURCES += \
 
 # Note this list must be in dependency order.
 OBJECTS = \
-	../fish/guestfish-progress.o \
+	$(top_builddir)/fish/guestfish-progress.o \
 	progress_c.o \
 	utils.cmx \
 	progress.cmx \
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index 8d1ddc4..b33e121 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -38,7 +38,7 @@ SOURCES += \
 
 # Note this list must be in dependency order.
 OBJECTS = \
-	../fish/guestfish-progress.o \
+	$(top_builddir)/fish/guestfish-progress.o \
 	progress_c.o \
 	utils.cmx \
 	progress.cmx \
@@ -49,7 +49,7 @@ bin_SCRIPTS = virt-sparsify
 # -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 unix -I $(top_builddir)/src/.libs -I ../ocaml
+OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I
$(top_builddir)/ocaml
 
 OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
 OCAMLOPTFLAGS = $(OCAMLCFLAGS)
-- 
1.7.8.3

On Mon, Jan 23, 2012 at 11:30:19PM +0100, Hilko Bengen
wrote:
> Here are two more patches that I had missed before.
ACK to both, please push them to the master branch.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top