* Remove support for dbus 0.23.

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 5f561dbe209320e960ccee5696cbd1423fb58eda..9ea1733675f163336e95a206be7865c428bf84fb 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -22,9 +22,10 @@ servicedir=$(pkgsysconfdir)/services
 
 AM_CFLAGS= \
        -I$(top_srcdir) \
-       -D_GNU_SOURCE \
        -DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
        -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
+
+
 AM_LDADD=-lexpat
 
 # GLIB 2.0
@@ -35,7 +36,6 @@ AM_LDADD+=$(GLIB20_LIBS)
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
 # DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
@@ -64,6 +64,11 @@ pkgdata_DATA = \
 
 if ENABLE_DBUS
 avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = avahi-dbus.conf
+
+EXTRA_DIST = $(dbusservice_DATA)
 endif
 
 avahi_CFLAGS = $(AM_CFLAGS)