3 @@ -75,8 +75,7 @@ SUBDIRS = \
12 $(srcdir)/avahi-common/address.h \
13 --- a/avahi-python/avahi-discover/Makefile.am
14 +++ b/avahi-python/avahi-discover/Makefile.am
15 @@ -38,7 +38,6 @@ if HAVE_GDBM
18 desktop_DATA += avahi-discover.desktop
19 -@INTLTOOL_DESKTOP_RULE@
20 avahi_discover_PYTHON += __init__.py
23 @@ -46,7 +45,6 @@ if HAVE_DBM
26 desktop_DATA += avahi-discover.desktop
27 -@INTLTOOL_DESKTOP_RULE@
28 avahi_discover_PYTHON += __init__.py
31 --- a/avahi-ui/Makefile.am
32 +++ b/avahi-ui/Makefile.am
33 @@ -78,7 +78,6 @@ endif
36 desktop_DATA += bssh.desktop bvnc.desktop
37 -@INTLTOOL_DESKTOP_RULE@
41 @@ -106,6 +105,4 @@ endif # HAVE_GLIB
45 -@INTLTOOL_DESKTOP_RULE@
47 CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
50 @@ -23,7 +23,7 @@ AC_INIT([avahi],[0.6.29],[avahi (at) lis
51 AC_CONFIG_SRCDIR([avahi-core/server.c])
52 AC_CONFIG_MACRO_DIR([common])
53 AC_CONFIG_HEADERS([config.h])
54 -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
55 +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax])
57 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
59 @@ -43,8 +43,6 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
63 -AM_SILENT_RULES([yes])
65 AC_CHECK_PROG([STOW], [stow], [yes], [no])
67 AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
68 @@ -412,12 +410,6 @@ if test "x$have_kqueue" = "xyes" ; then
69 AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
72 -IT_PROG_INTLTOOL([0.35.0])
73 -GETTEXT_PACKAGE=avahi
74 -AC_SUBST([GETTEXT_PACKAGE])
75 -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
78 avahilocaledir='${prefix}/${DATADIRNAME}/locale'
79 AC_SUBST(avahilocaledir)