Fix parted check & disable storage driver if daemon isn't present

diff --git a/ChangeLog b/ChangeLog
index a2c7264fe7e190c765d067b6011a6c752d555cf5..b36217f9fc0ea51841078e9ea555462404bff8e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 29 15:17:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/libvirt.c: Don't register storage API if daemon is
+       disabled.
+       * configure.in: Fix check for parted to deal with missing
+       devel package correctly
+
 Thu May 29 15:17:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/conf.c, src/conf.h, src/qemu_conf.c, src/qemu_driver.c,

diff --git a/configure.in b/configure.in
index e8d3f065debf56ed431f3fbb7a1d3a3570a3ea7e..24d8d8629da2d18ebe145fef0219a9d3b8ffb5a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -745,9 +745,13 @@ LIBPARTED_CFLAGS=
 LIBPARTED_LIBS=
 if test "$with_storage_disk" = "yes" -o "$with_storage_disk" = "check"; then
   AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin])
-  if test -z "$PARTED" ; then with_storage_disk=no ; fi
+  if test -z "$PARTED" ; then
+    with_storage_disk=no
+    PARTED_FOUND=no
+  else
+    PARTED_FOUND=yes
+  fi
 
-  PARTED_FOUND=yes
   if test "$with_storage_disk" != "no" -a "x$PKG_CONFIG" != "x" ; then
     PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], [PARTED_FOUND=no])
   fi

diff --git a/src/libvirt.c b/src/libvirt.c
index e18cca724ff3b12f0b4a8d45bea6ee75480a7e9f..d0d5473001a9df4dce18838688e1ddf2fb24d266 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -283,7 +283,9 @@ virInitialize(void)
 #ifdef WITH_LXC
     if (lxcRegister() == -1) return -1;
 #endif
+#ifdef WITH_LIBVIRTD
     if (storageRegister() == -1) return -1;
+#endif
 #ifdef WITH_REMOTE
     if (remoteRegister () == -1) return -1;
 #endif