libs/avahi/patches/020-no_gettext.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -406,12 +406,6 @@
   4      AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
   5  fi
   6
   7 -IT_PROG_INTLTOOL([0.35.0])
   8 -GETTEXT_PACKAGE=avahi
   9 -AC_SUBST([GETTEXT_PACKAGE])
  10 -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
  11 -AM_GLIB_GNU_GETTEXT
  12 -
  13  avahilocaledir='${prefix}/${DATADIRNAME}/locale'
  14  AC_SUBST(avahilocaledir)
  15
  16 --- a/avahi-python/avahi-discover/Makefile.am
  17 +++ b/avahi-python/avahi-discover/Makefile.am
  18 @@ -41,7 +41,6 @@
  19  pythonscripts += \
  20         avahi-discover
  21  desktop_DATA += avahi-discover.desktop
  22 -@INTLTOOL_DESKTOP_RULE@
  23  avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
  24  endif
  25
  26 @@ -49,7 +48,6 @@
  27  pythonscripts += \
  28         avahi-discover
  29  desktop_DATA += avahi-discover.desktop
  30 -@INTLTOOL_DESKTOP_RULE@
  31  avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
  32  endif
  33
  34 --- a/avahi-python/avahi-discover/Makefile.in
  35 +++ b/avahi-python/avahi-discover/Makefile.in
  36 @@ -1,8 +1,8 @@
  37 -# Makefile.in generated by automake 1.10.2 from Makefile.am.
  38 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  39  # @configure_input@
  40
  41  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  42 -# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  43 +# 2003, 2004, 2005  Free Software Foundation, Inc.
  44  # This Makefile.in is free software; the Free Software Foundation
  45  # gives unlimited permission to copy and/or distribute it,
  46  # with or without modifications, as long as this notice is preserved.
  47 @@ -34,11 +34,15 @@
  48  # USA.
  49
  50
  51 +srcdir = @srcdir@
  52 +top_srcdir = @top_srcdir@
  53  VPATH = @srcdir@
  54  pkgdatadir = $(datadir)/@PACKAGE@
  55  pkglibdir = $(libdir)/@PACKAGE@
  56  pkgincludedir = $(includedir)/@PACKAGE@
  57 +top_builddir = ../..
  58  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  59 +INSTALL = @INSTALL@
  60  install_sh_DATA = $(install_sh) -c -m 644
  61  install_sh_PROGRAM = $(install_sh) -c
  62  install_sh_SCRIPT = $(install_sh) -c
  63 @@ -69,14 +73,8 @@
  64  am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
  65         $(top_srcdir)/common/gcc_stack_protect.m4 \
  66         $(top_srcdir)/common/gcc_visibility.m4 \
  67 -       $(top_srcdir)/common/libtool.m4 \
  68 -       $(top_srcdir)/common/ltoptions.m4 \
  69 -       $(top_srcdir)/common/ltsugar.m4 \
  70 -       $(top_srcdir)/common/ltversion.m4 \
  71 -       $(top_srcdir)/common/lt~obsolete.m4 \
  72 -       $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
  73 -       $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
  74 -       $(top_srcdir)/configure.ac
  75 +       $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
  76 +       $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
  77  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  78         $(ACLOCAL_M4)
  79  mkinstalldirs = $(install_sh) -d
  80 @@ -101,7 +99,8 @@
  81  DATA = $(desktop_DATA)
  82  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  83  ACLOCAL = @ACLOCAL@
  84 -ALL_LINGUAS = @ALL_LINGUAS@
  85 +AMDEP_FALSE = @AMDEP_FALSE@
  86 +AMDEP_TRUE = @AMDEP_TRUE@
  87  AMTAR = @AMTAR@
  88  AR = @AR@
  89  AUTOCONF = @AUTOCONF@
  90 @@ -113,8 +112,8 @@
  91  AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
  92  AVAHI_USER = @AVAHI_USER@
  93  AWK = @AWK@
  94 -CATALOGS = @CATALOGS@
  95 -CATOBJEXT = @CATOBJEXT@
  96 +BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
  97 +BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
  98  CC = @CC@
  99  CCDEPMODE = @CCDEPMODE@
 100  CFLAGS = @CFLAGS@
 101 @@ -125,7 +124,6 @@
 102  CXXDEPMODE = @CXXDEPMODE@
 103  CXXFLAGS = @CXXFLAGS@
 104  CYGPATH_W = @CYGPATH_W@
 105 -DATADIRNAME = @DATADIRNAME@
 106  DBUS_CFLAGS = @DBUS_CFLAGS@
 107  DBUS_LIBS = @DBUS_LIBS@
 108  DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
 109 @@ -133,8 +131,28 @@
 110  DEFS = @DEFS@
 111  DEPDIR = @DEPDIR@
 112  DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 113 -DSYMUTIL = @DSYMUTIL@
 114 -DUMPBIN = @DUMPBIN@
 115 +DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
 116 +DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
 117 +DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
 118 +DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
 119 +DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
 120 +DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
 121 +DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
 122 +DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
 123 +DX_COND_html_FALSE = @DX_COND_html_FALSE@
 124 +DX_COND_html_TRUE = @DX_COND_html_TRUE@
 125 +DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
 126 +DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
 127 +DX_COND_man_FALSE = @DX_COND_man_FALSE@
 128 +DX_COND_man_TRUE = @DX_COND_man_TRUE@
 129 +DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
 130 +DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
 131 +DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
 132 +DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
 133 +DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
 134 +DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
 135 +DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
 136 +DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
 137  DX_CONFIG = @DX_CONFIG@
 138  DX_DOCDIR = @DX_DOCDIR@
 139  DX_DOT = @DX_DOT@
 140 @@ -158,38 +176,85 @@
 141  DX_PDFLATEX = @DX_PDFLATEX@
 142  DX_PERL = @DX_PERL@
 143  DX_PROJECT = @DX_PROJECT@
 144 +ECHO = @ECHO@
 145  ECHO_C = @ECHO_C@
 146  ECHO_N = @ECHO_N@
 147  ECHO_T = @ECHO_T@
 148  EGREP = @EGREP@
 149 +ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
 150 +ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
 151 +ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
 152 +ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
 153 +ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
 154 +ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
 155 +ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
 156 +ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
 157 +ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
 158 +ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
 159 +ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
 160 +ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
 161  EXEEXT = @EXEEXT@
 162 -FGREP = @FGREP@
 163 +F77 = @F77@
 164 +FFLAGS = @FFLAGS@
 165  GACUTIL = @GACUTIL@
 166 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 167  GLADE20_CFLAGS = @GLADE20_CFLAGS@
 168  GLADE20_LIBS = @GLADE20_LIBS@
 169  GLIB20_CFLAGS = @GLIB20_CFLAGS@
 170  GLIB20_LIBS = @GLIB20_LIBS@
 171 -GMOFILES = @GMOFILES@
 172 -GMSGFMT = @GMSGFMT@
 173  GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
 174  GOBJECT_LIBS = @GOBJECT_LIBS@
 175  GREP = @GREP@
 176  GTK20_CFLAGS = @GTK20_CFLAGS@
 177  GTK20_LIBS = @GTK20_LIBS@
 178 +HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
 179 +HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
 180 +HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
 181 +HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
 182 +HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
 183 +HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
 184 +HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
 185 +HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
 186 +HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
 187 +HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
 188 +HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
 189 +HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
 190 +HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
 191 +HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
 192 +HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
 193 +HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
 194 +HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
 195 +HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
 196 +HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
 197 +HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
 198 +HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
 199 +HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
 200 +HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
 201 +HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
 202 +HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
 203 +HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
 204 +HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
 205 +HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
 206 +HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
 207 +HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
 208 +HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
 209 +HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
 210 +HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
 211 +HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
 212 +HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
 213 +HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
 214 +HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
 215 +HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
 216 +HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
 217 +HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
 218 +HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
 219 +HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
 220 +HAVE_XML_FALSE = @HAVE_XML_FALSE@
 221 +HAVE_XML_TRUE = @HAVE_XML_TRUE@
 222  HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
 223 -INSTALL = @INSTALL@
 224  INSTALL_DATA = @INSTALL_DATA@
 225  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 226  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 227  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 228 -INSTOBJEXT = @INSTOBJEXT@
 229 -INTLLIBS = @INTLLIBS@
 230 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 231 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
 232 -INTLTOOL_PERL = @INTLTOOL_PERL@
 233 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 234 -LD = @LD@
 235  LDFLAGS = @LDFLAGS@
 236  LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
 237  LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
 238 @@ -206,29 +271,18 @@
 239  LIBOBJS = @LIBOBJS@
 240  LIBS = @LIBS@
 241  LIBTOOL = @LIBTOOL@
 242 -LIPO = @LIPO@
 243  LN_S = @LN_S@
 244  LTLIBOBJS = @LTLIBOBJS@
 245  MAKEINFO = @MAKEINFO@
 246  MCS = @MCS@
 247  MDASSEMBLER = @MDASSEMBLER@
 248 -MKDIR_P = @MKDIR_P@
 249 -MKINSTALLDIRS = @MKINSTALLDIRS@
 250  MOC_QT3 = @MOC_QT3@
 251  MOC_QT4 = @MOC_QT4@
 252  MONODOCER = @MONODOCER@
 253  MONODOC_CFLAGS = @MONODOC_CFLAGS@
 254  MONODOC_DIR = @MONODOC_DIR@
 255  MONODOC_LIBS = @MONODOC_LIBS@
 256 -MSGFMT = @MSGFMT@
 257 -MSGFMT_OPTS = @MSGFMT_OPTS@
 258 -MSGMERGE = @MSGMERGE@
 259 -NM = @NM@
 260 -NMEDIT = @NMEDIT@
 261 -OBJDUMP = @OBJDUMP@
 262  OBJEXT = @OBJEXT@
 263 -OTOOL = @OTOOL@
 264 -OTOOL64 = @OTOOL64@
 265  PACKAGE = @PACKAGE@
 266  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 267  PACKAGE_NAME = @PACKAGE_NAME@
 268 @@ -238,10 +292,6 @@
 269  PACKAGE_VERSION = @PACKAGE_VERSION@
 270  PATH_SEPARATOR = @PATH_SEPARATOR@
 271  PKG_CONFIG = @PKG_CONFIG@
 272 -POFILES = @POFILES@
 273 -POSUB = @POSUB@
 274 -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 275 -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 276  PTHREAD_CC = @PTHREAD_CC@
 277  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 278  PTHREAD_LIBS = @PTHREAD_LIBS@
 279 @@ -259,20 +309,42 @@
 280  SET_MAKE = @SET_MAKE@
 281  SHELL = @SHELL@
 282  STRIP = @STRIP@
 283 -USE_NLS = @USE_NLS@
 284 +TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
 285 +TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
 286 +TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
 287 +TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
 288 +TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
 289 +TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
 290 +TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
 291 +TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
 292 +TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
 293 +TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
 294 +TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
 295 +TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
 296 +TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
 297 +TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
 298 +TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
 299 +TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
 300 +TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
 301 +TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
 302 +TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
 303 +TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
 304 +TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
 305 +TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
 306 +USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
 307 +USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
 308  VERSION = @VERSION@
 309  VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
 310 -XGETTEXT = @XGETTEXT@
 311  XML_CFLAGS = @XML_CFLAGS@
 312  XML_LIBS = @XML_LIBS@
 313 -abs_builddir = @abs_builddir@
 314 -abs_srcdir = @abs_srcdir@
 315 -abs_top_builddir = @abs_top_builddir@
 316 -abs_top_srcdir = @abs_top_srcdir@
 317  ac_ct_CC = @ac_ct_CC@
 318  ac_ct_CXX = @ac_ct_CXX@
 319 -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 320 +ac_ct_F77 = @ac_ct_F77@
 321  acx_pthread_config = @acx_pthread_config@
 322 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 323 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 324 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 325 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 326  am__include = @am__include@
 327  am__leading_dot = @am__leading_dot@
 328  am__quote = @am__quote@
 329 @@ -287,7 +359,6 @@
 330  build_cpu = @build_cpu@
 331  build_os = @build_os@
 332  build_vendor = @build_vendor@
 333 -builddir = @builddir@
 334  datadir = @datadir@
 335  datarootdir = @datarootdir@
 336  docdir = @docdir@
 337 @@ -309,7 +380,6 @@
 338  libexecdir = @libexecdir@
 339  localedir = @localedir@
 340  localstatedir = @localstatedir@
 341 -lt_ECHO = @lt_ECHO@
 342  mandir = @mandir@
 343  mkdir_p = @mkdir_p@
 344  oldincludedir = @oldincludedir@
 345 @@ -323,12 +393,8 @@
 346  pythondir = @pythondir@
 347  sbindir = @sbindir@
 348  sharedstatedir = @sharedstatedir@
 349 -srcdir = @srcdir@
 350  sysconfdir = @sysconfdir@
 351  target_alias = @target_alias@
 352 -top_build_prefix = @top_build_prefix@
 353 -top_builddir = @top_builddir@
 354 -top_srcdir = @top_srcdir@
 355  AM_CFLAGS = -I$(top_srcdir)
 356  EXTRA_DIST = \
 357         __init__.py \
 358 @@ -353,8 +419,8 @@
 359         @for dep in $?; do \
 360           case '$(am__configure_deps)' in \
 361             *$$dep*) \
 362 -             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 363 -               && { if test -f $@; then exit 0; else break; fi; }; \
 364 +             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 365 +               && exit 0; \
 366               exit 1;; \
 367           esac; \
 368         done; \
 369 @@ -380,7 +446,7 @@
 370         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 371  install-binSCRIPTS: $(bin_SCRIPTS)
 372         @$(NORMAL_INSTALL)
 373 -       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 374 +       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 375         @list='$(bin_SCRIPTS)'; for p in $$list; do \
 376           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 377           if test -f $$d$$p; then \
 378 @@ -403,9 +469,13 @@
 379
 380  clean-libtool:
 381         -rm -rf .libs _libs
 382 +
 383 +distclean-libtool:
 384 +       -rm -f libtool
 385 +uninstall-info-am:
 386  install-avahi_discoverPYTHON: $(avahi_discover_PYTHON)
 387         @$(NORMAL_INSTALL)
 388 -       test -z "$(avahi_discoverdir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_discoverdir)"
 389 +       test -z "$(avahi_discoverdir)" || $(mkdir_p) "$(DESTDIR)$(avahi_discoverdir)"
 390         @list='$(avahi_discover_PYTHON)'; dlist=''; for p in $$list; do\
 391           if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 392           if test -f $$b$$p; then \
 393 @@ -433,7 +503,7 @@
 394         done
 395  install-desktopDATA: $(desktop_DATA)
 396         @$(NORMAL_INSTALL)
 397 -       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 398 +       test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
 399         @list='$(desktop_DATA)'; for p in $$list; do \
 400           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 401           f=$(am__strip_dir) \
 402 @@ -456,21 +526,22 @@
 403
 404
 405  distdir: $(DISTFILES)
 406 -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 407 -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 408 -       list='$(DISTFILES)'; \
 409 -         dist_files=`for file in $$list; do echo $$file; done | \
 410 -         sed -e "s|^$$srcdirstrip/||;t" \
 411 -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 412 -       case $$dist_files in \
 413 -         */*) $(MKDIR_P) `echo "$$dist_files" | \
 414 -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 415 -                          sort -u` ;; \
 416 -       esac; \
 417 -       for file in $$dist_files; do \
 418 +       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 419 +       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 420 +       list='$(DISTFILES)'; for file in $$list; do \
 421 +         case $$file in \
 422 +           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
 423 +           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
 424 +         esac; \
 425           if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 426 +         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 427 +         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 428 +           dir="/$$dir"; \
 429 +           $(mkdir_p) "$(distdir)$$dir"; \
 430 +         else \
 431 +           dir=''; \
 432 +         fi; \
 433           if test -d $$d/$$file; then \
 434 -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 435             if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 436               cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 437             fi; \
 438 @@ -486,7 +557,7 @@
 439  all-am: Makefile $(SCRIPTS) $(DATA)
 440  installdirs:
 441         for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(avahi_discoverdir)" "$(DESTDIR)$(desktopdir)"; do \
 442 -         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 443 +         test -z "$$dir" || $(mkdir_p) "$$dir"; \
 444         done
 445  install: install-am
 446  install-exec: install-exec-am
 447 @@ -519,7 +590,7 @@
 448
 449  distclean: distclean-am
 450         -rm -f Makefile
 451 -distclean-am: clean-am distclean-generic
 452 +distclean-am: clean-am distclean-generic distclean-libtool
 453
 454  dvi: dvi-am
 455
 456 @@ -533,20 +604,12 @@
 457
 458  install-data-am: install-avahi_discoverPYTHON install-desktopDATA
 459
 460 -install-dvi: install-dvi-am
 461 -
 462  install-exec-am: install-binSCRIPTS
 463
 464 -install-html: install-html-am
 465 -
 466  install-info: install-info-am
 467
 468  install-man:
 469
 470 -install-pdf: install-pdf-am
 471 -
 472 -install-ps: install-ps-am
 473 -
 474  installcheck-am:
 475
 476  maintainer-clean: maintainer-clean-am
 477 @@ -566,26 +629,20 @@
 478  ps-am:
 479
 480  uninstall-am: uninstall-avahi_discoverPYTHON uninstall-binSCRIPTS \
 481 -       uninstall-desktopDATA
 482 -
 483 -.MAKE: install-am install-strip
 484 +       uninstall-desktopDATA uninstall-info-am
 485
 486  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 487         distclean distclean-generic distclean-libtool distdir dvi \
 488         dvi-am html html-am info info-am install install-am \
 489         install-avahi_discoverPYTHON install-binSCRIPTS install-data \
 490 -       install-data-am install-desktopDATA install-dvi install-dvi-am \
 491 -       install-exec install-exec-am install-html install-html-am \
 492 -       install-info install-info-am install-man install-pdf \
 493 -       install-pdf-am install-ps install-ps-am install-strip \
 494 -       installcheck installcheck-am installdirs maintainer-clean \
 495 -       maintainer-clean-generic mostlyclean mostlyclean-generic \
 496 -       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
 497 -       uninstall-avahi_discoverPYTHON uninstall-binSCRIPTS \
 498 -       uninstall-desktopDATA
 499 +       install-data-am install-desktopDATA install-exec \
 500 +       install-exec-am install-info install-info-am install-man \
 501 +       install-strip installcheck installcheck-am installdirs \
 502 +       maintainer-clean maintainer-clean-generic mostlyclean \
 503 +       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 504 +       uninstall uninstall-am uninstall-avahi_discoverPYTHON \
 505 +       uninstall-binSCRIPTS uninstall-desktopDATA uninstall-info-am
 506
 507 -@HAVE_GDBM_TRUE@@HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@
 508 -@HAVE_DBM_TRUE@@HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@
 509
 510  @HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi-discover.desktop.in: avahi-discover.desktop.in.in
 511  @HAVE_PYGTK_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@     sed -e 's,@bindir\@,$(bindir),g' $< > $@
 512 --- a/avahi-ui/Makefile.am
 513 +++ b/avahi-ui/Makefile.am
 514 @@ -61,7 +61,6 @@
 515
 516  bin_PROGRAMS = bssh
 517  desktop_DATA += bssh.desktop bvnc.desktop
 518 -@INTLTOOL_DESKTOP_RULE@
 519
 520  bssh_SOURCES = bssh.c
 521  bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
 522 @@ -83,6 +82,5 @@
 523  endif
 524  endif
 525
 526 -@INTLTOOL_DESKTOP_RULE@
 527
 528  CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
 529 --- a/avahi-ui/Makefile.in
 530 +++ b/avahi-ui/Makefile.in
 531 @@ -1,8 +1,8 @@
 532 -# Makefile.in generated by automake 1.10.2 from Makefile.am.
 533 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
 534  # @configure_input@
 535
 536  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 537 -# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 538 +# 2003, 2004, 2005  Free Software Foundation, Inc.
 539  # This Makefile.in is free software; the Free Software Foundation
 540  # gives unlimited permission to copy and/or distribute it,
 541  # with or without modifications, as long as this notice is preserved.
 542 @@ -36,11 +36,15 @@
 543
 544
 545
 546 +srcdir = @srcdir@
 547 +top_srcdir = @top_srcdir@
 548  VPATH = @srcdir@
 549  pkgdatadir = $(datadir)/@PACKAGE@
 550  pkglibdir = $(libdir)/@PACKAGE@
 551  pkgincludedir = $(includedir)/@PACKAGE@
 552 +top_builddir = ..
 553  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 554 +INSTALL = @INSTALL@
 555  install_sh_DATA = $(install_sh) -c -m 644
 556  install_sh_PROGRAM = $(install_sh) -c
 557  install_sh_SCRIPT = $(install_sh) -c
 558 @@ -70,14 +74,8 @@
 559  am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
 560         $(top_srcdir)/common/gcc_stack_protect.m4 \
 561         $(top_srcdir)/common/gcc_visibility.m4 \
 562 -       $(top_srcdir)/common/libtool.m4 \
 563 -       $(top_srcdir)/common/ltoptions.m4 \
 564 -       $(top_srcdir)/common/ltsugar.m4 \
 565 -       $(top_srcdir)/common/ltversion.m4 \
 566 -       $(top_srcdir)/common/lt~obsolete.m4 \
 567 -       $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
 568 -       $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
 569 -       $(top_srcdir)/configure.ac
 570 +       $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
 571 +       $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
 572  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 573         $(ACLOCAL_M4)
 574  mkinstalldirs = $(install_sh) -d
 575 @@ -107,9 +105,6 @@
 576  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        $(am__objects_1) \
 577  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        $(am__objects_2)
 578  libavahi_ui_la_OBJECTS = $(am_libavahi_ui_la_OBJECTS)
 579 -libavahi_ui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 580 -       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libavahi_ui_la_CFLAGS) \
 581 -       $(CFLAGS) $(libavahi_ui_la_LDFLAGS) $(LDFLAGS) -o $@
 582  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@am_libavahi_ui_la_rpath =  \
 583  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        -rpath \
 584  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        $(libdir)
 585 @@ -122,21 +117,17 @@
 586  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        ../avahi-client/libavahi-client.la \
 587  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        ../avahi-common/libavahi-common.la \
 588  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        libavahi-ui.la
 589 -bssh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 590 -       --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 591 -       $(LDFLAGS) -o $@
 592 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 593 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 594  depcomp = $(SHELL) $(top_srcdir)/depcomp
 595  am__depfiles_maybe = depfiles
 596  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 597         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 598 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 599 -       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 600 -       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 601 +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 602 +       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 603 +       $(AM_CFLAGS) $(CFLAGS)
 604  CCLD = $(CC)
 605 -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 606 -       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 607 -       $(LDFLAGS) -o $@
 608 +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 609 +       $(AM_LDFLAGS) $(LDFLAGS) -o $@
 610  SOURCES = $(libavahi_ui_la_SOURCES) $(bssh_SOURCES)
 611  DIST_SOURCES = $(am__libavahi_ui_la_SOURCES_DIST) \
 612         $(am__bssh_SOURCES_DIST)
 613 @@ -149,7 +140,8 @@
 614  CTAGS = ctags
 615  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 616  ACLOCAL = @ACLOCAL@
 617 -ALL_LINGUAS = @ALL_LINGUAS@
 618 +AMDEP_FALSE = @AMDEP_FALSE@
 619 +AMDEP_TRUE = @AMDEP_TRUE@
 620  AMTAR = @AMTAR@
 621  AR = @AR@
 622  AUTOCONF = @AUTOCONF@
 623 @@ -161,8 +153,8 @@
 624  AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
 625  AVAHI_USER = @AVAHI_USER@
 626  AWK = @AWK@
 627 -CATALOGS = @CATALOGS@
 628 -CATOBJEXT = @CATOBJEXT@
 629 +BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
 630 +BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
 631  CC = @CC@
 632  CCDEPMODE = @CCDEPMODE@
 633  CFLAGS = @CFLAGS@
 634 @@ -173,7 +165,6 @@
 635  CXXDEPMODE = @CXXDEPMODE@
 636  CXXFLAGS = @CXXFLAGS@
 637  CYGPATH_W = @CYGPATH_W@
 638 -DATADIRNAME = @DATADIRNAME@
 639  DBUS_CFLAGS = @DBUS_CFLAGS@
 640  DBUS_LIBS = @DBUS_LIBS@
 641  DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
 642 @@ -181,8 +172,28 @@
 643  DEFS = @DEFS@
 644  DEPDIR = @DEPDIR@
 645  DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 646 -DSYMUTIL = @DSYMUTIL@
 647 -DUMPBIN = @DUMPBIN@
 648 +DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
 649 +DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
 650 +DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
 651 +DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
 652 +DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
 653 +DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
 654 +DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
 655 +DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
 656 +DX_COND_html_FALSE = @DX_COND_html_FALSE@
 657 +DX_COND_html_TRUE = @DX_COND_html_TRUE@
 658 +DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
 659 +DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
 660 +DX_COND_man_FALSE = @DX_COND_man_FALSE@
 661 +DX_COND_man_TRUE = @DX_COND_man_TRUE@
 662 +DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
 663 +DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
 664 +DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
 665 +DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
 666 +DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
 667 +DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
 668 +DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
 669 +DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
 670  DX_CONFIG = @DX_CONFIG@
 671  DX_DOCDIR = @DX_DOCDIR@
 672  DX_DOT = @DX_DOT@
 673 @@ -206,38 +217,85 @@
 674  DX_PDFLATEX = @DX_PDFLATEX@
 675  DX_PERL = @DX_PERL@
 676  DX_PROJECT = @DX_PROJECT@
 677 +ECHO = @ECHO@
 678  ECHO_C = @ECHO_C@
 679  ECHO_N = @ECHO_N@
 680  ECHO_T = @ECHO_T@
 681  EGREP = @EGREP@
 682 +ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
 683 +ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
 684 +ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
 685 +ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
 686 +ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
 687 +ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
 688 +ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
 689 +ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
 690 +ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
 691 +ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
 692 +ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
 693 +ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
 694  EXEEXT = @EXEEXT@
 695 -FGREP = @FGREP@
 696 +F77 = @F77@
 697 +FFLAGS = @FFLAGS@
 698  GACUTIL = @GACUTIL@
 699 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 700  GLADE20_CFLAGS = @GLADE20_CFLAGS@
 701  GLADE20_LIBS = @GLADE20_LIBS@
 702  GLIB20_CFLAGS = @GLIB20_CFLAGS@
 703  GLIB20_LIBS = @GLIB20_LIBS@
 704 -GMOFILES = @GMOFILES@
 705 -GMSGFMT = @GMSGFMT@
 706  GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
 707  GOBJECT_LIBS = @GOBJECT_LIBS@
 708  GREP = @GREP@
 709  GTK20_CFLAGS = @GTK20_CFLAGS@
 710  GTK20_LIBS = @GTK20_LIBS@
 711 +HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
 712 +HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
 713 +HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
 714 +HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
 715 +HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
 716 +HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
 717 +HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
 718 +HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
 719 +HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
 720 +HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
 721 +HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
 722 +HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
 723 +HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
 724 +HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
 725 +HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
 726 +HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
 727 +HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
 728 +HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
 729 +HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
 730 +HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
 731 +HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
 732 +HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
 733 +HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
 734 +HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
 735 +HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
 736 +HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
 737 +HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
 738 +HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
 739 +HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
 740 +HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
 741 +HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
 742 +HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
 743 +HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
 744 +HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
 745 +HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
 746 +HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
 747 +HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
 748 +HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
 749 +HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
 750 +HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
 751 +HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
 752 +HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
 753 +HAVE_XML_FALSE = @HAVE_XML_FALSE@
 754 +HAVE_XML_TRUE = @HAVE_XML_TRUE@
 755  HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
 756 -INSTALL = @INSTALL@
 757  INSTALL_DATA = @INSTALL_DATA@
 758  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 759  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 760  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 761 -INSTOBJEXT = @INSTOBJEXT@
 762 -INTLLIBS = @INTLLIBS@
 763 -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 764 -INTLTOOL_MERGE = @INTLTOOL_MERGE@
 765 -INTLTOOL_PERL = @INTLTOOL_PERL@
 766 -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 767 -LD = @LD@
 768  LDFLAGS = @LDFLAGS@
 769  LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
 770  LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
 771 @@ -254,29 +312,18 @@
 772  LIBOBJS = @LIBOBJS@
 773  LIBS = @LIBS@
 774  LIBTOOL = @LIBTOOL@
 775 -LIPO = @LIPO@
 776  LN_S = @LN_S@
 777  LTLIBOBJS = @LTLIBOBJS@
 778  MAKEINFO = @MAKEINFO@
 779  MCS = @MCS@
 780  MDASSEMBLER = @MDASSEMBLER@
 781 -MKDIR_P = @MKDIR_P@
 782 -MKINSTALLDIRS = @MKINSTALLDIRS@
 783  MOC_QT3 = @MOC_QT3@
 784  MOC_QT4 = @MOC_QT4@
 785  MONODOCER = @MONODOCER@
 786  MONODOC_CFLAGS = @MONODOC_CFLAGS@
 787  MONODOC_DIR = @MONODOC_DIR@
 788  MONODOC_LIBS = @MONODOC_LIBS@
 789 -MSGFMT = @MSGFMT@
 790 -MSGFMT_OPTS = @MSGFMT_OPTS@
 791 -MSGMERGE = @MSGMERGE@
 792 -NM = @NM@
 793 -NMEDIT = @NMEDIT@
 794 -OBJDUMP = @OBJDUMP@
 795  OBJEXT = @OBJEXT@
 796 -OTOOL = @OTOOL@
 797 -OTOOL64 = @OTOOL64@
 798  PACKAGE = @PACKAGE@
 799  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 800  PACKAGE_NAME = @PACKAGE_NAME@
 801 @@ -286,10 +333,6 @@
 802  PACKAGE_VERSION = @PACKAGE_VERSION@
 803  PATH_SEPARATOR = @PATH_SEPARATOR@
 804  PKG_CONFIG = @PKG_CONFIG@
 805 -POFILES = @POFILES@
 806 -POSUB = @POSUB@
 807 -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 808 -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 809  PTHREAD_CC = @PTHREAD_CC@
 810  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 811  PTHREAD_LIBS = @PTHREAD_LIBS@
 812 @@ -307,20 +350,42 @@
 813  SET_MAKE = @SET_MAKE@
 814  SHELL = @SHELL@
 815  STRIP = @STRIP@
 816 -USE_NLS = @USE_NLS@
 817 +TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
 818 +TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
 819 +TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
 820 +TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
 821 +TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
 822 +TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
 823 +TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
 824 +TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
 825 +TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
 826 +TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
 827 +TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
 828 +TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
 829 +TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
 830 +TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
 831 +TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
 832 +TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
 833 +TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
 834 +TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
 835 +TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
 836 +TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
 837 +TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
 838 +TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
 839 +USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
 840 +USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
 841  VERSION = @VERSION@
 842  VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
 843 -XGETTEXT = @XGETTEXT@
 844  XML_CFLAGS = @XML_CFLAGS@
 845  XML_LIBS = @XML_LIBS@
 846 -abs_builddir = @abs_builddir@
 847 -abs_srcdir = @abs_srcdir@
 848 -abs_top_builddir = @abs_top_builddir@
 849 -abs_top_srcdir = @abs_top_srcdir@
 850  ac_ct_CC = @ac_ct_CC@
 851  ac_ct_CXX = @ac_ct_CXX@
 852 -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 853 +ac_ct_F77 = @ac_ct_F77@
 854  acx_pthread_config = @acx_pthread_config@
 855 +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 856 +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 857 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 858 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 859  am__include = @am__include@
 860  am__leading_dot = @am__leading_dot@
 861  am__quote = @am__quote@
 862 @@ -335,7 +400,6 @@
 863  build_cpu = @build_cpu@
 864  build_os = @build_os@
 865  build_vendor = @build_vendor@
 866 -builddir = @builddir@
 867  datadir = @datadir@
 868  datarootdir = @datarootdir@
 869  docdir = @docdir@
 870 @@ -357,7 +421,6 @@
 871  libexecdir = @libexecdir@
 872  localedir = @localedir@
 873  localstatedir = @localstatedir@
 874 -lt_ECHO = @lt_ECHO@
 875  mandir = @mandir@
 876  mkdir_p = @mkdir_p@
 877  oldincludedir = @oldincludedir@
 878 @@ -371,12 +434,8 @@
 879  pythondir = @pythondir@
 880  sbindir = @sbindir@
 881  sharedstatedir = @sharedstatedir@
 882 -srcdir = @srcdir@
 883  sysconfdir = @sysconfdir@
 884  target_alias = @target_alias@
 885 -top_build_prefix = @top_build_prefix@
 886 -top_builddir = @top_builddir@
 887 -top_srcdir = @top_srcdir@
 888
 889  # This cool debug trap works on i386/gcc only
 890  AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \
 891 @@ -424,8 +483,8 @@
 892         @for dep in $?; do \
 893           case '$(am__configure_deps)' in \
 894             *$$dep*) \
 895 -             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 896 -               && { if test -f $@; then exit 0; else break; fi; }; \
 897 +             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 898 +               && exit 0; \
 899               exit 1;; \
 900           esac; \
 901         done; \
 902 @@ -451,21 +510,21 @@
 903         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 904  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 905         @$(NORMAL_INSTALL)
 906 -       test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 907 +       test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
 908         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 909           if test -f $$p; then \
 910             f=$(am__strip_dir) \
 911 -           echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 912 -           $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 913 +           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
 914 +           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 915           else :; fi; \
 916         done
 917
 918  uninstall-libLTLIBRARIES:
 919         @$(NORMAL_UNINSTALL)
 920 -       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 921 +       @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 922           p=$(am__strip_dir) \
 923 -         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 924 -         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 925 +         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
 926 +         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 927         done
 928
 929  clean-libLTLIBRARIES:
 930 @@ -477,18 +536,18 @@
 931           rm -f "$${dir}/so_locations"; \
 932         done
 933  libavahi-ui.la: $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_DEPENDENCIES)
 934 -       $(libavahi_ui_la_LINK) $(am_libavahi_ui_la_rpath) $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_LIBADD) $(LIBS)
 935 +       $(LINK) $(am_libavahi_ui_la_rpath) $(libavahi_ui_la_LDFLAGS) $(libavahi_ui_la_OBJECTS) $(libavahi_ui_la_LIBADD) $(LIBS)
 936  install-binPROGRAMS: $(bin_PROGRAMS)
 937         @$(NORMAL_INSTALL)
 938 -       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 939 +       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 940         @list='$(bin_PROGRAMS)'; for p in $$list; do \
 941           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 942           if test -f $$p \
 943              || test -f $$p1 \
 944           ; then \
 945             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 946 -          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
 947 -          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 948 +          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
 949 +          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 950           else :; fi; \
 951         done
 952
 953 @@ -508,7 +567,7 @@
 954         done
 955  bssh$(EXEEXT): $(bssh_OBJECTS) $(bssh_DEPENDENCIES)
 956         @rm -f bssh$(EXEEXT)
 957 -       $(bssh_LINK) $(bssh_OBJECTS) $(bssh_LDADD) $(LIBS)
 958 +       $(LINK) $(bssh_LDFLAGS) $(bssh_OBJECTS) $(bssh_LDADD) $(LIBS)
 959
 960  mostlyclean-compile:
 961         -rm -f *.$(OBJEXT)
 962 @@ -521,50 +580,50 @@
 963  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_ui_la-stdb.Plo@am__quote@
 964
 965  .c.o:
 966 -@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 967 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 968 +@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 969 +@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 970  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 971  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 972  @am__fastdepCC_FALSE@  $(COMPILE) -c $<
 973
 974  .c.obj:
 975 -@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 976 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 977 +@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 978 +@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 979  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 980  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 981  @am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
 982
 983  .c.lo:
 984 -@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 985 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 986 +@am__fastdepCC_TRUE@   if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 987 +@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 988  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 989  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 990  @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 991
 992  libavahi_ui_la-avahi-ui.lo: avahi-ui.c
 993 -@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
 994 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libavahi_ui_la-avahi-ui.Tpo $(DEPDIR)/libavahi_ui_la-avahi-ui.Plo
 995 +@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; \
 996 +@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
 997  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='avahi-ui.c' object='libavahi_ui_la-avahi-ui.lo' libtool=yes @AMDEPBACKSLASH@
 998  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 999 -@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
1000 +@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
1001
1002  libavahi_ui_la-stdb.lo: ../avahi-utils/stdb.c
1003 -@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
1004 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libavahi_ui_la-stdb.Tpo $(DEPDIR)/libavahi_ui_la-stdb.Plo
1005 +@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; \
1006 +@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
1007  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../avahi-utils/stdb.c' object='libavahi_ui_la-stdb.lo' libtool=yes @AMDEPBACKSLASH@
1008  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1009 -@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
1010 +@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
1011
1012  bssh-bssh.o: bssh.c
1013 -@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
1014 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/bssh-bssh.Tpo $(DEPDIR)/bssh-bssh.Po
1015 +@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; \
1016 +@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/bssh-bssh.Tpo" "$(DEPDIR)/bssh-bssh.Po"; else rm -f "$(DEPDIR)/bssh-bssh.Tpo"; exit 1; fi
1017  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='bssh.c' object='bssh-bssh.o' libtool=no @AMDEPBACKSLASH@
1018  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1019  @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
1020
1021  bssh-bssh.obj: bssh.c
1022 -@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`
1023 -@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/bssh-bssh.Tpo $(DEPDIR)/bssh-bssh.Po
1024 +@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`; \
1025 +@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/bssh-bssh.Tpo" "$(DEPDIR)/bssh-bssh.Po"; else rm -f "$(DEPDIR)/bssh-bssh.Tpo"; exit 1; fi
1026  @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='bssh.c' object='bssh-bssh.obj' libtool=no @AMDEPBACKSLASH@
1027  @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1028  @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`
1029 @@ -574,9 +633,13 @@
1030
1031  clean-libtool:
1032         -rm -rf .libs _libs
1033 +
1034 +distclean-libtool:
1035 +       -rm -f libtool
1036 +uninstall-info-am:
1037  install-desktopDATA: $(desktop_DATA)
1038         @$(NORMAL_INSTALL)
1039 -       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
1040 +       test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
1041         @list='$(desktop_DATA)'; for p in $$list; do \
1042           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1043           f=$(am__strip_dir) \
1044 @@ -593,7 +656,7 @@
1045         done
1046  install-avahiincludeHEADERS: $(avahiinclude_HEADERS)
1047         @$(NORMAL_INSTALL)
1048 -       test -z "$(avahiincludedir)" || $(MKDIR_P) "$(DESTDIR)$(avahiincludedir)"
1049 +       test -z "$(avahiincludedir)" || $(mkdir_p) "$(DESTDIR)$(avahiincludedir)"
1050         @list='$(avahiinclude_HEADERS)'; for p in $$list; do \
1051           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1052           f=$(am__strip_dir) \
1053 @@ -614,8 +677,8 @@
1054         unique=`for i in $$list; do \
1055             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1056           done | \
1057 -         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1058 -             END { if (nonempty) { for (i in files) print i; }; }'`; \
1059 +         $(AWK) '    { files[$$0] = 1; } \
1060 +              END { for (i in files) print i; }'`; \
1061         mkid -fID $$unique
1062  tags: TAGS
1063
1064 @@ -627,8 +690,8 @@
1065         unique=`for i in $$list; do \
1066             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1067           done | \
1068 -         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1069 -             END { if (nonempty) { for (i in files) print i; }; }'`; \
1070 +         $(AWK) '    { files[$$0] = 1; } \
1071 +              END { for (i in files) print i; }'`; \
1072         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1073           test -n "$$unique" || unique=$$empty_fix; \
1074           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1075 @@ -638,12 +701,13 @@
1076  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
1077                 $(TAGS_FILES) $(LISP)
1078         tags=; \
1079 +       here=`pwd`; \
1080         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
1081         unique=`for i in $$list; do \
1082             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1083           done | \
1084 -         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1085 -             END { if (nonempty) { for (i in files) print i; }; }'`; \
1086 +         $(AWK) '    { files[$$0] = 1; } \
1087 +              END { for (i in files) print i; }'`; \
1088         test -z "$(CTAGS_ARGS)$$tags$$unique" \
1089           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1090              $$tags $$unique
1091 @@ -657,21 +721,22 @@
1092         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1093
1094  distdir: $(DISTFILES)
1095 -       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1096 -       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1097 -       list='$(DISTFILES)'; \
1098 -         dist_files=`for file in $$list; do echo $$file; done | \
1099 -         sed -e "s|^$$srcdirstrip/||;t" \
1100 -             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1101 -       case $$dist_files in \
1102 -         */*) $(MKDIR_P) `echo "$$dist_files" | \
1103 -                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1104 -                          sort -u` ;; \
1105 -       esac; \
1106 -       for file in $$dist_files; do \
1107 +       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
1108 +       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
1109 +       list='$(DISTFILES)'; for file in $$list; do \
1110 +         case $$file in \
1111 +           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
1112 +           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
1113 +         esac; \
1114           if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1115 +         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
1116 +         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
1117 +           dir="/$$dir"; \
1118 +           $(mkdir_p) "$(distdir)$$dir"; \
1119 +         else \
1120 +           dir=''; \
1121 +         fi; \
1122           if test -d $$d/$$file; then \
1123 -           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1124             if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1125               cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1126             fi; \
1127 @@ -689,7 +754,7 @@
1128
1129  installdirs:
1130         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(avahiincludedir)"; do \
1131 -         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1132 +         test -z "$$dir" || $(mkdir_p) "$$dir"; \
1133         done
1134  install: install-am
1135  install-exec: install-exec-am
1136 @@ -728,7 +793,7 @@
1137         -rm -rf ./$(DEPDIR)
1138         -rm -f Makefile
1139  distclean-am: clean-am distclean-compile distclean-generic \
1140 -       distclean-tags
1141 +       distclean-libtool distclean-tags
1142
1143  dvi: dvi-am
1144
1145 @@ -742,21 +807,13 @@
1146
1147  install-data-am: install-avahiincludeHEADERS install-desktopDATA
1148
1149 -install-dvi: install-dvi-am
1150 -
1151  install-exec-am: install-binPROGRAMS install-exec-local \
1152         install-libLTLIBRARIES
1153
1154 -install-html: install-html-am
1155 -
1156  install-info: install-info-am
1157
1158  install-man:
1159
1160 -install-pdf: install-pdf-am
1161 -
1162 -install-ps: install-ps-am
1163 -
1164  installcheck-am:
1165
1166  maintainer-clean: maintainer-clean-am
1167 @@ -778,9 +835,8 @@
1168  ps-am:
1169
1170  uninstall-am: uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \
1171 -       uninstall-desktopDATA uninstall-libLTLIBRARIES
1172 -
1173 -.MAKE: install-am install-strip
1174 +       uninstall-desktopDATA uninstall-info-am \
1175 +       uninstall-libLTLIBRARIES
1176
1177  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
1178         clean-generic clean-libLTLIBRARIES clean-libtool ctags \
1179 @@ -788,19 +844,17 @@
1180         distclean-libtool distclean-tags distdir dvi dvi-am html \
1181         html-am info info-am install install-am \
1182         install-avahiincludeHEADERS install-binPROGRAMS install-data \
1183 -       install-data-am install-desktopDATA install-dvi install-dvi-am \
1184 -       install-exec install-exec-am install-exec-local install-html \
1185 -       install-html-am install-info install-info-am \
1186 -       install-libLTLIBRARIES install-man install-pdf install-pdf-am \
1187 -       install-ps install-ps-am install-strip installcheck \
1188 -       installcheck-am installdirs maintainer-clean \
1189 -       maintainer-clean-generic mostlyclean mostlyclean-compile \
1190 -       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1191 -       tags uninstall uninstall-am uninstall-avahiincludeHEADERS \
1192 -       uninstall-binPROGRAMS uninstall-desktopDATA \
1193 +       install-data-am install-desktopDATA install-exec \
1194 +       install-exec-am install-exec-local install-info \
1195 +       install-info-am install-libLTLIBRARIES install-man \
1196 +       install-strip installcheck installcheck-am installdirs \
1197 +       maintainer-clean maintainer-clean-generic mostlyclean \
1198 +       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1199 +       pdf pdf-am ps ps-am tags uninstall uninstall-am \
1200 +       uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \
1201 +       uninstall-desktopDATA uninstall-info-am \
1202         uninstall-libLTLIBRARIES
1203
1204 -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@@INTLTOOL_DESKTOP_RULE@
1205
1206  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@install-exec-local:
1207  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        cd $(DESTDIR)/$(bindir) && \
1208 @@ -813,8 +867,6 @@
1209
1210  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bvnc.desktop.in: bvnc.desktop.in.in
1211  @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@        sed -e 's,@bindir\@,$(bindir),g' $< > $@
1212 -
1213 -@INTLTOOL_DESKTOP_RULE@
1214  # Tell versions [3.59,3.63) of GNU make to not export all variables.
1215  # Otherwise a system limit (for SysV at least) may be exceeded.
1216  .NOEXPORT:
1217 --- a/Makefile.am
1218 +++ b/Makefile.am
1219 @@ -75,8 +75,7 @@
1220         avahi-compat-howl \
1221         avahi-autoipd \
1222         avahi-ui \
1223 -       avahi-ui-sharp \
1224 -       po
1225 +       avahi-ui-sharp
1226
1227  DX_INPUT = \
1228         $(srcdir)/avahi-common/address.h \
1229 --- a/Makefile.in
1230 +++ b/Makefile.in
1231 @@ -574,8 +574,7 @@
1232         avahi-compat-howl \
1233         avahi-autoipd \
1234         avahi-ui \
1235 -       avahi-ui-sharp \
1236 -       po
1237 +       avahi-ui-sharp
1238
1239  DX_INPUT = $(srcdir)/avahi-common/address.h \
1240         $(srcdir)/avahi-common/malloc.h \