External/libvirt
1
0
Fork 0
Code

Convert HAVE_AVAHI to WITH_AVAHI

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-09-20 15:21:13 +01:00
parent 832d140930
commit 2de152d20d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1190,7 +1190,7 @@ if test "x$with_avahi" = "xyes" || test "x$with_avahi" = "xcheck"; then
fi fi
]) ])
if test "x$with_avahi" = "xyes" ; then 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 presence]) [whether Avahi is used to broadcast server presence])
fi fi
fi fi

12
src/rpc/virnetservermdns.c
View File

@ -29,7 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if HAVE_AVAHI #if WITH_AVAHI
# include <avahi-client/client.h> # include <avahi-client/client.h>
# include <avahi-client/publish.h> # include <avahi-client/publish.h>
@ -56,7 +56,7 @@ struct _virNetServerMDNSEntry {
struct _virNetServerMDNSGroup { struct _virNetServerMDNSGroup {
virNetServerMDNSPtr mdns; virNetServerMDNSPtr mdns;
#if HAVE_AVAHI #if WITH_AVAHI
AvahiEntryGroup *handle; AvahiEntryGroup *handle;
#endif #endif
char *name; char *name;
@ -65,14 +65,14 @@ struct _virNetServerMDNSGroup {
}; };
struct _virNetServerMDNS { struct _virNetServerMDNS {
#if HAVE_AVAHI #if WITH_AVAHI
AvahiClient *client; AvahiClient *client;
AvahiPoll *poller; AvahiPoll *poller;
#endif #endif
virNetServerMDNSGroupPtr group; virNetServerMDNSGroupPtr group;
}; };
#if HAVE_AVAHI #if WITH_AVAHI
/* Avahi API requires this struct name in the app :-( */ /* Avahi API requires this struct name in the app :-( */
struct AvahiWatch { struct AvahiWatch {
int watch; int watch;
@ -619,7 +619,7 @@ void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry)
VIR_FREE(entry); VIR_FREE(entry);
} }
#else /* ! HAVE_AVAHI */ #else /* ! WITH_AVAHI */
static const char *unsupported = N_("avahi not available at build time"); static const char *unsupported = N_("avahi not available at build time");
@ -692,4 +692,4 @@ virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry ATTRIBUTE_UNUSED)
VIR_DEBUG("%s", _(unsupported)); VIR_DEBUG("%s", _(unsupported));
} }
#endif /* ! HAVE_AVAHI */ #endif /* ! WITH_AVAHI */