62be5cb5de
This updates the avahi package from 0.6.25 to 0.6.28, which, according to the avahi developers, incorporates bugfixes and fixes minor security issues. There seems to be an ongoing problem in certain situations where the avahi-daemon stops working, e.g. see http://www.mail-archive.com/avahi@lists.freedesktop.org/msg01512.html It is not known if 0.6.28 fixes that, but at least we will be working off the latest version. Signed-off-by: Mike Brady <mikebrady@eircom.net> git-svn-id: svn://svn.openwrt.org/openwrt/packages@23595 3c298f89-4303-0410-b956-a3cf2f4a3e73
87 lines
2.0 KiB
Diff
87 lines
2.0 KiB
Diff
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -75,8 +75,7 @@ SUBDIRS = \
|
|
avahi-compat-howl \
|
|
avahi-autoipd \
|
|
avahi-ui \
|
|
- avahi-ui-sharp \
|
|
- po
|
|
+ avahi-ui-sharp
|
|
|
|
DX_INPUT = \
|
|
$(srcdir)/avahi-common/address.h \
|
|
--- a/avahi-python/avahi-discover/Makefile.am
|
|
+++ b/avahi-python/avahi-discover/Makefile.am
|
|
@@ -38,7 +38,6 @@ if HAVE_GDBM
|
|
pythonscripts += \
|
|
avahi-discover
|
|
desktop_DATA += avahi-discover.desktop
|
|
-@INTLTOOL_DESKTOP_RULE@
|
|
avahi_discover_PYTHON += __init__.py
|
|
endif
|
|
|
|
@@ -46,7 +45,6 @@ if HAVE_DBM
|
|
pythonscripts += \
|
|
avahi-discover
|
|
desktop_DATA += avahi-discover.desktop
|
|
-@INTLTOOL_DESKTOP_RULE@
|
|
avahi_discover_PYTHON += __init__.py
|
|
endif
|
|
|
|
--- a/avahi-ui/Makefile.am
|
|
+++ b/avahi-ui/Makefile.am
|
|
@@ -78,7 +78,6 @@ endif
|
|
|
|
bin_PROGRAMS = bssh
|
|
desktop_DATA += bssh.desktop bvnc.desktop
|
|
-@INTLTOOL_DESKTOP_RULE@
|
|
|
|
bssh_SOURCES = bssh.c
|
|
|
|
@@ -106,6 +105,4 @@ endif # HAVE_GLIB
|
|
endif
|
|
endif
|
|
|
|
-@INTLTOOL_DESKTOP_RULE@
|
|
-
|
|
CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -18,12 +18,12 @@
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
# USA.
|
|
|
|
-AC_PREREQ(2.63)
|
|
+AC_PREREQ(2.62)
|
|
AC_INIT([avahi],[0.6.28],[avahi (at) lists (dot) freedesktop (dot) org])
|
|
AC_CONFIG_SRCDIR([avahi-core/server.c])
|
|
AC_CONFIG_MACRO_DIR([common])
|
|
AC_CONFIG_HEADERS([config.h])
|
|
-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
|
|
+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
|
|
|
|
AC_SUBST(PACKAGE_URL, [http://avahi.org/])
|
|
|
|
@@ -43,7 +43,7 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
|
|
|
|
AC_CANONICAL_HOST
|
|
|
|
-AM_SILENT_RULES([yes])
|
|
+#AM_SILENT_RULES([yes])
|
|
|
|
AC_CHECK_PROG([STOW], [stow], [yes], [no])
|
|
|
|
@@ -412,12 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then
|
|
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)
|
|
|