Drop private inotify code

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 55207d07525e7923196329a4bf7ef8188c646a2c..0aac0fc9ab8410c6e30e777118be6beb25f3cbf3 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS=-I$(top_srcdir)
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_LIBDAEMON
-if HAVE_EXPAT
+if HAVE_XML
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
@@ -55,8 +55,8 @@ avahi_daemon_SOURCES = \
        setproctitle.c setproctitle.h \
        ../avahi-client/check-nss.c
 
-avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
-avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) -lexpat
+avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS) $(XML_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) $(XML_LIBS)
 
 ini_file_parser_test_SOURCES = \
        ini-file-parser.c ini-file-parser.h \
@@ -70,7 +70,8 @@ pkgsysconf_DATA = \
        hosts
 
 service_DATA = \
-       ssh.service
+       ssh.service \
+       sftp-ssh.service
 
 pkgdata_DATA = \
        avahi-service.dtd
@@ -85,6 +86,10 @@ avahi_daemon_LDADD += -lcap
 
 endif
 
+if HAVE_DLOPEN
+avahi_daemon_LDADD += -ldl
+endif
+
 if HAVE_DBUS
 
 dbusservicedir=$(DBUS_SYS_DIR)
@@ -110,11 +115,7 @@ avahi_daemon_SOURCES += \
 avahi_daemon_LDADD += \
        $(DBUS_LIBS)
 
-if HAVE_DLOPEN
-avahi_daemon_LDADD += -ldl
-endif
-
-avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 
 dbusservice_DATA = avahi-dbus.conf
 
@@ -148,6 +149,7 @@ EXTRA_DIST = \
        HostNameResolver.introspect \
        RecordBrowser.introspect \
        ssh.service \
+       sftp-ssh.service \
        hosts \
        example.service \
        introspect.dtd \
@@ -158,3 +160,6 @@ xmllint:
        for F in $(introspection_DATA) ; do \
                xmllint --noout --valid $$F ; \
        done
+
+install-data-local:
+       test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"