* integrate avahi-compat-howl into build system

* compat-libdns_sd: warn to syslog in addition to STDERR
* compat-howl: make use of compat-libdns_sd warning functions


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

3 files changed, 139 insertions, 0 deletions

diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
new file mode 100644
index 0000000..3239086
--- /dev/null
+++ b/avahi-compat-howl/Makefile.am
@@ -0,0 +1,79 @@
+# $Id$
+
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+if HAVE_DBUS
+
+avahi_compat_howldir=$(includedir)/avahi-compat-howl
+
+avahi_compat_howl_HEADERS = \
+	include/howl.h \
+	include/rendezvous/rendezvous.h \
+	include/rendezvous/text_record.h \
+	include/corby/message.h \
+	include/corby/object.h \
+	include/corby/orb.h \
+	include/corby/corby.h \
+	include/corby/channel.h \
+	include/corby/buffer.h \
+	include/discovery/discovery.h \
+	include/discovery/text_record.h \
+	include/salt/socket.h \
+	include/salt/address.h \
+	include/salt/platform.h \
+	include/salt/signal.h \
+	include/salt/interface.h \
+	include/salt/salt.h \
+	include/salt/time.h \
+	include/salt/debug.h
+
+lib_LTLIBRARIES = libavahi-compat-howl.la 
+
+#noinst_PROGRAMS = txt-test
+
+libavahi_compat_howl_la_SOURCES = \
+	$(avahi_compat_howl_HEADERS) \
+	warn.c warn.h
+libavahi_compat_howl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+libavahi_compat_howl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+
+#txt_test_SOURCES = \
+#	dns_sd.h \
+#	txt.c \
+#	txt-test.c \
+#	warn.c warn.h
+#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 "libdns_sd-test.c" and running "make
+# libdns_sd-test" manually. We do not distribute that file due to
+# licensing restrictions.
+
+#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 = libdns_sd-test.o libdns_sd-test
+
+endif
diff --git a/avahi-compat-howl/warn.c b/avahi-compat-howl/warn.c
new file mode 100644
index 0000000..a792c98
--- /dev/null
+++ b/avahi-compat-howl/warn.c
@@ -0,0 +1,30 @@
+/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "warn.h"
+
+#define COMPAT_LAYER "HOWL"
+
+#include "../avahi-compat-libdns_sd/warn.c"
diff --git a/avahi-compat-howl/warn.h b/avahi-compat-howl/warn.h
new file mode 100644
index 0000000..13dbb31
--- /dev/null
+++ b/avahi-compat-howl/warn.h
@@ -0,0 +1,30 @@
+#ifndef foowarnhhowlfoo
+#define foowarnhhowlfoo
+
+/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#define avahi_warn_unsupported avahi_warn_unsupported_HOWL
+#define avahi_warn_linkage avahi_warn_linkage_HOWL
+
+#include "../avahi-compat-libdns_sd/warn.h"
+
+#endif