[libvirt] [PATCH 22/29] Convert HAVE_AVAHI to WITH_AVAHI

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- configure.ac | 2 +- src/rpc/virnetservermdns.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 6f4fa90..f3e82d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1141,7 +1141,7 @@ if test "x$with_avahi" = "xyes" || test "x$with_avahi" = "xcheck"; then fi ]) if test "x$with_avahi" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_AVAHI], 1, + AC_DEFINE_UNQUOTED([WITH_AVAHI], 1, [whether Avahi is used to broadcast server presense]) fi fi diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index 7c43c40..dc62b2f 100644 --- a/src/rpc/virnetservermdns.c +++ b/src/rpc/virnetservermdns.c @@ -29,7 +29,7 @@ #include <stdio.h> #include <stdlib.h> -#if HAVE_AVAHI +#if WITH_AVAHI # include <avahi-client/client.h> # include <avahi-client/publish.h> @@ -57,7 +57,7 @@ struct _virNetServerMDNSEntry { struct _virNetServerMDNSGroup { virNetServerMDNSPtr mdns; -#if HAVE_AVAHI +#if WITH_AVAHI AvahiEntryGroup *handle; #endif char *name; @@ -66,14 +66,14 @@ struct _virNetServerMDNSGroup { }; struct _virNetServerMDNS { -#if HAVE_AVAHI +#if WITH_AVAHI AvahiClient *client; AvahiPoll *poller; #endif virNetServerMDNSGroupPtr group; }; -#if HAVE_AVAHI +#if WITH_AVAHI /* Avahi API requires this struct name in the app :-( */ struct AvahiWatch { int watch; @@ -620,7 +620,7 @@ void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry) VIR_FREE(entry); } -#else /* ! HAVE_AVAHI */ +#else /* ! WITH_AVAHI */ static const char *unsupported = N_("avahi not available at build time"); @@ -693,4 +693,4 @@ virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry ATTRIBUTE_UNUSED) VIR_DEBUG("%s", _(unsupported)); } -#endif /* ! HAVE_AVAHI */ +#endif /* ! WITH_AVAHI */ -- 1.7.11.4