lose the dep on avahi-glib, and run the avahi loop in a thread

[catta] / avahi-client / Makefile.am

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index cdc44422db212dba05fdc6914b13dfe210f90cf4..77b8c35f3857a85ffaadde2d65d42a7f24f8ccee 100644 (file)
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -39,9 +39,9 @@ libavahi_client_la_SOURCES = \
        browser.c \
        resolver.c
 
-libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la
-libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 1:0:1
+libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CLIENT_VERSION_INFO)
 
 client_test_SOURCES = client-test.c
 client_test_CFLAGS = $(AM_CFLAGS)