From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Oct 2005 19:10:08 +0000 (+0000)
Subject: Rename compat-bonjour to compat-libdns_sd to make sure that Apple cannot sue use... 
X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;h=0735d74a85fd71450340d761629cea391a705166;p=catta

Rename compat-bonjour to compat-libdns_sd to make sure that Apple cannot sue use about their "Bonjour" trademark


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@695 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---

diff --git a/compat-bonjour/Makefile.am b/compat-bonjour/Makefile.am
index 37eb1df..5a66743 100644
--- a/compat-bonjour/Makefile.am
+++ b/compat-bonjour/Makefile.am
@@ -22,22 +22,22 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahi_compat_bonjourdir=$(includedir)/avahi-compat-bonjour
+avahi_compat_libdns_sddir=$(includedir)/avahi-compat-libdns_sd
 
-avahi_compat_bonjour_HEADERS = dns_sd.h
+avahi_compat_libdns_sd_HEADERS = dns_sd.h
 
-lib_LTLIBRARIES = libavahi-compat-bonjour.la 
+lib_LTLIBRARIES = libavahi-compat-libdns_sd.la 
 
 noinst_PROGRAMS = txt-test
 
-libavahi_compat_bonjour_la_SOURCES = \
+libavahi_compat_libdns_sd_la_SOURCES = \
 	dns_sd.h \
 	compat.c \
 	txt.c \
 	unsupported.c \
 	warn.c warn.h
-libavahi_compat_bonjour_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libavahi_compat_bonjour_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_BONJOUR_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+libavahi_compat_libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+libavahi_compat_libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
 
 txt_test_SOURCES = \
 	dns_sd.h \
@@ -48,12 +48,12 @@ txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 txt_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
 # You can test the compatibility layer by sticking in mDNSResponder's
-# dns-sd.c source here, naming it "bonjour-test.c" and running "make
-# bonjour-test" manually. We do not distribute that file due to
+# dns-sd.c source here, naming it "libdns_sd-test.c" and running "make
+# libdns_sd-test" manually. We do not distribute that file due to
 # licensing restrictions.
 
-bonjour-test: bonjour-test.c libavahi-compat-bonjour.la
-	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o bonjour-test.o -c bonjour-test.c 
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o bonjour-test bonjour-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libavahi-compat-bonjour.la 
+libdns_sd-test: libdns_sd-test.c libavahi-compat-libdns_sd.la
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c 
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libavahi-compat-libdns_sd.la 
 
-CLEANFILES = bonjour-test.o bonjour-test
+CLEANFILES = libdns_sd-test.o libdns_sd-test
diff --git a/configure.ac b/configure.ac
index 50f46bc..60843bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [2:0:1])
 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBAVAHI_COMPAT_BONJOUR_VERSION_INFO, [1:0:0])
+AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
 
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
     AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])