From f1d10672c7da94f8983b3b5d434e64b127da1242 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 25 Mar 2012 19:35:43 +0100
Subject: df: Avoid a compilation error if libxml2 is not available.

virt_df-domains.o: In function `add_domain':
/home/feeliwood/Downloads/libguestfs-1.17.21/df/domains.c:274: undefined reference to `guestfs___for_each_disk'

guestfs___for_each_disk is only available when libvirt _and_ libxml2
dependencies are available at compile time.

Thanks Tho Huynh.
---
 df/domains.c | 2 +-
 df/main.c    | 4 ++--
 df/virt-df.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/df/domains.c b/df/domains.c
index 04390e38..fd8525aa 100644
--- a/df/domains.c
+++ b/df/domains.c
@@ -36,7 +36,7 @@
 #include "options.h"
 #include "virt-df.h"
 
-#ifdef HAVE_LIBVIRT
+#if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
 
 /* Limit the number of devices we will ever add to the appliance.  The
  * overall limit in current libguestfs is 25: 26 = number of letters
diff --git a/df/main.c b/df/main.c
index fecb3b38..1396e1cb 100644
--- a/df/main.c
+++ b/df/main.c
@@ -260,10 +260,10 @@ main (int argc, char *argv[])
    * the full list of guests and drives, which we add in batches.
    */
   if (drvs == NULL) {
-#ifdef HAVE_LIBVIRT
+#if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
     get_domains_from_libvirt ();
 #else
-    fprintf (stderr, _("%s: compiled without support for libvirt.\n"),
+    fprintf (stderr, _("%s: compiled without support for libvirt and/or libxml2.\n"),
              program_name);
     exit (EXIT_FAILURE);
 #endif
diff --git a/df/virt-df.h b/df/virt-df.h
index 69826581..e31d5a44 100644
--- a/df/virt-df.h
+++ b/df/virt-df.h
@@ -31,7 +31,7 @@ extern int uuid;                /* --uuid */
 extern int df_on_handle (const char *name, const char *uuid, char **devices, int offset);
 
 /* domains.c */
-#ifdef HAVE_LIBVIRT
+#if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
 extern void get_domains_from_libvirt (void);
 #endif
 
-- 
cgit