* 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
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
***/
#include <dbus/dbus.h>
***/
#include <dbus/dbus.h>
#include <unistd.h>
#include <glib.h>
#include <unistd.h>
#include <glib.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
fi
AC_SUBST(DBUS_SYS_DIR)
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)
To start the two daemons at boot time on Debian based distributions:
with DBUS support:
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
without DBUS support:
# update-rc.d avahi-daemon defaults 25 15
AM_CFLAGS+=$(GLIB20_CFLAGS)
AM_LDADD=$(GLIB20_LIBS)
AM_CFLAGS+=$(GLIB20_CFLAGS)
AM_LDADD=$(GLIB20_LIBS)
+# DBUS
+AM_CFLAGS+=$(DBUS_CFLAGS)
+AM_LDADD+=$(DBUS_LIBS)
+
noinst_PROGRAMS = \
c-plus-plus-test
noinst_PROGRAMS = \
c-plus-plus-test
print_includes("avahi-common")
print_includes("avahi-core")
print_includes("avahi-common")
print_includes("avahi-core")
+print_includes("avahi-client")
print """
int main(int argc, char*argv[]) {
print """
int main(int argc, char*argv[]) {
-#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/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/domain.h>
-#include <avahi-common/gccmacro.h>
-#include <avahi-common/dbus.h>
#include <avahi-common/cdecl.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/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/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/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/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/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/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;
int main(int argc, char*argv[]) {
return 0;