summaryrefslogtreecommitdiff
path: root/package/avahi
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-08 13:14:52 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-08 13:14:52 +0100
commit1253d4536941cc33f12c7edabb5b9900430a1388 (patch)
tree40061bb73a1bf2906fe44f6ca8cbd5a941a65249 /package/avahi
parent9928b3390495b5a3e4b63deb60ad8d44a8f9be5f (diff)
update to latest upstream version
Diffstat (limited to 'package/avahi')
-rw-r--r--package/avahi/Makefile34
-rw-r--r--package/avahi/patches/patch-configure519
-rw-r--r--package/avahi/patches/patch-ltmain_sh11
3 files changed, 18 insertions, 546 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index e7f46b043..5ae252281 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= avahi
-PKG_VERSION:= 0.6.25
+PKG_VERSION:= 0.6.28
PKG_RELEASE:= 1
-PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e
+PKG_MD5SUM:= d0143a5aa3265019072e53ab497818d0
PKG_DESCR:= mDNS daemon
PKG_SECTION:= dhcp
-PKG_DEPENDS:= libavahi libdaemon libexpat libintl
-PKG_BUILDDEP:= libdaemon expat gdbm glib gettext
+PKG_DEPENDS:= libavahi libdaemon libexpat libintl libgtk
+PKG_BUILDDEP:= libdaemon expat gdbm glib gettext gtk+
PKG_URL:= http://avahi.org/
PKG_SITES:= http://avahi.org/download/
PKG_NEED_CXX:= 1
@@ -29,11 +29,12 @@ $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PK
TARGET_LDFLAGS+= -lintl
CONFIGURE_ARGS+= --enable-glib \
+ --enable-gtk2 \
+ --enable-libdaemon \
--disable-qt3 \
--disable-qt4 \
- --disable-gtk \
+ --disable-gtk3 \
--disable-dbus \
- --enable-libdaemon \
--disable-python \
--disable-pygtk \
--disable-python-dbus \
@@ -54,11 +55,10 @@ CONFIGURE_ARGS+= --enable-glib \
--with-avahi-user=avahi \
--with-avahi-group=avahi
-post-install:
- # avahi daemon
+avahi-daemon-install:
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi
${INSTALL_DATA} ./files/avahi-daemon.conf \
- ${IDIR_AVAHI_DAEMON}/etc/avahi/
+ ${IDIR_AVAHI_DAEMON}/etc/avahi
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi/services
${INSTALL_DATA} ./files/service-http \
${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
@@ -66,19 +66,21 @@ post-install:
${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
${CP} ${WRKINST}/usr/sbin/avahi-daemon \
- ${IDIR_AVAHI_DAEMON}/usr/sbin/
- # avahi dnsconfd
+ ${IDIR_AVAHI_DAEMON}/usr/sbin
+
+avahi-dnsconfd-install:
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/etc/avahi
${CP} ${WRKINST}/etc/avahi/avahi-dnsconfd.action \
- ${IDIR_AVAHI_DNSCONFD}/etc/avahi/
+ ${IDIR_AVAHI_DNSCONFD}/etc/avahi
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/usr/sbin
${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd \
- ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
- # libavahi
+ ${IDIR_AVAHI_DNSCONFD}/usr/sbin
+
+libavahi-install:
${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
${CP} ${WRKINST}/usr/lib/libavahi-common.so* \
- ${IDIR_LIBAVAHI}/usr/lib/
+ ${IDIR_LIBAVAHI}/usr/lib
${CP} ${WRKINST}/usr/lib/libavahi-core.so* \
- ${IDIR_LIBAVAHI}/usr/lib/
+ ${IDIR_LIBAVAHI}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/avahi/patches/patch-configure b/package/avahi/patches/patch-configure
deleted file mode 100644
index b973749db..000000000
--- a/package/avahi/patches/patch-configure
+++ /dev/null
@@ -1,519 +0,0 @@
---- avahi-0.6.25.orig/configure 2009-04-14 03:57:18.000000000 +0200
-+++ avahi-0.6.25/configure 2009-06-12 20:47:01.000000000 +0200
-@@ -21663,272 +21663,6 @@ $as_echo "$USE_NLS" >&6; }
-
-
-
--case "$am__api_version" in
-- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- ;;
-- *)
-- ;;
--esac
--
--if test -n "0.35.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
--$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
--
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--# Extract the first word of "intltool-update", so it can be a program name with args.
--set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $INTLTOOL_UPDATE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
--if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
--$as_echo "$INTLTOOL_UPDATE" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--# Extract the first word of "intltool-merge", so it can be a program name with args.
--set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $INTLTOOL_MERGE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
--if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
--$as_echo "$INTLTOOL_MERGE" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--# Extract the first word of "intltool-extract", so it can be a program name with args.
--set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $INTLTOOL_EXTRACT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
--if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
--$as_echo "$INTLTOOL_EXTRACT" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
-- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
- # Check the gettext tools to make sure they are GNU
-@@ -22093,243 +21827,6 @@ $as_echo "no" >&6; }
- fi
-
-
--if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
--mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
--mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
--if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--# Extract the first word of "perl", so it can be a program name with args.
--set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- case $INTLTOOL_PERL in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- ;;
--esac
--fi
--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
--if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--$as_echo "$INTLTOOL_PERL" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
--$as_echo "$as_me: error: perl not found" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
--$as_echo_n "checking for perl >= 5.8.1... " >&6; }
--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
--$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--else
-- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
--$as_echo "$IT_PERL_VERSION" >&6; }
--fi
--if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
--$as_echo_n "checking for XML::Parser... " >&6; }
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
--$as_echo "ok" >&6; }
-- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
--
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--
--
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- DATADIRNAME=share
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-- DATADIRNAME=share
--else
-- DATADIRNAME=lib
--fi
--
-- ;;
-- *)
-- DATADIRNAME=lib
-- ;;
-- esac
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--
-
-
-
diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh
deleted file mode 100644
index 2bd6af820..000000000
--- a/package/avahi/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-0.6.25.orig/ltmain.sh 2009-04-14 03:48:18.000000000 +0200
-+++ avahi-0.6.25/ltmain.sh 2011-01-14 18:46:07.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"