diff options
| -rw-r--r-- | hcid/Makefile.am | 6 | ||||
| -rw-r--r-- | hcid/dbus.c | 1 | ||||
| -rw-r--r-- | hcid/main.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 3a5e766a..3cbdfaa2 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -7,9 +7,11 @@ sbin_PROGRAMS = hcid if DBUS dbus_hcid_sources = dbus.c dbus_hcid_ldflags = @DBUS_LIBS@ +dbus_hcid_cflags = -DENABLE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE else dbus_hcid_sources = dbus_hcid_ldflags = +dbus_hcid_cflags = endif hcid_SOURCES = main.c security.c hcid.h lib.c lib.h parser.h parser.y lexer.l kword.h kword.c glib-ectomy.h glib-ectomy.c $(dbus_hcid_sources) @@ -17,11 +19,11 @@ hcid_CONFIG = hcid.conf LDFLAGS = $(dbus_hcid_ldflags) @BLUEZ_LIBS@ -INCLUDES = @BLUEZ_INCLUDES@ @DBUS_INCLUDES@ +INCLUDES = @BLUEZ_INCLUDES@ @DBUS_INCLUDES@ $(dbus_hcid_cflags) man_MANS = hcid.8 hcid.conf.5 -YFLAGS = -d +YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h diff --git a/hcid/dbus.c b/hcid/dbus.c index a1756cc6..7ef7ac73 100644 --- a/hcid/dbus.c +++ b/hcid/dbus.c @@ -40,7 +40,6 @@ #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> -#define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> #include "glib-ectomy.h" diff --git a/hcid/main.c b/hcid/main.c index c679159d..be523a19 100644 --- a/hcid/main.c +++ b/hcid/main.c @@ -506,7 +506,7 @@ int main(int argc, char *argv[], char *env[]) /* Start logging to syslog and stderr */ openlog("hcid", LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_DAEMON); - syslog(LOG_INFO, "HCI daemon ver %s started", VERSION); + syslog(LOG_INFO, "Bluetooth HCI daemon"); memset(&sa, 0, sizeof(sa)); sa.sa_flags = SA_NOCLDSTOP; |