avahi: upgrade, remove gettext support (it breaks on a few host systems), fix up...
authorFelix Fietkau <nbd@openwrt.org>
Mon, 4 May 2009 23:33:02 +0000 (23:33 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 4 May 2009 23:33:02 +0000 (23:33 +0000)
SVN-Revision: 15609

libs/avahi/Makefile
libs/avahi/patches/010-fix-pkgconfig-file.patch
libs/avahi/patches/020-no_gettext.patch [new file with mode: 0644]

index ee4373a..152a3d5 100644 (file)
@@ -9,15 +9,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=avahi
-PKG_VERSION:=0.6.23
-PKG_RELEASE:=2
+PKG_VERSION:=0.6.25
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://avahi.org/download/
-PKG_MD5SUM:=aab1a304851d8145ea5f6a85c10af9e9
+PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e
 
 PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/avahi/Default
@@ -99,7 +101,8 @@ $(call Package/avahi/Default/description)
  in a DHCP-like fashion. Especially useful on IPv6.
 endef
 
-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
+
 CONFIGURE_ARGS+= \
        --enable-shared \
        --enable-static \
@@ -144,6 +147,11 @@ CONFIGURE_VARS+= \
        CFLAGS="$$$$CFLAGS -DNDEBUG" \
        $(if $(CONFIG_LINUX_2_4),ac_cv_header_sys_inotify_h=no)
 
+define Build/Configure
+       ( cd $(PKG_BUILD_DIR); aclocal; libtoolize; autoreconf; );
+       $(call Build/Configure/Default)
+endef
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
index 791ac85..8a12972 100644 (file)
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -1080,60 +1080,38 @@ uninstall-am: uninstall-pkgconfigDATA
- @DX_COND_doc_TRUE@    INPUT='$(DX_INPUT)' EXAMPLE_PATH='$(DX_EXAMPLE_PATH)' EXAMPLE_PATTERNS='$(DX_EXAMPLE_PATTERNS)' \
- @DX_COND_doc_TRUE@    $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
--avahi-core.pc: avahi-core.pc.in
--      sed -e 's,@prefix\@,$(prefix),g' \
--          -e 's,@libdir\@,$(libdir),g' \
--          -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
--
--@HAVE_DBUS_TRUE@avahi-client.pc: avahi-client.pc.in
--@HAVE_DBUS_TRUE@      sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_DBUS_TRUE@          -e 's,@libdir\@,$(libdir),g' \
--@HAVE_DBUS_TRUE@          -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
--
--@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@avahi-compat-howl.pc: avahi-compat-howl.pc.in
--@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@     sed -e 's,@prefix\@,$(prefix),g' \
--@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@         -e 's,@libdir\@,$(libdir),g' \
--@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@         -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
--
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@        sed -e 's,@prefix\@,$(prefix),g' \
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@            -e 's,@libdir\@,$(libdir),g' \
--@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
--
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: avahi-sharp.pc.in
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@      sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@          -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@          -e 's,@libdir\@,$(libdir),g' $< > $@
--
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-ui-sharp.pc: avahi-ui-sharp.pc.in
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@      sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@          -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@          -e 's,@libdir\@,$(libdir),g' $< > $@
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -63,11 +63,15 @@
+ #
+ # This is usually added to MOSTLYCLEANFILES.
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -82,10 +86,16 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+-      $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \
+-      $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
+-      ChangeLog compile config.guess config.rpath config.sub depcomp \
+-      install-sh ltmain.sh missing py-compile
++      $(srcdir)/Makefile.in $(srcdir)/avahi-client.pc.in \
++      $(srcdir)/avahi-compat-howl.pc.in \
++      $(srcdir)/avahi-compat-libdns_sd.pc.in \
++      $(srcdir)/avahi-core.pc.in $(srcdir)/avahi-glib.pc.in \
++      $(srcdir)/avahi-gobject.pc.in $(srcdir)/avahi-qt3.pc.in \
++      $(srcdir)/avahi-qt4.pc.in $(srcdir)/avahi-ui.pc.in \
++      $(srcdir)/common/doxygen.mk $(srcdir)/config.h.in \
++      $(top_srcdir)/configure ABOUT-NLS ChangeLog compile \
++      config.guess config.rpath config.sub depcomp install-sh \
++      ltmain.sh missing py-compile
+ @HAVE_QT3_TRUE@am__append_1 = \
+ @HAVE_QT3_TRUE@       $(srcdir)/avahi-qt/qt-watch.h
+@@ -146,30 +156,25 @@
+ am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
+       $(top_srcdir)/common/gcc_stack_protect.m4 \
+       $(top_srcdir)/common/gcc_visibility.m4 \
+-      $(top_srcdir)/common/libtool.m4 \
+-      $(top_srcdir)/common/ltoptions.m4 \
+-      $(top_srcdir)/common/ltsugar.m4 \
+-      $(top_srcdir)/common/ltversion.m4 \
+-      $(top_srcdir)/common/lt~obsolete.m4 \
+-      $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
+-      $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
+-      $(top_srcdir)/configure.ac
++      $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
++      $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno config.status.lineno
++ configure.lineno configure.status.lineno
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_FILES = avahi-client.pc avahi-compat-howl.pc \
++      avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \
++      avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-dvi-recursive install-exec-recursive \
+-      install-html-recursive install-info-recursive \
+-      install-pdf-recursive install-ps-recursive install-recursive \
+-      installcheck-recursive installdirs-recursive pdf-recursive \
+-      ps-recursive uninstall-recursive
++      install-exec-recursive install-info-recursive \
++      install-recursive installcheck-recursive installdirs-recursive \
++      pdf-recursive ps-recursive uninstall-info-recursive \
++      uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -179,8 +184,6 @@
+ am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
+-  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -196,7 +199,8 @@
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -208,8 +212,8 @@
+ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
+ AVAHI_USER = @AVAHI_USER@
+ AWK = @AWK@
+-CATALOGS = @CATALOGS@
+-CATOBJEXT = @CATOBJEXT@
++BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
++BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -220,7 +224,6 @@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
+@@ -228,8 +231,28 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+-DSYMUTIL = @DSYMUTIL@
+-DUMPBIN = @DUMPBIN@
++DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
++DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
++DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
++DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
++DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
++DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
++DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
++DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
++DX_COND_html_FALSE = @DX_COND_html_FALSE@
++DX_COND_html_TRUE = @DX_COND_html_TRUE@
++DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
++DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
++DX_COND_man_FALSE = @DX_COND_man_FALSE@
++DX_COND_man_TRUE = @DX_COND_man_TRUE@
++DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
++DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
++DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
++DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
++DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
++DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
++DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
++DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
+ DX_CONFIG = @DX_CONFIG@
+ DX_DOCDIR = @DX_DOCDIR@
+ DX_DOT = @DX_DOT@
+@@ -253,38 +276,85 @@
+ DX_PDFLATEX = @DX_PDFLATEX@
+ DX_PERL = @DX_PERL@
+ DX_PROJECT = @DX_PROJECT@
++ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
++ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
++ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
++ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
++ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
++ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
++ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
++ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
++ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
++ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
++ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
++ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-FGREP = @FGREP@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ GACUTIL = @GACUTIL@
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLADE20_CFLAGS = @GLADE20_CFLAGS@
+ GLADE20_LIBS = @GLADE20_LIBS@
+ GLIB20_CFLAGS = @GLIB20_CFLAGS@
+ GLIB20_LIBS = @GLIB20_LIBS@
+-GMOFILES = @GMOFILES@
+-GMSGFMT = @GMSGFMT@
+ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
+ GOBJECT_LIBS = @GOBJECT_LIBS@
+ GREP = @GREP@
+ GTK20_CFLAGS = @GTK20_CFLAGS@
+ GTK20_LIBS = @GTK20_LIBS@
++HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
++HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
++HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
++HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
++HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
++HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
++HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
++HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
++HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
++HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
++HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
++HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
++HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
++HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
++HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
++HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
++HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
++HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
++HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
++HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
++HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
++HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
++HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
++HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
++HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
++HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
++HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
++HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
++HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
++HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
++HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
++HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
++HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
++HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
++HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
++HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
++HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
++HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
++HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
++HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
++HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
++HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
++HAVE_XML_FALSE = @HAVE_XML_FALSE@
++HAVE_XML_TRUE = @HAVE_XML_TRUE@
+ HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INSTOBJEXT = @INSTOBJEXT@
+-INTLLIBS = @INTLLIBS@
+-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
+ LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
+@@ -301,29 +371,18 @@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+-LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+-MKDIR_P = @MKDIR_P@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOC_QT3 = @MOC_QT3@
+ MOC_QT4 = @MOC_QT4@
+ MONODOCER = @MONODOCER@
+ MONODOC_CFLAGS = @MONODOC_CFLAGS@
+ MONODOC_DIR = @MONODOC_DIR@
+ MONODOC_LIBS = @MONODOC_LIBS@
+-MSGFMT = @MSGFMT@
+-MSGFMT_OPTS = @MSGFMT_OPTS@
+-MSGMERGE = @MSGMERGE@
+-NM = @NM@
+-NMEDIT = @NMEDIT@
+-OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -333,10 +392,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-POFILES = @POFILES@
+-POSUB = @POSUB@
+-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+@@ -354,20 +409,42 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-USE_NLS = @USE_NLS@
++TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
++TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
++TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
++TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
++TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
++TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
++TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
++TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
++TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
++TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
++TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
++TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
++TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
++TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
++TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
++TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
++TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
++TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
++TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
++TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
++TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
++TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
++USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
++USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
+ VERSION = @VERSION@
+ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
+-XGETTEXT = @XGETTEXT@
+ XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++ac_ct_F77 = @ac_ct_F77@
+ acx_pthread_config = @acx_pthread_config@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -382,7 +459,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -404,7 +480,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -418,12 +493,8 @@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I common
+ @DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
+ @DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
+@@ -576,7 +647,7 @@
+ config.h: stamp-h1
+       @if test ! -f $@; then \
+         rm -f stamp-h1; \
+-        $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
++        $(MAKE) stamp-h1; \
+       else :; fi
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -589,6 +660,24 @@
+ distclean-hdr:
+       -rm -f config.h stamp-h1
++avahi-client.pc: $(top_builddir)/config.status $(srcdir)/avahi-client.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-compat-howl.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-howl.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-compat-libdns_sd.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-libdns_sd.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-core.pc: $(top_builddir)/config.status $(srcdir)/avahi-core.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-glib.pc: $(top_builddir)/config.status $(srcdir)/avahi-glib.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-gobject.pc: $(top_builddir)/config.status $(srcdir)/avahi-gobject.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-qt3.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt3.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-qt4.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt4.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
++avahi-ui.pc: $(top_builddir)/config.status $(srcdir)/avahi-ui.pc.in
++      cd $(top_builddir) && $(SHELL) ./config.status $@
+ mostlyclean-libtool:
+       -rm -f *.lo
+@@ -597,10 +686,11 @@
+       -rm -rf .libs _libs
+ distclean-libtool:
+-      -rm -f libtool config.lt
++      -rm -f libtool
++uninstall-info-am:
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
++      test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+       @list='$(pkgconfig_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -647,7 +737,8 @@
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -691,8 +782,8 @@
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -717,8 +808,8 @@
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -728,12 +819,13 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
++      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -748,22 +840,24 @@
+ distdir: $(DISTFILES)
+       $(am__remove_distdir)
+-      test -d $(distdir) || mkdir $(distdir)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      list='$(DISTFILES)'; \
+-        dist_files=`for file in $$list; do echo $$file; done | \
+-        sed -e "s|^$$srcdirstrip/||;t" \
+-            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+-      case $$dist_files in \
+-        */*) $(MKDIR_P) `echo "$$dist_files" | \
+-                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+-                         sort -u` ;; \
+-      esac; \
+-      for file in $$dist_files; do \
++      mkdir $(distdir)
++      $(mkdir_p) $(distdir)/. $(distdir)/avahi-daemon $(distdir)/common $(distdir)/docs $(distdir)/po
++      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++      list='$(DISTFILES)'; for file in $$list; do \
++        case $$file in \
++          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++        esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++          dir="/$$dir"; \
++          $(mkdir_p) "$(distdir)$$dir"; \
++        else \
++          dir=''; \
++        fi; \
+         if test -d $$d/$$file; then \
+-          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -777,7 +871,7 @@
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(MKDIR_P) "$(distdir)/$$subdir" \
++          || $(mkdir_p) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -785,8 +879,6 @@
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
+-              am__remove_distdir=: \
+-              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -797,7 +889,7 @@
+       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+-        ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
++        ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+       || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -807,10 +899,6 @@
+       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       $(am__remove_distdir)
+-dist-lzma: distdir
+-      tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+-      $(am__remove_distdir)
 -
--@HAVE_GLIB_TRUE@avahi-glib.pc: avahi-glib.pc.in
--@HAVE_GLIB_TRUE@      sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_GLIB_TRUE@          -e 's,@libdir\@,$(libdir),g' \
--@HAVE_GLIB_TRUE@          -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ dist-tarZ: distdir
+       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+       $(am__remove_distdir)
+@@ -837,8 +925,6 @@
+         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+       *.tar.bz2*) \
+         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+-      *.tar.lzma*) \
+-        unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.Z*) \
+         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+       *.shar.gz*) \
+@@ -878,7 +964,7 @@
+       $(am__remove_distdir)
+       @(echo "$(distdir) archives ready for distribution: "; \
+         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-        sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
++        sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ distuninstallcheck:
+       @cd $(distuninstallcheck_dir) \
+       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -903,7 +989,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+       for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+-        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++        test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -954,20 +1040,12 @@
+ install-data-am: install-pkgconfigDATA
+-install-dvi: install-dvi-recursive
 -
--@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@avahi-gobject.pc: avahi-gobject.pc.in
--@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@   sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@       -e 's,@libdir\@,$(libdir),g' \
--@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@       -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ install-exec-am:
+-install-html: install-html-recursive
 -
--@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@avahi-ui.pc: avahi-ui.pc.in
--@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@       sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@           -e 's,@libdir\@,$(libdir),g' \
--@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+ install-info: install-info-recursive
+ install-man:
+-install-pdf: install-pdf-recursive
 -
--@HAVE_QT3_TRUE@avahi-qt3.pc: avahi-qt3.pc.in
--@HAVE_QT3_TRUE@       sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_QT3_TRUE@           -e 's,@libdir\@,$(libdir),g' \
--@HAVE_QT3_TRUE@           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+-install-ps: install-ps-recursive
 -
--@HAVE_QT4_TRUE@avahi-qt4.pc: avahi-qt4.pc.in
--@HAVE_QT4_TRUE@       sed -e 's,@prefix\@,$(prefix),g' \
--@HAVE_QT4_TRUE@           -e 's,@libdir\@,$(libdir),g' \
--@HAVE_QT4_TRUE@           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-+avahi-core.pc: $(top_builddir)/config.status avahi-core.pc.in
-+      cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_DBUS_TRUE@avahi-client.pc: $(top_builddir)/config.status avahi-client.pc.in
-+@HAVE_DBUS_TRUE@      cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@avahi-compat-howl.pc: $(top_builddir)/config.status avahi-compat-howl.pc.in
-+@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@     cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@avahi-compat-libdns_sd.pc: $(top_builddir)/config.status avahi-compat-libdns_sd.pc.in
-+@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@        cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: $(top_builddir)/config.status avahi-sharp.pc.in
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@      cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-ui-sharp.pc: $(top_builddir)/config.status avahi-ui-sharp.pc.in
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@      cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_GLIB_TRUE@avahi-glib.pc: $(top_builddir)/config.status avahi-glib.pc.in
-+@HAVE_GLIB_TRUE@      cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@avahi-gobject.pc: $(top_builddir)/config.status avahi-gobject.pc.in
-+@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@   cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@avahi-ui.pc: $(top_builddir)/config.status avahi-ui.pc.in
-+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@       cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_QT3_TRUE@avahi-qt3.pc: $(top_builddir)/config.status avahi-qt3.pc.in
-+@HAVE_QT3_TRUE@       cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+@HAVE_QT4_TRUE@avahi-qt4.pc: $(top_builddir)/config.status avahi-qt4.pc.in
-+@HAVE_QT4_TRUE@       cd $(top_builddir) && $(SHELL) ./config.status $@
- avahi.devhelp: doxygen-run
-       xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
---- a/configure
-+++ b/configure
-@@ -36519,7 +36519,8 @@ fi
- # ==========================================================================
--ac_config_files="$ac_config_files Makefile avahi-common/Makefile avahi-core/Makefile avahi-glib/Makefile avahi-gobject/Makefile avahi-qt/Makefile avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf avahi-discover-standalone/Makefile avahi-client/Makefile initscript/Makefile initscript/debian/Makefile initscript/gentoo/Makefile initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile initscript/mandriva/Makefile initscript/darwin/Makefile initscript/freebsd/Makefile initscript/slackware/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile avahi-python/avahi/Makefile avahi-python/avahi-discover/Makefile examples/Makefile common/Makefile man/Makefile tests/Makefile service-type-database/Makefile avahi-sharp/Makefile avahi-ui-sharp/Makefile avahi-compat-libdns_sd/Makefile avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile avahi-autoipd/Makefile avahi-ui/Makefile po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile avahi-common/Makefile avahi-core/Makefile avahi-glib/Makefile avahi-gobject/Makefile avahi-qt/Makefile avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf avahi-discover-standalone/Makefile avahi-client/Makefile initscript/Makefile initscript/debian/Makefile initscript/gentoo/Makefile initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile initscript/mandriva/Makefile initscript/darwin/Makefile initscript/freebsd/Makefile initscript/slackware/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile avahi-python/avahi/Makefile avahi-python/avahi-discover/Makefile examples/Makefile common/Makefile man/Makefile tests/Makefile service-type-database/Makefile avahi-sharp/Makefile avahi-ui-sharp/Makefile avahi-compat-libdns_sd/Makefile avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile avahi-autoipd/Makefile avahi-ui/Makefile po/Makefile.in avahi-client.pc avahi-compat-howl.pc avahi-compat-howl.pc avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc"
-+
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -37626,6 +37627,15 @@ do
-     "avahi-ui/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-ui/Makefile" ;;
-     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-+    "avahi-client.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-client.pc" ;;
-+    "avahi-compat-howl.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-compat-howl.pc" ;;
-+    "avahi-compat-libdns_sd.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-compat-libdns_sd.pc" ;;
-+    "avahi-core.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-core.pc" ;;
-+    "avahi-glib.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-glib.pc" ;;
-+    "avahi-gobject.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-gobject.pc" ;;
-+    "avahi-qt3.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-qt3.pc" ;;
-+    "avahi-qt4.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-qt4.pc" ;;
-+    "avahi-ui.pc") CONFIG_COMMANDS="$CONFIG_COMMANDS avahi-ui.pc" ;;
-   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -988,27 +1066,26 @@
+ ps-am:
+-uninstall-am: uninstall-pkgconfigDATA
++uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-      install-strip
++uninstall-info: uninstall-info-recursive
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+-      all all-am am--refresh check check-am clean clean-generic \
+-      clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+-      dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+-      distcheck distclean distclean-generic distclean-hdr \
+-      distclean-libtool distclean-tags distcleancheck distdir \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++      check-am clean clean-generic clean-libtool clean-recursive \
++      ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++      dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
++      distclean-generic distclean-hdr distclean-libtool \
++      distclean-recursive distclean-tags distcleancheck distdir \
+       distuninstallcheck dvi dvi-am html html-am info info-am \
+-      install install-am install-data install-data-am install-dvi \
+-      install-dvi-am install-exec install-exec-am install-html \
+-      install-html-am install-info install-info-am install-man \
+-      install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+-      install-ps-am install-strip installcheck installcheck-am \
+-      installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-pkgconfigDATA
++      install install-am install-data install-data-am install-exec \
++      install-exec-am install-info install-info-am install-man \
++      install-pkgconfigDATA install-strip installcheck \
++      installcheck-am installdirs installdirs-am maintainer-clean \
++      maintainer-clean-generic maintainer-clean-recursive \
++      mostlyclean mostlyclean-generic mostlyclean-libtool \
++      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am uninstall-info-am \
++      uninstall-pkgconfigDATA
+ @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
+--- a/configure.ac
++++ b/configure.ac
+@@ -1088,6 +1088,15 @@
+ avahi-autoipd/Makefile
+ avahi-ui/Makefile
+ po/Makefile.in
++avahi-client.pc
++avahi-compat-howl.pc
++avahi-compat-libdns_sd.pc
++avahi-core.pc
++avahi-glib.pc
++avahi-gobject.pc
++avahi-qt3.pc
++avahi-qt4.pc
++avahi-ui.pc
+ ])
+ AC_OUTPUT
diff --git a/libs/avahi/patches/020-no_gettext.patch b/libs/avahi/patches/020-no_gettext.patch
new file mode 100644 (file)
index 0000000..a1b562b
--- /dev/null
@@ -0,0 +1,1240 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -406,12 +406,6 @@
+     AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
+ fi
+-IT_PROG_INTLTOOL([0.35.0])
+-GETTEXT_PACKAGE=avahi
+-AC_SUBST([GETTEXT_PACKAGE])
+-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+-AM_GLIB_GNU_GETTEXT
+-
+ avahilocaledir='${prefix}/${DATADIRNAME}/locale'
+ AC_SUBST(avahilocaledir)
+--- a/avahi-python/avahi-discover/Makefile.am
++++ b/avahi-python/avahi-discover/Makefile.am
+@@ -41,7 +41,6 @@
+ pythonscripts += \
+       avahi-discover
+ desktop_DATA += avahi-discover.desktop
+-@INTLTOOL_DESKTOP_RULE@
+ avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+ endif
+@@ -49,7 +48,6 @@
+ pythonscripts += \
+       avahi-discover
+ desktop_DATA += avahi-discover.desktop
+-@INTLTOOL_DESKTOP_RULE@
+ avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+ endif
+--- a/avahi-python/avahi-discover/Makefile.in
++++ b/avahi-python/avahi-discover/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,11 +34,15 @@
+ # USA.
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,14 +73,8 @@
+ am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
+       $(top_srcdir)/common/gcc_stack_protect.m4 \
+       $(top_srcdir)/common/gcc_visibility.m4 \
+-      $(top_srcdir)/common/libtool.m4 \
+-      $(top_srcdir)/common/ltoptions.m4 \
+-      $(top_srcdir)/common/ltsugar.m4 \
+-      $(top_srcdir)/common/ltversion.m4 \
+-      $(top_srcdir)/common/lt~obsolete.m4 \
+-      $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
+-      $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
+-      $(top_srcdir)/configure.ac
++      $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
++      $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+@@ -101,7 +99,8 @@
+ DATA = $(desktop_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -113,8 +112,8 @@
+ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
+ AVAHI_USER = @AVAHI_USER@
+ AWK = @AWK@
+-CATALOGS = @CATALOGS@
+-CATOBJEXT = @CATOBJEXT@
++BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
++BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -125,7 +124,6 @@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
+@@ -133,8 +131,28 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+-DSYMUTIL = @DSYMUTIL@
+-DUMPBIN = @DUMPBIN@
++DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
++DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
++DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
++DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
++DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
++DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
++DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
++DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
++DX_COND_html_FALSE = @DX_COND_html_FALSE@
++DX_COND_html_TRUE = @DX_COND_html_TRUE@
++DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
++DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
++DX_COND_man_FALSE = @DX_COND_man_FALSE@
++DX_COND_man_TRUE = @DX_COND_man_TRUE@
++DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
++DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
++DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
++DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
++DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
++DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
++DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
++DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
+ DX_CONFIG = @DX_CONFIG@
+ DX_DOCDIR = @DX_DOCDIR@
+ DX_DOT = @DX_DOT@
+@@ -158,38 +176,85 @@
+ DX_PDFLATEX = @DX_PDFLATEX@
+ DX_PERL = @DX_PERL@
+ DX_PROJECT = @DX_PROJECT@
++ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
++ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
++ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
++ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
++ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
++ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
++ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
++ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
++ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
++ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
++ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
++ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-FGREP = @FGREP@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ GACUTIL = @GACUTIL@
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLADE20_CFLAGS = @GLADE20_CFLAGS@
+ GLADE20_LIBS = @GLADE20_LIBS@
+ GLIB20_CFLAGS = @GLIB20_CFLAGS@
+ GLIB20_LIBS = @GLIB20_LIBS@
+-GMOFILES = @GMOFILES@
+-GMSGFMT = @GMSGFMT@
+ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
+ GOBJECT_LIBS = @GOBJECT_LIBS@
+ GREP = @GREP@
+ GTK20_CFLAGS = @GTK20_CFLAGS@
+ GTK20_LIBS = @GTK20_LIBS@
++HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
++HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
++HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
++HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
++HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
++HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
++HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
++HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
++HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
++HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
++HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
++HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
++HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
++HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
++HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
++HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
++HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
++HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
++HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
++HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
++HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
++HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
++HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
++HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
++HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
++HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
++HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
++HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
++HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
++HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
++HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
++HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
++HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
++HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
++HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
++HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
++HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
++HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
++HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
++HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
++HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
++HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
++HAVE_XML_FALSE = @HAVE_XML_FALSE@
++HAVE_XML_TRUE = @HAVE_XML_TRUE@
+ HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INSTOBJEXT = @INSTOBJEXT@
+-INTLLIBS = @INTLLIBS@
+-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
+ LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
+@@ -206,29 +271,18 @@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+-LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+-MKDIR_P = @MKDIR_P@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOC_QT3 = @MOC_QT3@
+ MOC_QT4 = @MOC_QT4@
+ MONODOCER = @MONODOCER@
+ MONODOC_CFLAGS = @MONODOC_CFLAGS@
+ MONODOC_DIR = @MONODOC_DIR@
+ MONODOC_LIBS = @MONODOC_LIBS@
+-MSGFMT = @MSGFMT@
+-MSGFMT_OPTS = @MSGFMT_OPTS@
+-MSGMERGE = @MSGMERGE@
+-NM = @NM@
+-NMEDIT = @NMEDIT@
+-OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -238,10 +292,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-POFILES = @POFILES@
+-POSUB = @POSUB@
+-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+@@ -259,20 +309,42 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-USE_NLS = @USE_NLS@
++TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
++TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
++TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
++TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
++TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
++TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
++TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
++TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
++TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
++TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
++TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
++TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
++TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
++TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
++TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
++TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
++TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
++TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
++TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
++TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
++TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
++TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
++USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
++USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
+ VERSION = @VERSION@
+ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
+-XGETTEXT = @XGETTEXT@
+ XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++ac_ct_F77 = @ac_ct_F77@
+ acx_pthread_config = @acx_pthread_config@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -287,7 +359,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -309,7 +380,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -323,12 +393,8 @@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)
+ EXTRA_DIST = \
+       __init__.py \
+@@ -353,8 +419,8 @@
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+-            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+-              && { if test -f $@; then exit 0; else break; fi; }; \
++            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++              && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+@@ -380,7 +446,7 @@
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binSCRIPTS: $(bin_SCRIPTS)
+       @$(NORMAL_INSTALL)
+-      test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++      test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         if test -f $$d$$p; then \
+@@ -403,9 +469,13 @@
+ clean-libtool:
+       -rm -rf .libs _libs
++
++distclean-libtool:
++      -rm -f libtool
++uninstall-info-am:
+ install-avahi_discoverPYTHON: $(avahi_discover_PYTHON)
+       @$(NORMAL_INSTALL)
+-      test -z "$(avahi_discoverdir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_discoverdir)"
++      test -z "$(avahi_discoverdir)" || $(mkdir_p) "$(DESTDIR)$(avahi_discoverdir)"
+       @list='$(avahi_discover_PYTHON)'; dlist=''; for p in $$list; do\
+         if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
+         if test -f $$b$$p; then \
+@@ -433,7 +503,7 @@
+       done
+ install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
++      test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
+       @list='$(desktop_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -456,21 +526,22 @@
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      list='$(DISTFILES)'; \
+-        dist_files=`for file in $$list; do echo $$file; done | \
+-        sed -e "s|^$$srcdirstrip/||;t" \
+-            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+-      case $$dist_files in \
+-        */*) $(MKDIR_P) `echo "$$dist_files" | \
+-                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+-                         sort -u` ;; \
+-      esac; \
+-      for file in $$dist_files; do \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++      list='$(DISTFILES)'; for file in $$list; do \
++        case $$file in \
++          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++        esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++          dir="/$$dir"; \
++          $(mkdir_p) "$(distdir)$$dir"; \
++        else \
++          dir=''; \
++        fi; \
+         if test -d $$d/$$file; then \
+-          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -486,7 +557,7 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(avahi_discoverdir)" "$(DESTDIR)$(desktopdir)"; do \
+-        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++        test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -519,7 +590,7 @@
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+ dvi: dvi-am
+@@ -533,20 +604,12 @@
+ install-data-am: install-avahi_discoverPYTHON install-desktopDATA
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-binSCRIPTS
+-install-html: install-html-am
+-
+ install-info: install-info-am
+ install-man:
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -566,26 +629,20 @@
+ ps-am:
+ uninstall-am: uninstall-avahi_discoverPYTHON uninstall-binSCRIPTS \
+-      uninstall-desktopDATA
+-
+-.MAKE: install-am install-strip
++      uninstall-desktopDATA uninstall-info-am
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-avahi_discoverPYTHON install-binSCRIPTS install-data \
+-      install-data-am install-desktopDATA install-dvi install-dvi-am \
+-      install-exec install-exec-am install-html install-html-am \
+-      install-info install-info-am install-man install-pdf \
+-      install-pdf-am install-ps install-ps-am install-strip \
+-      installcheck installcheck-am installdirs maintainer-clean \
+-      maintainer-clean-generic mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-      uninstall-avahi_discoverPYTHON uninstall-binSCRIPTS \
+-      uninstall-desktopDATA
++      install-data-am install-desktopDATA install-exec \
++      install-exec-am install-info install-info-am install-man \
++      install-strip installcheck installcheck-am installdirs \
++      maintainer-clean maintainer-clean-generic mostlyclean \
++      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++      uninstall uninstall-am uninstall-avahi_discoverPYTHON \
++      uninstall-binSCRIPTS uninstall-desktopDATA uninstall-info-am
+-@HAVE_GDBM_TRUE@@HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@
+-@HAVE_DBM_TRUE@@HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@
+ @HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi-discover.desktop.in: avahi-discover.desktop.in.in
+ @HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@    sed -e 's,@bindir\@,$(bindir),g' $< > $@
+--- a/avahi-ui/Makefile.am
++++ b/avahi-ui/Makefile.am
+@@ -61,7 +61,6 @@
+ bin_PROGRAMS = bssh
+ desktop_DATA += bssh.desktop bvnc.desktop
+-@INTLTOOL_DESKTOP_RULE@
+ bssh_SOURCES = bssh.c
+ bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+@@ -83,6 +82,5 @@
+ endif
+ endif
+-@INTLTOOL_DESKTOP_RULE@
+ CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
+--- a/avahi-ui/Makefile.in
++++ b/avahi-ui/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -36,11 +36,15 @@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,14 +74,8 @@
+ am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
+       $(top_srcdir)/common/gcc_stack_protect.m4 \
+       $(top_srcdir)/common/gcc_visibility.m4 \
+-      $(top_srcdir)/common/libtool.m4 \
+-      $(top_srcdir)/common/ltoptions.m4 \
+-      $(top_srcdir)/common/ltsugar.m4 \
+-      $(top_srcdir)/common/ltversion.m4 \
+-      $(top_srcdir)/common/lt~obsolete.m4 \
+-      $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
+-      $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
+-      $(top_srcdir)/configure.ac
++      $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
++      $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+@@ -107,9 +105,6 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       $(am__objects_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       $(am__objects_2)
+ libavahi_ui_la_OBJECTS = $(am_libavahi_ui_la_OBJECTS)
+-libavahi_ui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+-      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libavahi_ui_la_CFLAGS) \
+-      $(CFLAGS) $(libavahi_ui_la_LDFLAGS) $(LDFLAGS) -o $@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@am_libavahi_ui_la_rpath =  \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       -rpath \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       $(libdir)
+@@ -122,21 +117,17 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       ../avahi-client/libavahi-client.la \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       ../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       libavahi-ui.la
+-bssh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-      --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-      $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++      $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-      $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++      $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libavahi_ui_la_SOURCES) $(bssh_SOURCES)
+ DIST_SOURCES = $(am__libavahi_ui_la_SOURCES_DIST) \
+       $(am__bssh_SOURCES_DIST)
+@@ -149,7 +140,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -161,8 +153,8 @@
+ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
+ AVAHI_USER = @AVAHI_USER@
+ AWK = @AWK@
+-CATALOGS = @CATALOGS@
+-CATOBJEXT = @CATOBJEXT@
++BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
++BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+@@ -173,7 +165,6 @@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
+@@ -181,8 +172,28 @@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+-DSYMUTIL = @DSYMUTIL@
+-DUMPBIN = @DUMPBIN@
++DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
++DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
++DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
++DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
++DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
++DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
++DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
++DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
++DX_COND_html_FALSE = @DX_COND_html_FALSE@
++DX_COND_html_TRUE = @DX_COND_html_TRUE@
++DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
++DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
++DX_COND_man_FALSE = @DX_COND_man_FALSE@
++DX_COND_man_TRUE = @DX_COND_man_TRUE@
++DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
++DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
++DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
++DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
++DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
++DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
++DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
++DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
+ DX_CONFIG = @DX_CONFIG@
+ DX_DOCDIR = @DX_DOCDIR@
+ DX_DOT = @DX_DOT@
+@@ -206,38 +217,85 @@
+ DX_PDFLATEX = @DX_PDFLATEX@
+ DX_PERL = @DX_PERL@
+ DX_PROJECT = @DX_PROJECT@
++ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
++ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
++ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
++ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
++ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
++ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
++ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
++ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
++ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
++ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
++ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
++ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-FGREP = @FGREP@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ GACUTIL = @GACUTIL@
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLADE20_CFLAGS = @GLADE20_CFLAGS@
+ GLADE20_LIBS = @GLADE20_LIBS@
+ GLIB20_CFLAGS = @GLIB20_CFLAGS@
+ GLIB20_LIBS = @GLIB20_LIBS@
+-GMOFILES = @GMOFILES@
+-GMSGFMT = @GMSGFMT@
+ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
+ GOBJECT_LIBS = @GOBJECT_LIBS@
+ GREP = @GREP@
+ GTK20_CFLAGS = @GTK20_CFLAGS@
+ GTK20_LIBS = @GTK20_LIBS@
++HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
++HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
++HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
++HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
++HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
++HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
++HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
++HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
++HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
++HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
++HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
++HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
++HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
++HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
++HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
++HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
++HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
++HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
++HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
++HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
++HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
++HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
++HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
++HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
++HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
++HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
++HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
++HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
++HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
++HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
++HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
++HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
++HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
++HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
++HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
++HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
++HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
++HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
++HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
++HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
++HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
++HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
++HAVE_XML_FALSE = @HAVE_XML_FALSE@
++HAVE_XML_TRUE = @HAVE_XML_TRUE@
+ HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INSTOBJEXT = @INSTOBJEXT@
+-INTLLIBS = @INTLLIBS@
+-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
+ LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
+@@ -254,29 +312,18 @@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+-LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+-MKDIR_P = @MKDIR_P@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOC_QT3 = @MOC_QT3@
+ MOC_QT4 = @MOC_QT4@
+ MONODOCER = @MONODOCER@
+ MONODOC_CFLAGS = @MONODOC_CFLAGS@
+ MONODOC_DIR = @MONODOC_DIR@
+ MONODOC_LIBS = @MONODOC_LIBS@
+-MSGFMT = @MSGFMT@
+-MSGFMT_OPTS = @MSGFMT_OPTS@
+-MSGMERGE = @MSGMERGE@
+-NM = @NM@
+-NMEDIT = @NMEDIT@
+-OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -286,10 +333,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-POFILES = @POFILES@
+-POSUB = @POSUB@
+-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PTHREAD_CC = @PTHREAD_CC@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+@@ -307,20 +350,42 @@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+-USE_NLS = @USE_NLS@
++TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
++TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
++TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
++TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
++TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
++TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
++TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
++TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
++TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
++TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
++TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
++TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
++TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
++TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
++TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
++TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
++TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
++TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
++TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
++TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
++TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
++TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
++USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
++USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
+ VERSION = @VERSION@
+ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
+-XGETTEXT = @XGETTEXT@
+ XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
++ac_ct_F77 = @ac_ct_F77@
+ acx_pthread_config = @acx_pthread_config@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -335,7 +400,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -357,7 +421,6 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -371,12 +434,8 @@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \
+@@ -424,8 +483,8 @@
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+-            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+-              && { if test -f $@; then exit 0; else break; fi; }; \
++            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++              && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+@@ -451,21 +510,21 @@
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+-      test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++      test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           f=$(am__strip_dir) \
+-          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++          echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++          $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+         else :; fi; \
+       done
+ uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+-      @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++      @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+         p=$(am__strip_dir) \
+-        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++        echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++        $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+       done
+ clean-libLTLIBRARIES:
+@@ -477,18 +536,18 @@
+         rm -f "$${dir}/so_locations"; \
+       done
+ libavahi-ui.la: $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_DEPENDENCIES) 
+-      $(libavahi_ui_la_LINK) $(am_libavahi_ui_la_rpath) $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_LIBADD) $(LIBS)
++      $(LINK) $(am_libavahi_ui_la_rpath) $(libavahi_ui_la_LDFLAGS) $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+-      test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++      test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+            || test -f $$p1 \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-         echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-         $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++         echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++         $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+         else :; fi; \
+       done
+@@ -508,7 +567,7 @@
+       done
+ bssh$(EXEEXT): $(bssh_OBJECTS) $(bssh_DEPENDENCIES) 
+       @rm -f bssh$(EXEEXT)
+-      $(bssh_LINK) $(bssh_OBJECTS) $(bssh_LDADD) $(LIBS)
++      $(LINK) $(bssh_LDFLAGS) $(bssh_OBJECTS) $(bssh_LDADD) $(LIBS)
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+@@ -521,50 +580,50 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_ui_la-stdb.Plo@am__quote@
+ .c.o:
+-@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@  if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+ .c.obj:
+-@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@  if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ .c.lo:
+-@am__fastdepCC_TRUE@  $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@  if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ libavahi_ui_la-avahi-ui.lo: avahi-ui.c
+-@am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -MT libavahi_ui_la-avahi-ui.lo -MD -MP -MF $(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo -c -o libavahi_ui_la-avahi-ui.lo `test -f 'avahi-ui.c' || echo '$(srcdir)/'`avahi-ui.c
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo $(DEPDIR)/libavahi_ui_la-avahi-ui.Plo
++@am__fastdepCC_TRUE@  if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -MT libavahi_ui_la-avahi-ui.lo -MD -MP -MF "$(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo" -c -o libavahi_ui_la-avahi-ui.lo `test -f 'avahi-ui.c' || echo '$(srcdir)/'`avahi-ui.c; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo" "$(DEPDIR)/libavahi_ui_la-avahi-ui.Plo"; else rm -f "$(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='avahi-ui.c' object='libavahi_ui_la-avahi-ui.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -c -o libavahi_ui_la-avahi-ui.lo `test -f 'avahi-ui.c' || echo '$(srcdir)/'`avahi-ui.c
++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -c -o libavahi_ui_la-avahi-ui.lo `test -f 'avahi-ui.c' || echo '$(srcdir)/'`avahi-ui.c
+ libavahi_ui_la-stdb.lo: ../avahi-utils/stdb.c
+-@am__fastdepCC_TRUE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -MT libavahi_ui_la-stdb.lo -MD -MP -MF $(DEPDIR)/libavahi_ui_la-stdb.Tpo -c -o libavahi_ui_la-stdb.lo `test -f '../avahi-utils/stdb.c' || echo '$(srcdir)/'`../avahi-utils/stdb.c
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/libavahi_ui_la-stdb.Tpo $(DEPDIR)/libavahi_ui_la-stdb.Plo
++@am__fastdepCC_TRUE@  if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -MT libavahi_ui_la-stdb.lo -MD -MP -MF "$(DEPDIR)/libavahi_ui_la-stdb.Tpo" -c -o libavahi_ui_la-stdb.lo `test -f '../avahi-utils/stdb.c' || echo '$(srcdir)/'`../avahi-utils/stdb.c; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/libavahi_ui_la-stdb.Tpo" "$(DEPDIR)/libavahi_ui_la-stdb.Plo"; else rm -f "$(DEPDIR)/libavahi_ui_la-stdb.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='../avahi-utils/stdb.c' object='libavahi_ui_la-stdb.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -c -o libavahi_ui_la-stdb.lo `test -f '../avahi-utils/stdb.c' || echo '$(srcdir)/'`../avahi-utils/stdb.c
++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_ui_la_CFLAGS) $(CFLAGS) -c -o libavahi_ui_la-stdb.lo `test -f '../avahi-utils/stdb.c' || echo '$(srcdir)/'`../avahi-utils/stdb.c
+ bssh-bssh.o: bssh.c
+-@am__fastdepCC_TRUE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -MT bssh-bssh.o -MD -MP -MF $(DEPDIR)/bssh-bssh.Tpo -c -o bssh-bssh.o `test -f 'bssh.c' || echo '$(srcdir)/'`bssh.c
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/bssh-bssh.Tpo $(DEPDIR)/bssh-bssh.Po
++@am__fastdepCC_TRUE@  if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -MT bssh-bssh.o -MD -MP -MF "$(DEPDIR)/bssh-bssh.Tpo" -c -o bssh-bssh.o `test -f 'bssh.c' || echo '$(srcdir)/'`bssh.c; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/bssh-bssh.Tpo" "$(DEPDIR)/bssh-bssh.Po"; else rm -f "$(DEPDIR)/bssh-bssh.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='bssh.c' object='bssh-bssh.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -c -o bssh-bssh.o `test -f 'bssh.c' || echo '$(srcdir)/'`bssh.c
+ bssh-bssh.obj: bssh.c
+-@am__fastdepCC_TRUE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -MT bssh-bssh.obj -MD -MP -MF $(DEPDIR)/bssh-bssh.Tpo -c -o bssh-bssh.obj `if test -f 'bssh.c'; then $(CYGPATH_W) 'bssh.c'; else $(CYGPATH_W) '$(srcdir)/bssh.c'; fi`
+-@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/bssh-bssh.Tpo $(DEPDIR)/bssh-bssh.Po
++@am__fastdepCC_TRUE@  if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -MT bssh-bssh.obj -MD -MP -MF "$(DEPDIR)/bssh-bssh.Tpo" -c -o bssh-bssh.obj `if test -f 'bssh.c'; then $(CYGPATH_W) 'bssh.c'; else $(CYGPATH_W) '$(srcdir)/bssh.c'; fi`; \
++@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/bssh-bssh.Tpo" "$(DEPDIR)/bssh-bssh.Po"; else rm -f "$(DEPDIR)/bssh-bssh.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='bssh.c' object='bssh-bssh.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bssh_CFLAGS) $(CFLAGS) -c -o bssh-bssh.obj `if test -f 'bssh.c'; then $(CYGPATH_W) 'bssh.c'; else $(CYGPATH_W) '$(srcdir)/bssh.c'; fi`
+@@ -574,9 +633,13 @@
+ clean-libtool:
+       -rm -rf .libs _libs
++
++distclean-libtool:
++      -rm -f libtool
++uninstall-info-am:
+ install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
++      test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
+       @list='$(desktop_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -593,7 +656,7 @@
+       done
+ install-avahiincludeHEADERS: $(avahiinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+-      test -z "$(avahiincludedir)" || $(MKDIR_P) "$(DESTDIR)$(avahiincludedir)"
++      test -z "$(avahiincludedir)" || $(mkdir_p) "$(DESTDIR)$(avahiincludedir)"
+       @list='$(avahiinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -614,8 +677,8 @@
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -627,8 +690,8 @@
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -638,12 +701,13 @@
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
++      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-            END { if (nonempty) { for (i in files) print i; }; }'`; \
++        $(AWK) '    { files[$$0] = 1; } \
++             END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -657,21 +721,22 @@
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+-      list='$(DISTFILES)'; \
+-        dist_files=`for file in $$list; do echo $$file; done | \
+-        sed -e "s|^$$srcdirstrip/||;t" \
+-            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+-      case $$dist_files in \
+-        */*) $(MKDIR_P) `echo "$$dist_files" | \
+-                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+-                         sort -u` ;; \
+-      esac; \
+-      for file in $$dist_files; do \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++      list='$(DISTFILES)'; for file in $$list; do \
++        case $$file in \
++          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++        esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++          dir="/$$dir"; \
++          $(mkdir_p) "$(distdir)$$dir"; \
++        else \
++          dir=''; \
++        fi; \
+         if test -d $$d/$$file; then \
+-          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -689,7 +754,7 @@
+ installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"; do \
+-        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++        test -z "$$dir" || $(mkdir_p) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -728,7 +793,7 @@
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-      distclean-tags
++      distclean-libtool distclean-tags
+ dvi: dvi-am
+@@ -742,21 +807,13 @@
+ install-data-am: install-avahiincludeHEADERS install-desktopDATA
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-binPROGRAMS install-exec-local \
+       install-libLTLIBRARIES
+-install-html: install-html-am
+-
+ install-info: install-info-am
+ install-man:
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -778,9 +835,8 @@
+ ps-am:
+ uninstall-am: uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \
+-      uninstall-desktopDATA uninstall-libLTLIBRARIES
+-
+-.MAKE: install-am install-strip
++      uninstall-desktopDATA uninstall-info-am \
++      uninstall-libLTLIBRARIES
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+@@ -788,19 +844,17 @@
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am \
+       install-avahiincludeHEADERS install-binPROGRAMS install-data \
+-      install-data-am install-desktopDATA install-dvi install-dvi-am \
+-      install-exec install-exec-am install-exec-local install-html \
+-      install-html-am install-info install-info-am \
+-      install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-      install-ps install-ps-am install-strip installcheck \
+-      installcheck-am installdirs maintainer-clean \
+-      maintainer-clean-generic mostlyclean mostlyclean-compile \
+-      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      tags uninstall uninstall-am uninstall-avahiincludeHEADERS \
+-      uninstall-binPROGRAMS uninstall-desktopDATA \
++      install-data-am install-desktopDATA install-exec \
++      install-exec-am install-exec-local install-info \
++      install-info-am install-libLTLIBRARIES install-man \
++      install-strip installcheck installcheck-am installdirs \
++      maintainer-clean maintainer-clean-generic mostlyclean \
++      mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++      pdf pdf-am ps ps-am tags uninstall uninstall-am \
++      uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \
++      uninstall-desktopDATA uninstall-info-am \
+       uninstall-libLTLIBRARIES
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@@INTLTOOL_DESKTOP_RULE@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@install-exec-local:
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       cd $(DESTDIR)/$(bindir) && \
+@@ -813,8 +867,6 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bvnc.desktop.in: bvnc.desktop.in.in
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@       sed -e 's,@bindir\@,$(bindir),g' $< > $@
+-
+-@INTLTOOL_DESKTOP_RULE@
+ # 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.
+ .NOEXPORT:
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -75,8 +75,7 @@
+       avahi-compat-howl \
+       avahi-autoipd \
+       avahi-ui \
+-      avahi-ui-sharp \
+-      po
++      avahi-ui-sharp
+ DX_INPUT = \
+       $(srcdir)/avahi-common/address.h \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -574,8 +574,7 @@
+       avahi-compat-howl \
+       avahi-autoipd \
+       avahi-ui \
+-      avahi-ui-sharp \
+-      po
++      avahi-ui-sharp
+ DX_INPUT = $(srcdir)/avahi-common/address.h \
+       $(srcdir)/avahi-common/malloc.h \