From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
configure.ac | 4 ++--
src/Makefile.am | 6 +++---
src/lxc/lxc_container.c | 8 ++++----
src/storage/storage_backend_fs.c | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 065c135..b6a19b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2241,9 +2241,9 @@ if test "x$with_libblkid" = "xyes" || test "x$with_libblkid" = "xcheck"; then
fi
if test "x$with_libblkid" = "xyes"; then
- AC_DEFINE([HAVE_LIBBLKID], [1], [libblkid is present])
+ AC_DEFINE([WITH_LIBBLKID], [1], [libblkid is present])
fi
-AM_CONDITIONAL([HAVE_LIBBLKID], [test "x$with_libblkid" = "xyes"])
+AM_CONDITIONAL([WITH_LIBBLKID], [test "x$with_libblkid" = "xyes"])
AC_ARG_WITH([qemu-user],
AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]),
diff --git a/src/Makefile.am b/src/Makefile.am
index bbf9e72..4beeed9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -904,7 +904,7 @@ libvirt_driver_lxc_impl_la_CFLAGS = \
$(LIBNL_CFLAGS) \
-I$(top_srcdir)/src/conf $(AM_CFLAGS)
libvirt_driver_lxc_impl_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS)
-if HAVE_LIBBLKID
+if WITH_LIBBLKID
libvirt_driver_lxc_impl_la_CFLAGS += $(BLKID_CFLAGS)
libvirt_driver_lxc_impl_la_LIBADD += $(BLKID_LIBS)
endif
@@ -1081,7 +1081,7 @@ endif
if WITH_SECDRIVER_APPARMOR
libvirt_driver_storage_impl_la_LIBADD += $(APPARMOR_LIBS)
endif
-if HAVE_LIBBLKID
+if WITH_LIBBLKID
libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS)
libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS)
endif
@@ -1668,7 +1668,7 @@ libvirt_lxc_CFLAGS = \
-I$(top_srcdir)/src/conf \
$(AM_CFLAGS) \
$(LIBNL_CFLAGS)
-if HAVE_LIBBLKID
+if WITH_LIBBLKID
libvirt_lxc_CFLAGS += $(BLKID_CFLAGS)
libvirt_lxc_LDADD += $(BLKID_LIBS)
endif
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 37cf3d5..0d8c59a 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -49,7 +49,7 @@
# include <cap-ng.h>
#endif
-#if HAVE_LIBBLKID
+#if WITH_LIBBLKID
# include <blkid/blkid.h>
#endif
@@ -793,7 +793,7 @@ cleanup:
}
-#ifdef HAVE_LIBBLKID
+#ifdef WITH_LIBBLKID
static int
lxcContainerMountDetectFilesystem(const char *src, char **type)
{
@@ -864,7 +864,7 @@ cleanup:
blkid_free_probe(blkid);
return ret;
}
-#else /* ! HAVE_LIBBLKID */
+#else /* ! WITH_LIBBLKID */
static int
lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
char **type)
@@ -873,7 +873,7 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED,
*type = NULL;
return 0;
}
-#endif /* ! HAVE_LIBBLKID */
+#endif /* ! WITH_LIBBLKID */
/*
* This functions attempts to do automatic detection of filesystem
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 92a3228..a1bd75c 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -37,7 +37,7 @@
#include <libxml/tree.h>
#include <libxml/xpath.h>
-#if HAVE_LIBBLKID
+#if WITH_LIBBLKID
# include <blkid/blkid.h>
#endif
@@ -548,7 +548,7 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED,
}
#endif /* WITH_STORAGE_FS */
-#if HAVE_LIBBLKID
+#if WITH_LIBBLKID
static virStoragePoolProbeResult
virStorageBackendFileSystemProbe(const char *device,
const char *format) {
@@ -619,7 +619,7 @@ error:
return ret;
}
-#else /* #if HAVE_LIBBLKID */
+#else /* #if WITH_LIBBLKID */
static virStoragePoolProbeResult
virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED,
@@ -632,7 +632,7 @@ virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED,
return FILESYSTEM_PROBE_ERROR;
}
-#endif /* #if HAVE_LIBBLKID */
+#endif /* #if WITH_LIBBLKID */
/* some platforms don't support mkfs */
#ifdef MKFS
--
1.7.11.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list