#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 {
avahi_server = s;
-#ifdef ENABLE_DBUS
+#ifdef HAVE_DBUS
if (c->enable_dbus)
dbus_protocol_server_state_changed(state);
#endif
" -f --file=FILE Load the specified configuration file instead of\n"
" "AVAHI_CONFIG_FILE"\n"
" --no-rlimits Don't enforce resource limits\n"
- " --no-drop-root Don't drop priviliges\n"
+ " --no-drop-root Don't drop privileges\n"
" --debug Increase verbosity\n",
argv0);
}
OPTION_DEBUG
};
- static const struct option const long_options[] = {
+ static const struct option long_options[] = {
{ "help", no_argument, NULL, 'h' },
{ "daemonize", no_argument, NULL, 'D' },
{ "kill", no_argument, NULL, 'k' },
static void log_function(AvahiLogLevel level, const char *txt) {
- static const int const log_level_map[] = {
+ static const int log_level_map[] = {
LOG_ERR,
LOG_WARNING,
LOG_NOTICE,
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;