From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 20 Sep 2012 14:17:56 +0000 (+0100)
Subject: Convert HAVE_CAPNG to WITH_CAPNG
X-Git-Tag: v1.0.2-rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef38965c30fe4e68c60432c85bc9982578bca111;p=thirdparty%2Flibvirt.git

Convert HAVE_CAPNG to WITH_CAPNG

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 4c1d12ea66..2d8d8e9fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1515,9 +1515,9 @@ if test "$with_qemu" = "yes" && test "$with_capng" != "no"; then
 fi
 if test "$with_capng" = "yes"; then
   CAPNG_LIBS="-lcap-ng"
-  AC_DEFINE_UNQUOTED([HAVE_CAPNG], 1, [whether capng is available for privilege reduction])
+  AC_DEFINE_UNQUOTED([WITH_CAPNG], 1, [whether capng is available for privilege reduction])
 fi
-AM_CONDITIONAL([HAVE_CAPNG], [test "$with_capng" != "no"])
+AM_CONDITIONAL([WITH_CAPNG], [test "$with_capng" != "no"])
 AC_SUBST([CAPNG_CFLAGS])
 AC_SUBST([CAPNG_LIBS])
 
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index ee1d676412..73cffa1b73 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -45,7 +45,7 @@
 /* For MS_MOVE */
 #include <linux/fs.h>
 
-#if HAVE_CAPNG
+#if WITH_CAPNG
 # include <cap-ng.h>
 #endif
 
@@ -2126,7 +2126,7 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef,
  */
 static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED)
 {
-#if HAVE_CAPNG
+#if WITH_CAPNG
     int ret;
 
     capng_get_caps_process();
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 5c7be8d4e3..76b2986fdf 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -42,7 +42,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#if HAVE_CAPNG
+#if WITH_CAPNG
 # include <cap-ng.h>
 #endif
 
@@ -664,7 +664,7 @@ error:
 
 static int lxcControllerClearCapabilities(void)
 {
-#if HAVE_CAPNG
+#if WITH_CAPNG
     int ret;
 
     capng_clear(CAPNG_SELECT_BOTH);
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index c906f2a09d..8566d1a7d5 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -29,7 +29,7 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 
-#if HAVE_CAPNG
+#if WITH_CAPNG
 # include <cap-ng.h>
 #endif
 
@@ -162,7 +162,7 @@ virCommandFDSet(int fd,
 
 static int virClearCapabilities(void) ATTRIBUTE_UNUSED;
 
-# if HAVE_CAPNG
+# if WITH_CAPNG
 static int virClearCapabilities(void)
 {
     int ret;
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 7c54bea717..b36e9d39dc 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -58,7 +58,7 @@
 # include <pwd.h>
 # include <grp.h>
 #endif
-#if HAVE_CAPNG
+#if WITH_CAPNG
 # include <cap-ng.h>
 #endif
 #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R