* Include avahi-compat-howl/samples/Makefile.am

 * 'Fix' avahi-howl-compat.pc to export the howl compatible version rather than avahi's version

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

diff --git a/Makefile.am b/Makefile.am
index ec34757ff53726237d5fb6803e4a1acf719a666b..bbe1cd771bf3339bcd3791fedba26332cee67f61 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,7 @@ avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
 
 avahi-compat-howl.pc: avahi-compat-howl.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
-           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+           -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
 
 CLEANFILES += avahi-client.pc avahi-compat-libdns_sd.pc avahi-compat-howl.pc
 

diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
index 1a636a15d4f52e1246c7c717b172cfaa5b3275d7..0a42903eafb86396c821309c021bedd458610983 100644 (file)
--- a/avahi-compat-howl.pc.in
+++ b/avahi-compat-howl.pc.in
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include/avahi-compat-howl/
 
 Name: avahi-compat-howl
-Description: Avahi Multicast DNS Responder (HOWL) Compatibility)
-Version: @PACKAGE_VERSION@
+Description: Avahi Multicast DNS Responder (HOWL Compatibility)
+Version: @HOWL_COMPAT_VERSION@
 Libs: -L${libdir} -lavahi-compat-howl
 Cflags: -D_REENTRANT -I${includedir}

diff --git a/avahi-compat-howl/samples/Makefile.am b/avahi-compat-howl/samples/Makefile.am
new file mode 100644 (file)
index 0000000..14bbfb7
--- /dev/null
+++ b/avahi-compat-howl/samples/Makefile.am
@@ -0,0 +1,49 @@
+# $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) -I$(top_srcdir)/avahi-compat-howl/include
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+if HAVE_DBUS
+
+noinst_PROGRAMS = browse resolve publish query
+
+browse_SOURCES = \
+       browse.c
+browse_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+browse_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+
+resolve_SOURCES = \
+       resolve.c
+resolve_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+resolve_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+
+publish_SOURCES = \
+       publish.c
+publish_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+publish_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+
+query_SOURCES = \
+       query.c
+query_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+query_LDADD = $(AM_LDADD) ../libavahi-compat-howl.la
+
+endif

diff --git a/configure.ac b/configure.ac
index 1dfc42760edc8cfe0a6c285a8d1cf84155251e53..3bcffabe06959d656062a0505523753f048c47bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0])
 AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
 AC_SUBST(LIBAVAHI_COMPAT_HOWL_VERSION_INFO, [0:0:0])
+AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
 
 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} ***])