Attachment #186402 for bug #222345

View | Details | Raw Unified | Return to bug 222345
Collapse All | Expand All

Lines 11-16 Link Here

(-)Makefile (+3 lines)
11	MAINTAINER?= gnome@FreeBSD.org	11	MAINTAINER?= gnome@FreeBSD.org
12	COMMENT?= Service discovery on a local network	12	COMMENT?= Service discovery on a local network
13		13
		14	LICENSE= LGPL21+
		15	LICENSE_FILE= ${WRKSRC}/LICENSE
		16
14	AVAHI_SLAVE?= no	17	AVAHI_SLAVE?= no
15		18
16	.if ${AVAHI_SLAVE} != header	19	.if ${AVAHI_SLAVE} != header

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2011-03-13 18:12:06.000000000 +0100	1	--- Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ Makefile.in 2011-03-13 18:14:22.000000000 +0100	2	+++ Makefile.in
3	@@ -1179,6 +1179,8 @@	3	@@ -1206,6 +1206,8 @@ uninstall-am: uninstall-pkgconfigDATA
4	%.pc: %.pc.in	4	%.pc: %.pc.in
5	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \	5	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
6	-e 's,@libdir\@,$(libdir),g' \	6	-e 's,@libdir\@,$(libdir),g' \

Lines 1-6 Link Here

(-)files/patch-avahi-autoipd_main.c (-3 / +3 lines)
1	--- avahi-autoipd/main.c.orig 2007-12-19 15:22:16.000000000 +0000	1	--- avahi-autoipd/main.c.orig 2010-08-26 00:51:38 UTC
2	+++ avahi-autoipd/main.c 2007-12-19 15:23:39.000000000 +0000	2	+++ avahi-autoipd/main.c
3	@@ -64,8 +64,8 @@	3	@@ -62,8 +62,8 @@
4	#include <pcap.h>	4	#include <pcap.h>
5		5
6	/* Old versions of PCAP defined it as D_IN */	6	/* Old versions of PCAP defined it as D_IN */

Lines 1-6 Link Here

(-)files/patch-avahi-client.pc.in (-3 / +3 lines)
1	--- avahi-client.pc.in.orig Mon May 15 02:28:25 2006	1	--- avahi-client.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-client.pc.in Mon May 15 02:30:08 2006	2	+++ avahi-client.pc.in
3	@@ -6,5 +6,5 @@	3	@@ -6,5 +6,5 @@ includedir=${prefix}/include
4	Name: avahi-client	4	Name: avahi-client
5	Description: Avahi Multicast DNS Responder (Client Support)	5	Description: Avahi Multicast DNS Responder (Client Support)
6	Version: @PACKAGE_VERSION@	6	Version: @PACKAGE_VERSION@

Lines 1-5 Link Here

(-)files/patch-avahi-client_check-nss.c (-2 / +2 lines)
1	--- avahi-client/check-nss.c.orig 2014-09-08 12:26:55.000000000 -0400	1	--- avahi-client/check-nss.c.orig 2010-08-26 00:51:38 UTC
2	+++ avahi-client/check-nss.c 2014-09-08 12:27:24.000000000 -0400	2	+++ avahi-client/check-nss.c
3	@@ -33,6 +33,7 @@ int avahi_nss_support(void) {	3	@@ -33,6 +33,7 @@ int avahi_nss_support(void) {
4		4
5	#ifdef HAVE_DLOPEN	5	#ifdef HAVE_DLOPEN

Lines 1-6 Link Here

(-)files/patch-avahi-compat-howl.pc.in (-3 / +3 lines)
1	--- avahi-compat-howl.pc.in.orig Sun Jan 29 13:32:39 2006	1	--- avahi-compat-howl.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-compat-howl.pc.in Sun Jan 29 13:32:56 2006	2	+++ avahi-compat-howl.pc.in
3	@@ -6,5 +6,5 @@	3	@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compa
4	Name: avahi-compat-howl	4	Name: avahi-compat-howl
5	Description: Avahi Multicast DNS Responder (HOWL Compatibility)	5	Description: Avahi Multicast DNS Responder (HOWL Compatibility)
6	Version: @HOWL_COMPAT_VERSION@	6	Version: @HOWL_COMPAT_VERSION@




--- avahi-compat-libdns_sd/Makefile.in.orig	2017-09-15 01:20:16 UTC
+++ avahi-compat-libdns_sd/Makefile.in
@@ -133,9 +133,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co
 null_test_OBJECTS = $(am_null_test_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
 null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -145,8 +143,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt_test-warn.$(OBJEXT)
 txt_test_OBJECTS = $(am_txt_test_OBJECTS)
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
 txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -443,7 +440,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt.c \
@@ -451,7 +448,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	compat.c \
@@ -459,7 +456,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
 all: all-am
 
@@ -937,7 +934,7 @@ uninstall-am: uninstall-avahi_compat_lib
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-6 Link Here

(-)files/patch-avahi-compat-libdns_sd.pc.in (-3 / +3 lines)
1	--- avahi-compat-libdns_sd.pc.in.orig Sun Jan 29 13:33:21 2006	1	--- avahi-compat-libdns_sd.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-compat-libdns_sd.pc.in Sun Jan 29 13:33:40 2006	2	+++ avahi-compat-libdns_sd.pc.in
3	@@ -6,5 +6,5 @@	3	@@ -6,5 +6,5 @@ includedir=${prefix}/include/avahi-compa
4	Name: avahi-compat-libdns_sd	4	Name: avahi-compat-libdns_sd
5	Description: Avahi Multicast DNS Responder (libdns_sd Compatibility)	5	Description: Avahi Multicast DNS Responder (libdns_sd Compatibility)
6	Version: @PACKAGE_VERSION@	6	Version: @PACKAGE_VERSION@




--- avahi-compat-libdns_sd/Makefile.in.orig	2010-07-24 19:46:12.000000000 -0400
+++ avahi-compat-libdns_sd/Makefile.in	2010-07-24 19:49:25.000000000 -0400
@@ -127,9 +127,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co
 null_test_OBJECTS = $(am_null_test_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
 null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -139,8 +137,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt_test-warn.$(OBJEXT)
 txt_test_OBJECTS = $(am_txt_test_OBJECTS)
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1) \
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	../avahi-common/libavahi-common.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(am__DEPENDENCIES_1)
 txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -433,7 +430,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	txt.c \
@@ -441,7 +438,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	dns_sd.h \
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	compat.c \
@@ -449,7 +446,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	warn.c warn.h
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
 all: all-am
 
@@ -943,7 +940,7 @@ uninstall-am: uninstall-avahi_compat_lib
 
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
 @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-6 Link Here

(-)files/patch-avahi-core.pc.in (-3 / +3 lines)
1	--- avahi-core.pc.in.orig Sun Jan 29 13:31:30 2006	1	--- avahi-core.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-core.pc.in Sun Jan 29 13:31:48 2006	2	+++ avahi-core.pc.in
3	@@ -6,5 +6,5 @@	3	@@ -6,5 +6,5 @@ includedir=${prefix}/include
4	Name: avahi-core	4	Name: avahi-core
5	Description: Avahi Multicast DNS Responder (Embeddable Stack)	5	Description: Avahi Multicast DNS Responder (Embeddable Stack)
6	Version: @PACKAGE_VERSION@	6	Version: @PACKAGE_VERSION@




--- avahi-daemon/Makefile.in.orig	2017-09-15 01:20:16 UTC
+++ avahi-daemon/Makefile.in
@@ -69,7 +69,7 @@ host_triplet = @host@
 @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	caps.c caps.h
 
 @ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap

 @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_5 = \
 @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	dbus-protocol.c dbus-protocol.h \
 @HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@	dbus-util.c dbus-util.h \
@@ -688,7 +688,7 @@ clean-sbinPROGRAMS:
 	rm -f $$list
 avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_avahi_daemon_DEPENDENCIES) 
 	@rm -f avahi-daemon$(EXEEXT)

 ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) $(EXTRA_ini_file_parser_test_DEPENDENCIES) 
 	@rm -f ini-file-parser-test$(EXEEXT)
 	$(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
@@ -1222,17 +1222,17 @@ uninstall-dist_serviceDATA:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
 install-pkgsysconfDATA: $(pkgsysconf_DATA)

Lines 1-8 Link Here

(-)files/patch-avahi-daemon_main.c (-6 / +6 lines)
1	--- avahi-daemon/main.c.orig 2007-08-26 00:48:40.000000000 -0400	1	--- avahi-daemon/main.c.orig 2010-11-18 03:00:26 UTC
2	+++ avahi-daemon/main.c 2007-08-26 00:49:04.000000000 -0400	2	+++ avahi-daemon/main.c
3	@@ -317,6 +317,11 @@ static void update_browse_domains(void)	3	@@ -320,6 +320,11 @@ static void update_browse_domains(void)
4	int n;	4	return;
5	char **p;	5	}
6		6
7	+ if (!resolv_conf_search_domains) {	7	+ if (!resolv_conf_search_domains) {
8	+ avahi_server_set_browse_domains(avahi_server, NULL);	8	+ avahi_server_set_browse_domains(avahi_server, NULL);
Lines 10-14 Link Here
10	+ }	10	+ }
11	+	11	+
12	l = avahi_string_list_copy(config.server_config.browse_domains);	12	l = avahi_string_list_copy(config.server_config.browse_domains);
13		13
14	for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {	14	for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {

Line 0 Link Here

(-)files/patch-avahi-dnsconfd_Makefile.in (+11 lines)
	1	--- avahi-dnsconfd/Makefile.in.orig 2017-09-15 01:20:16 UTC
	2	+++ avahi-dnsconfd/Makefile.in
	3	@@ -494,7 +494,7 @@ clean-sbinPROGRAMS:
	4	rm -f $$list
	5	avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES) $(EXTRA_avahi_dnsconfd_DEPENDENCIES)
	6	@rm -f avahi-dnsconfd$(EXEEXT)
	7	- $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS)
	8	+ $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS)
	9	install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
	10	@$(NORMAL_INSTALL)
	11	test -z "$(pkgsysconfdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"

Lines 1-6 Link Here

(-)files/patch-avahi-glib.pc.in (-3 / +3 lines)
1	--- avahi-glib.pc.in.orig Mon May 15 02:31:01 2006	1	--- avahi-glib.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-glib.pc.in Mon May 15 02:31:25 2006	2	+++ avahi-glib.pc.in
3	@@ -7,5 +7,5 @@	3	@@ -7,5 +7,5 @@ Name: avahi-glib
4	Description: Avahi Multicast DNS Responder (GLib Support)	4	Description: Avahi Multicast DNS Responder (GLib Support)
5	Version: @PACKAGE_VERSION@	5	Version: @PACKAGE_VERSION@
6	Requires: glib-2.0	6	Requires: glib-2.0

Lines 1-5 Link Here

(-)files/patch-avahi-qt3.pc.in (-2 / +2 lines)
1	--- avahi-qt3.pc.in.orig Thu Apr 12 00:18:53 2007	1	--- avahi-qt3.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-qt3.pc.in Thu Apr 12 00:19:20 2007	2	+++ avahi-qt3.pc.in
3	@@ -7,5 +7,5 @@ Name: avahi-qt3	3	@@ -7,5 +7,5 @@ Name: avahi-qt3
4	Description: Avahi Multicast DNS Responder (QT3 Support)	4	Description: Avahi Multicast DNS Responder (QT3 Support)
5	Version: @PACKAGE_VERSION@	5	Version: @PACKAGE_VERSION@

Lines 1-6 Link Here

(-)files/patch-avahi-qt4.pc.in (-3 / +3 lines)
1	--- avahi-qt4.pc.in.orig 2006-01-23 07:15:20.000000000 +1000	1	--- avahi-qt4.pc.in.orig 2011-12-30 21:26:44 UTC
2	+++ avahi-qt4.pc.in 2007-10-28 12:10:17.000000000 +1000	2	+++ avahi-qt4.pc.in
3	@@ -7,5 +7,5 @@	3	@@ -7,5 +7,5 @@ Name: avahi-qt4
4	Description: Avahi Multicast DNS Responder (QT4 Support)	4	Description: Avahi Multicast DNS Responder (QT4 Support)
5	Version: @PACKAGE_VERSION@	5	Version: @PACKAGE_VERSION@
6	Requires.private: QtCore >= 4.0.0	6	Requires.private: QtCore >= 4.0.0




--- avahi-qt/Makefile.in.orig	2017-09-15 01:20:16 UTC
+++ avahi-qt/Makefile.in
@@ -117,7 +117,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \

 @HAVE_QT3_TRUE@	$(am__DEPENDENCIES_1)
 am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS =  \
@@ -132,7 +131,6 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V
 	$(LDFLAGS) -o $@
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
 @HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES =  \
-@HAVE_QT4_TRUE@	../avahi-common/libavahi-common.la \

 @HAVE_QT4_TRUE@	$(am__DEPENDENCIES_1)
 am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
 @HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS =  \
@@ -433,7 +431,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
 @HAVE_QT3_TRUE@	qt-watch.cpp
 
 @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
-@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)

 @HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
 @HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
 @HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
@@ -443,7 +441,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
 @HAVE_QT4_TRUE@	qt-watch.cpp
 
 @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)

Lines 1-5 Link Here

(-)files/patch-avahi-ui_Makefile.in (-3 / +3 lines)
1	--- avahi-ui/Makefile.in.orig 2013-12-11 12:03:44.000000000 +0100	1	--- avahi-ui/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ avahi-ui/Makefile.in 2013-12-11 12:05:00.000000000 +0100	2	+++ avahi-ui/Makefile.in
3	@@ -125,9 +125,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"	3	@@ -125,9 +125,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
4	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"	4	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"
5	LTLIBRARIES = $(lib_LTLIBRARIES)	5	LTLIBRARIES = $(lib_LTLIBRARIES)
Lines 85-88 Link Here
85	+@HAVE_GTK_TRUE@ test -z "$(desktopdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(desktopdir)"	85	+@HAVE_GTK_TRUE@ test -z "$(desktopdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
86	@list='$(desktop_DATA)'; test -n "$(desktopdir)" \|\| list=; \	86	@list='$(desktop_DATA)'; test -n "$(desktopdir)" \|\| list=; \
87	for p in $$list; do \	87	for p in $$list; do \
88	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	88	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

Lines 1-6 Link Here

(-)files/patch-avahi-utils_Makefile.in (-3 / +3 lines)
1	--- avahi-utils/Makefile.in.orig 2012-07-09 20:07:19.000000000 +0200	1	--- avahi-utils/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ avahi-utils/Makefile.in 2012-07-09 20:10:46.000000000 +0200	2	+++ avahi-utils/Makefile.in
3	@@ -518,16 +518,16 @@	3	@@ -518,16 +518,16 @@ clean-binPROGRAMS:
4	rm -f $$list	4	rm -f $$list
5	avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) $(EXTRA_avahi_browse_DEPENDENCIES)	5	avahi-browse$(EXEEXT): $(avahi_browse_OBJECTS) $(avahi_browse_DEPENDENCIES) $(EXTRA_avahi_browse_DEPENDENCIES)
6	@rm -f avahi-browse$(EXEEXT)	6	@rm -f avahi-browse$(EXEEXT)

Lines 1-6 Link Here

(-)files/patch-configure (-6 / +6 lines)
1	--- configure.orig Sat Jun 23 02:05:47 2007	1	--- configure.orig 2012-02-14 22:36:33 UTC
2	+++ configure Sat Jun 23 02:13:52 2007	2	+++ configure
3	@@ -20338,6 +20338,7 @@ echo $ECHO_N "checking whether to check	3	@@ -16895,6 +16895,7 @@ $as_echo_n "checking whether to check fo
4	check_inconsistencies=yes	4	check_inconsistencies=yes
5	case "${host_cpu}-${host_os}" in	5	case "${host_cpu}-${host_os}" in
6	-darwin) check_inconsistencies=no ;;	6	-darwin) check_inconsistencies=no ;;
Lines 7-15 Link Here
7	+ -freebsd) check_inconsistencies=no ;;	7	+ -freebsd) check_inconsistencies=no ;;
8	esac	8	esac
9	if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then	9	if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
10	{ echo "$as_me:$LINENO: result: no" >&5	10	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11	@@ -22442,6 +22443,7 @@ cat confdefs.h >>conftest.$ac_ext	11	@@ -18460,6 +18461,7 @@ else
12	cat >>conftest.$ac_ext <<_ACEOF	12	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13	/* end confdefs.h. */	13	/* end confdefs.h. */
14	$ac_includes_default	14	$ac_includes_default
15	+#include <sys/socket.h>	15	+#include <sys/socket.h>

Lines 1-11 Link Here

(-)files/patch-dnsconfd_Makefile.in (-11 lines)
1	--- avahi-dnsconfd/Makefile.in.orig 2010-07-24 20:00:31.000000000 -0400
2	+++ avahi-dnsconfd/Makefile.in 2010-07-24 20:01:08.000000000 -0400
3	@@ -484,7 +484,7 @@ clean-sbinPROGRAMS:
4	rm -f $$list
5	avahi-dnsconfd$(EXEEXT): $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_DEPENDENCIES)
6	@rm -f avahi-dnsconfd$(EXEEXT)
7	- $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS)
8	+ $(AM_V_CCLD)$(avahi_dnsconfd_LINK) $(avahi_dnsconfd_OBJECTS) $(avahi_dnsconfd_LDADD) $(LIBS) $(INTLLIBS)
9	install-pkgsysconfSCRIPTS: $(pkgsysconf_SCRIPTS)
10	@$(NORMAL_INSTALL)
11	test -z "$(pkgsysconfdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"

Lines 1-6 Link Here

(-)files/patch-initscript_freebsd_Makefile.in (-4 / +4 lines)
1	--- initscript/freebsd/Makefile.in.orig 2008-07-03 15:05:53.000000000 -0500	1	--- initscript/freebsd/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ initscript/freebsd/Makefile.in 2008-07-03 15:07:05.000000000 -0500	2	+++ initscript/freebsd/Makefile.in
3	@@ -333,12 +333,12 @@	3	@@ -361,12 +361,12 @@ EXTRA_DIST = \
4	avahi-dnsconfd.sh.in	4	avahi-dnsconfd.sh.in
5		5
6	initd_SCRIPTS = \	6	initd_SCRIPTS = \
Lines 17-23 Link Here
17		17
18	all: all-am	18	all: all-am
19		19
20	@@ -531,11 +531,11 @@	20	@@ -595,11 +595,11 @@ uninstall-am: uninstall-initdSCRIPTS
21	uninstall uninstall-am uninstall-initdSCRIPTS	21	uninstall uninstall-am uninstall-initdSCRIPTS
22		22
23		23

Lines 1-5 Link Here

(-)files/patch-initscript_freebsd_avahi-daemon.sh.in (-2 / +2 lines)
1	--- initscript/freebsd/avahi-daemon.sh.in.orig 2010-06-25 02:54:22.000000000 +0200	1	--- initscript/freebsd/avahi-daemon.sh.in.orig 2010-08-26 00:51:39 UTC
2	+++ initscript/freebsd/avahi-daemon.sh.in 2012-01-15 19:03:55.000000000 +0100	2	+++ initscript/freebsd/avahi-daemon.sh.in
3	@@ -9,13 +9,15 @@	3	@@ -9,13 +9,15 @@
4	# Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.	4	# Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.
5	#	5	#

Lines 1-5 Link Here

(-)files/patch-initscript_freebsd_avahi-dnsconfd.sh.in (-2 / +2 lines)
1	--- initscript/freebsd/avahi-dnsconfd.sh.in.orig 2010-06-25 02:54:22.000000000 +0200	1	--- initscript/freebsd/avahi-dnsconfd.sh.in.orig 2010-08-26 00:51:39 UTC
2	+++ initscript/freebsd/avahi-dnsconfd.sh.in 2012-01-15 19:04:25.000000000 +0100	2	+++ initscript/freebsd/avahi-dnsconfd.sh.in
3	@@ -12,13 +12,15 @@	3	@@ -12,13 +12,15 @@
4	# DNS servers in a DHCP-like fashion with mDNS.	4	# DNS servers in a DHCP-like fashion with mDNS.
5	#	5	#

Return to bug 222345

Line 0 Link Here

(-)files/patch-avahi-compat-libdns__sd_Makefile.in (+59 lines)
	1	--- avahi-compat-libdns_sd/Makefile.in.orig 2017-09-15 01:20:16 UTC
	2	+++ avahi-compat-libdns_sd/Makefile.in
	3	@@ -133,9 +133,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co
	4	null_test_OBJECTS = $(am_null_test_OBJECTS)
	5	am__DEPENDENCIES_1 =
	6	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
	7	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
	8	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la \
	9	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-client/libavahi-client.la
	10	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
	11	null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	12	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
	13	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
	14	@@ -145,8 +143,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt
	15	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-warn.$(OBJEXT)
	16	txt_test_OBJECTS = $(am_txt_test_OBJECTS)
	17	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
	18	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
	19	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la
	20	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
	21	txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
	22	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \
	23	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
	24	@@ -443,7 +440,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
	25	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
	26
	27	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
	28	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
	29	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
	30	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
	31	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
	32	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt.c \
	33	@@ -451,7 +448,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
	34	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
	35
	36	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
	37	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
	38	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
	39	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
	40	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
	41	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ compat.c \
	42	@@ -459,7 +456,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
	43	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
	44
	45	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
	46	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
	47	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
	48	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
	49	all: all-am
	50
	51	@@ -937,7 +934,7 @@ uninstall-am: uninstall-avahi_compat_lib
	52
	53	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
	54	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
	55	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
	56	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la
	57
	58	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	59	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-59 Link Here

(-)files/patch-avahi-compat-libdns_sd_Makefile.in (-59 lines)
1	--- avahi-compat-libdns_sd/Makefile.in.orig 2010-07-24 19:46:12.000000000 -0400
2	+++ avahi-compat-libdns_sd/Makefile.in 2010-07-24 19:49:25.000000000 -0400
3	@@ -127,9 +127,7 @@ am__null_test_SOURCES_DIST = dns_sd.h co
4	null_test_OBJECTS = $(am_null_test_OBJECTS)
5	am__DEPENDENCIES_1 =
6	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
7	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
8	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la \
9	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-client/libavahi-client.la
10	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
11	null_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
12	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(null_test_CFLAGS) \
13	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
14	@@ -139,8 +137,7 @@ am__txt_test_SOURCES_DIST = dns_sd.h txt
15	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt_test-warn.$(OBJEXT)
16	txt_test_OBJECTS = $(am_txt_test_OBJECTS)
17	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
18	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1) \
19	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ ../avahi-common/libavahi-common.la
20	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(am__DEPENDENCIES_1)
21	txt_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
22	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(txt_test_CFLAGS) \
23	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
24	@@ -433,7 +430,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
25	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
26
27	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
28	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
29	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
30	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_SOURCES = \
31	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
32	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ txt.c \
33	@@ -441,7 +438,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
34	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
35
36	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
37	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
38	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
39	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_SOURCES = \
40	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ dns_sd.h \
41	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ compat.c \
42	@@ -449,7 +446,7 @@ AM_CFLAGS = -I$(top_srcdir) '-DDEBUG_TRA
43	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ warn.c warn.h
44
45	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
46	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
47	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) `$(PKG_CONFIG) --libs --cflags avahi-client`
48	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@CLEANFILES = libdns_sd-test.o libdns_sd-test
49	all: all-am
50
51	@@ -943,7 +940,7 @@ uninstall-am: uninstall-avahi_compat_lib
52
53	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@libdns_sd-test: libdns_sd-test.c libdns_sd.la
54	@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
55	-@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
56	+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) libdns_sd.la
57
58	# Tell versions [3.59,3.63) of GNU make to not export all variables.
59	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-6 Link Here

(-)files/patch-avahi-daemon_Makefile.in (-5 / +5 lines)
1	--- avahi-daemon/Makefile.in.orig 2013-01-01 13:45:35.000000000 -0600	1	--- avahi-daemon/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ avahi-daemon/Makefile.in 2013-01-01 13:47:30.000000000 -0600	2	+++ avahi-daemon/Makefile.in
3	@@ -69,7 +69,7 @@	3	@@ -69,7 +69,7 @@ host_triplet = @host@
4	@ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ caps.c caps.h	4	@ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ caps.c caps.h
5		5
6	@ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap	6	@ENABLE_CHROOT_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_3 = -lcap
Lines 9-15 Link Here
9	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_5 = \	9	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@am__append_5 = \
10	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-protocol.c dbus-protocol.h \	10	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-protocol.c dbus-protocol.h \
11	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-util.c dbus-util.h \	11	@HAVE_DBUS_TRUE@@HAVE_LIBDAEMON_TRUE@@HAVE_XML_TRUE@ dbus-util.c dbus-util.h \
12	@@ -688,7 +688,7 @@	12	@@ -688,7 +688,7 @@ clean-sbinPROGRAMS:
13	rm -f $$list	13	rm -f $$list
14	avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_avahi_daemon_DEPENDENCIES)	14	avahi-daemon$(EXEEXT): $(avahi_daemon_OBJECTS) $(avahi_daemon_DEPENDENCIES) $(EXTRA_avahi_daemon_DEPENDENCIES)
15	@rm -f avahi-daemon$(EXEEXT)	15	@rm -f avahi-daemon$(EXEEXT)
Lines 18-24 Link Here
18	ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) $(EXTRA_ini_file_parser_test_DEPENDENCIES)	18	ini-file-parser-test$(EXEEXT): $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_DEPENDENCIES) $(EXTRA_ini_file_parser_test_DEPENDENCIES)
19	@rm -f ini-file-parser-test$(EXEEXT)	19	@rm -f ini-file-parser-test$(EXEEXT)
20	$(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)	20	$(AM_V_CCLD)$(ini_file_parser_test_LINK) $(ini_file_parser_test_OBJECTS) $(ini_file_parser_test_LDADD) $(LIBS)
21	@@ -1222,17 +1222,17 @@	21	@@ -1222,17 +1222,17 @@ uninstall-dist_serviceDATA:
22	files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \	22	files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
23	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)	23	dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir)
24	install-pkgsysconfDATA: $(pkgsysconf_DATA)	24	install-pkgsysconfDATA: $(pkgsysconf_DATA)

Lines 1-5 Link Here

(-)files/patch-avahi-discover-standalone_Makefile.in (-4 / +4 lines)
1	--- avahi-discover-standalone/Makefile.in.orig 2010-07-24 19:51:29.000000000 -0400	1	--- avahi-discover-standalone/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ avahi-discover-standalone/Makefile.in 2010-07-24 19:53:14.000000000 -0400	2	+++ avahi-discover-standalone/Makefile.in
3	@@ -97,9 +97,7 @@ am__DEPENDENCIES_1 =	3	@@ -97,9 +97,7 @@ am__DEPENDENCIES_1 =
4	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)	4	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
5	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \	5	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
Lines 10-17 Link Here
10	+@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = \	10	+@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = \
11	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_2) \	11	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_2) \
12	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_3)	12	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_3)
13	AM_V_lt = $(am__v_lt_$(V))	13	AM_V_lt = $(am__v_lt_@AM_V@)
14	@@ -418,9 +416,7 @@ interfaces = \	14	@@ -428,9 +426,7 @@ interfaces = \
15	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_3)	15	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_3)
16	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_LDADD = \	16	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_LDADD = \
17	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_LDADD) \	17	@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_LDADD) \

Lines 1-6 Link Here

(-)files/patch-avahi-qt_Makefile.in (-9 / +9 lines)
1	--- avahi-qt/Makefile.in.orig 2008-07-03 14:37:05.000000000 -0500	1	--- avahi-qt/Makefile.in.orig 2017-09-15 01:20:16 UTC
2	+++ avahi-qt/Makefile.in 2008-07-03 14:39:27.000000000 -0500	2	+++ avahi-qt/Makefile.in
3	@@ -93,7 +93,6 @@	3	@@ -117,7 +117,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
4	LTLIBRARIES = $(lib_LTLIBRARIES)	4	LTLIBRARIES = $(lib_LTLIBRARIES)
5	am__DEPENDENCIES_1 =	5	am__DEPENDENCIES_1 =
6	@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \	6	@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \
Lines 8-15 Link Here
8	@HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1)	8	@HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1)
9	am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp	9	am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
10	@HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS = \	10	@HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS = \
11	@@ -104,7 +103,6 @@	11	@@ -132,7 +131,6 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V
12	$(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) $(LDFLAGS) -o $@	12	$(LDFLAGS) -o $@
13	@HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)	13	@HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
14	@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \	14	@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \
15	-@HAVE_QT4_TRUE@ ../avahi-common/libavahi-common.la \	15	-@HAVE_QT4_TRUE@ ../avahi-common/libavahi-common.la \
Lines 16-23 Link Here
16	@HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1)	16	@HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1)
17	am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp	17	am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
18	@HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS = \	18	@HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS = \
19	@@ -400,7 +398,7 @@	19	@@ -433,7 +431,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
20	@HAVE_QT3_TRUE@ qt-watch.cpp	20	@HAVE_QT3_TRUE@ qt-watch.cpp
21		21
22	@HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)	22	@HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
23	-@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)	23	-@HAVE_QT3_TRUE@libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
Lines 25-32 Link Here
25	@HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)	25	@HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
26	@HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4	26	@HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
27	@HAVE_QT4_TRUE@avahiqt4include_HEADERS = \	27	@HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
28	@@ -410,7 +408,7 @@	28	@@ -443,7 +441,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
29	@HAVE_QT4_TRUE@ qt-watch.cpp	29	@HAVE_QT4_TRUE@ qt-watch.cpp
30		30
31	@HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)	31	@HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
32	-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)	32	-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)