[libvirt] [PATCH 11/28] 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 | 4 ++-- src/rpc/virnetservermdns.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 8a5a513..c88162e 100644 --- a/configure.ac +++ b/configure.ac @@ -1190,8 +1190,8 @@ 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, - [whether Avahi is used to broadcast server presence]) + AC_DEFINE_UNQUOTED([WITH_AVAHI], 1, + [whether Avahi is used to broadcast server presense]) fi fi AC_SUBST([AVAHI_CFLAGS]) diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index b6f8e8e..26e24d5 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> @@ -56,7 +56,7 @@ struct _virNetServerMDNSEntry { struct _virNetServerMDNSGroup { virNetServerMDNSPtr mdns; -#if HAVE_AVAHI +#if WITH_AVAHI AvahiEntryGroup *handle; #endif char *name; @@ -65,14 +65,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; @@ -619,7 +619,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"); @@ -692,4 +692,4 @@ virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry ATTRIBUTE_UNUSED) VIR_DEBUG("%s", _(unsupported)); } -#endif /* ! HAVE_AVAHI */ +#endif /* ! WITH_AVAHI */ -- 1.7.11.7