diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-15 21:31:30 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-15 21:31:30 +0000 |
| commit | f1167112d926b189fe189599576e8588923f036c (patch) | |
| tree | 20d7d4c58594540de8a4771ae78b204bf8a3db16 /avahi-daemon/main.c | |
| parent | 86727e2f97a5e845d462178692c8574d226f22d7 (diff) | |
* cleanup build system a little
* strip remaining glib usage
* -fPIC build fix for x86-64 (thanks tvainika)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@336 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/main.c')
| -rw-r--r-- | avahi-daemon/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index e249304..1fc3895 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -52,10 +52,13 @@ #include "main.h" #include "simple-protocol.h" -#include "dbus-protocol.h" #include "static-services.h" #include "ini-file-parser.h" +#ifdef HAVE_DBUS +#include "dbus-protocol.h" +#endif + AvahiServer *avahi_server = NULL; typedef enum { @@ -208,7 +211,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda avahi_server = s; -#ifdef ENABLE_DBUS +#ifdef HAVE_DBUS if (c->enable_dbus) dbus_protocol_server_state_changed(state); #endif @@ -580,7 +583,7 @@ static int run_server(DaemonConfig *c) { if (simple_protocol_setup(poll_api) < 0) goto finish; -#ifdef ENABLE_DBUS +#ifdef HAVE_DBUS if (c->enable_dbus) if (dbus_protocol_setup(poll_api) < 0) goto finish; |