* Fix docs/INSTALL for the right dbus path for debian (Thanks sebest)

 * Put -DDBUS_API_SUBJECT_TO_CHANGE in DBUS_CFLAGS and
   remove from individual files
 * Add avahi-client to the C++ test runs, compile with DBUS flags
 * Fix avahi-client to compile with C++ compilers.

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@323 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-client/browser.c b/avahi-client/browser.c
index 6f6e447378721497d35049274f18578ac84f2ff3..a20b5d251224c08fc5ca9c347fc034b2e8ec22f3 100644 (file)
--- a/avahi-client/browser.c
+++ b/avahi-client/browser.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 

diff --git a/avahi-client/client.c b/avahi-client/client.c
index 8cff69ac030a3e5057fa6836c1a88083712a381f..ad649462b24f9f8c5091c7c95b5c54490d15d3d7 100644 (file)
--- a/avahi-client/client.c
+++ b/avahi-client/client.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 2748d8642ba4534dfe75bf7bf6d1bdebbe416f43..93c3fd62890c3e2d97cd8c48357fe1400ffa8dd7 100644 (file)
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 

diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index 722da2d4c23a41f6adf1948275c6c95c3a52c7ac..d37958e201636a1310aad287baf77e417ff6044d 100644 (file)
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -23,6 +23,7 @@
 ***/
 
 #include <dbus/dbus.h>
+#include "client.h"
 
 struct _AvahiClient
 {

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 9b83da9c214ff03ab324601340e7878e60119e84..8d0226f513ab4ba2920afdd7a5766255c7953370 100644 (file)
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <glib.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 

diff --git a/configure.ac b/configure.ac
index 7aa4fa4255de9159a6eea5e8bbb5bf1f35ea1a18..cd4d3ddfca6966b2e4d110a2eac484bd093da64d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,8 +159,9 @@ if test "x$ENABLE_DBUS" = "xyes"; then
           DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
        fi
        AC_SUBST(DBUS_SYS_DIR)
-
-        AC_SUBST(DBUS_CFLAGS)
+    
+    DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
+    AC_SUBST(DBUS_CFLAGS)
        AC_SUBST(DBUS_LIBS)
 fi
 

diff --git a/docs/INSTALL b/docs/INSTALL
index eeb2c881b1bf1f147d59dcebc5691f2a7f11dbd9..802ad45387cd35623aa4bf25637b8d25adbab817 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -41,8 +41,8 @@ Optionally start the unicast DNS configuration daemon:
 
 To start the two daemons at boot time on Debian based distributions:
        with DBUS support:
-       # ln -s /etc/init.d/avahi-daemon /etc/dbus/event.d/75avahi-daemon
-       # ln -s /etc/init.d/avahi-dnsconfd /etc/dbus/event.d/76avahi-dnsconfd
+       # ln -s /etc/init.d/avahi-daemon /etc/dbus-1/event.d/75avahi-daemon
+       # ln -s /etc/init.d/avahi-dnsconfd /etc/dbus-1/event.d/76avahi-dnsconfd
 
        without DBUS support:
        # update-rc.d avahi-daemon defaults 25 15

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d37ce425bed9662240502bb561ac92b2ecc131ad..5b146c075b1c947bff8baf4400f0b07c2e0a0664 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,6 +24,10 @@ AM_CFLAGS= \
 AM_CFLAGS+=$(GLIB20_CFLAGS)
 AM_LDADD=$(GLIB20_LIBS)
 
+# DBUS
+AM_CFLAGS+=$(DBUS_CFLAGS)
+AM_LDADD+=$(DBUS_LIBS)
+
 noinst_PROGRAMS = \
        c-plus-plus-test
 

diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py
index 62498f5b9566e31cde09a1da9653cc2efb57b7e3..b1d6aae6769fa73e0a7f70f6dbc2c6c74951c44f 100755 (executable)
--- a/tests/c-plus-plus-test-gen.py
+++ b/tests/c-plus-plus-test-gen.py
@@ -54,6 +54,7 @@ print """/* $Id$ */
 
 print_includes("avahi-common")
 print_includes("avahi-core")
+print_includes("avahi-client")
 
 print """
 int main(int argc, char*argv[]) {

diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc
index 483ff5bdf1155c2a548e728fe743323288e6f386..e87ef25ca4e627f65a7a34ea1042ab1304cfc661 100644 (file)
--- a/tests/c-plus-plus-test.cc
+++ b/tests/c-plus-plus-test.cc
@@ -19,40 +19,42 @@
   USA.
 ***/
 
-#include <avahi-common/alternative.h>
-#include <avahi-common/defs.h>
+#include <avahi-common/error.h>
+#include <avahi-common/strlst.h>
+#include <avahi-common/simple-watch.h>
+#include <avahi-common/dbus.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/watch.h>
 #include <avahi-common/malloc.h>
-#include <avahi-common/address.h>
-#include <avahi-common/simple-watch.h>
-#include <avahi-common/llist.h>
-#include <avahi-common/error.h>
 #include <avahi-common/domain.h>
-#include <avahi-common/gccmacro.h>
-#include <avahi-common/dbus.h>
 #include <avahi-common/cdecl.h>
-#include <avahi-common/strlst.h>
-#include <avahi-core/prioq.h>
-#include <avahi-core/cache.h>
-#include <avahi-core/rr.h>
-#include <avahi-core/hashmap.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/gccmacro.h>
+#include <avahi-common/defs.h>
+#include <avahi-common/address.h>
+#include <avahi-common/llist.h>
+#include <avahi-core/query-sched.h>
+#include <avahi-core/probe-sched.h>
+#include <avahi-core/announce.h>
 #include <avahi-core/util.h>
-#include <avahi-core/socket.h>
-#include <avahi-core/response-sched.h>
-#include <avahi-core/browse.h>
 #include <avahi-core/rrlist.h>
-#include <avahi-core/query-sched.h>
+#include <avahi-core/dns.h>
+#include <avahi-core/fdutil.h>
 #include <avahi-core/core.h>
-#include <avahi-core/probe-sched.h>
+#include <avahi-core/prioq.h>
+#include <avahi-core/browse.h>
+#include <avahi-core/netlink.h>
+#include <avahi-core/cache.h>
 #include <avahi-core/server.h>
-#include <avahi-core/dns.h>
-#include <avahi-core/timeeventq.h>
+#include <avahi-core/socket.h>
+#include <avahi-core/rr.h>
 #include <avahi-core/iface.h>
-#include <avahi-core/announce.h>
-#include <avahi-core/netlink.h>
+#include <avahi-core/hashmap.h>
 #include <avahi-core/log.h>
-#include <avahi-core/fdutil.h>
+#include <avahi-core/timeeventq.h>
+#include <avahi-core/response-sched.h>
+#include <avahi-client/internal.h>
+#include <avahi-client/client.h>
 
 int main(int argc, char*argv[]) {
     return 0;