From ed77e0c5ce6e54ba4d5ca3e70b16f12525727bb1 Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Thu, 24 Jun 2021 13:48:39 +0900 Subject: [PATCH] Imported Upstream version 0.8 Change-Id: Ib81a944ad033de2d7040747cc8c76a5ff4f7c546 --- ChangeLog | 2 +- Makefile.am | 27 +- Makefile.in | 151 +- acinclude.m4 | 3 +- aclocal.m4 | 513 +-- autogen.sh | 3 +- avahi-autoipd/Makefile.in | 50 +- avahi-autoipd/main.c | 2 +- avahi-client/Makefile.in | 50 +- avahi-client/lookup.h | 38 +- avahi-common/Makefile.in | 50 +- avahi-common/dbus.h | 6 +- avahi-common/strlst-test.c | 1 + avahi-common/strlst.c | 76 +- avahi-compat-howl/Makefile.in | 50 +- avahi-compat-howl/samples/Makefile.in | 50 +- avahi-compat-libdns_sd/Makefile.in | 50 +- avahi-core/Makefile.in | 50 +- avahi-core/avahi-test.c | 24 +- avahi-core/browse-dns-server.c | 33 +- avahi-core/browse-domain.c | 28 +- avahi-core/browse-service-type.c | 25 +- avahi-core/browse-service.c | 27 +- avahi-core/browse.c | 37 +- avahi-core/core.h | 1 + avahi-core/dns-srv-rr.h | 15 + avahi-core/iface-linux.c | 4 +- avahi-core/iface-pfroute.c | 8 +- avahi-core/iface.c | 5 +- avahi-core/lookup.h | 97 + avahi-core/resolve-address.c | 30 +- avahi-core/resolve-host-name.c | 33 +- avahi-core/resolve-service.c | 42 +- avahi-core/server.c | 70 +- avahi-core/socket.c | 19 +- avahi-daemon/Makefile.in | 50 +- avahi-daemon/avahi-daemon.conf | 1 + avahi-daemon/dbus-async-address-resolver.c | 27 + avahi-daemon/dbus-async-host-name-resolver.c | 27 + avahi-daemon/dbus-async-service-resolver.c | 35 +- avahi-daemon/dbus-domain-browser.c | 29 + avahi-daemon/dbus-internal.h | 25 + avahi-daemon/dbus-protocol.c | 1488 +++++---- avahi-daemon/dbus-record-browser.c | 27 + avahi-daemon/dbus-service-browser.c | 27 + avahi-daemon/dbus-service-type-browser.c | 27 + avahi-daemon/dbus-util.c | 3 + avahi-daemon/main.c | 12 + .../org.freedesktop.Avahi.AddressResolver.xml | 2 + .../org.freedesktop.Avahi.DomainBrowser.xml | 2 + .../org.freedesktop.Avahi.HostNameResolver.xml | 2 + .../org.freedesktop.Avahi.RecordBrowser.xml | 2 + avahi-daemon/org.freedesktop.Avahi.Server.xml | 186 ++ .../org.freedesktop.Avahi.ServiceBrowser.xml | 2 + .../org.freedesktop.Avahi.ServiceResolver.xml | 2 + .../org.freedesktop.Avahi.ServiceTypeBrowser.xml | 2 + avahi-daemon/static-services.c | 9 +- avahi-discover-standalone/Makefile.in | 50 +- avahi-dnsconfd/Makefile.in | 50 +- avahi-glib/Makefile.in | 50 +- avahi-gobject/Makefile.in | 50 +- avahi-libevent.pc.in | 11 + avahi-libevent/Makefile.am | 51 + avahi-libevent/Makefile.in | 930 ++++++ avahi-libevent/libevent-watch-test.c | 96 + avahi-libevent/libevent-watch.c | 318 ++ avahi-libevent/libevent-watch.h | 52 + avahi-python/Makefile.in | 50 +- avahi-python/avahi-bookmarks.in | 48 +- avahi-python/avahi-discover/Makefile.am | 11 +- avahi-python/avahi-discover/Makefile.in | 153 +- avahi-python/avahi-discover/__init__.py | 18 - .../avahi-discover/avahi-discover.desktop.in.in | 5 +- avahi-python/avahi-discover/avahi-discover.py | 7 +- avahi-python/avahi/Makefile.am | 22 +- avahi-python/avahi/Makefile.in | 443 ++- avahi-python/avahi/ServiceTypeDatabase.py.in | 33 +- avahi-python/avahi/__init__.py | 24 +- avahi-python/avahi/test.py | 85 + avahi-qt/Makefile.am | 22 + avahi-qt/Makefile.in | 160 +- avahi-qt/qt-watch.cpp | 18 +- avahi-qt5.pc.in | 11 + avahi-sharp/Makefile.in | 50 +- avahi-ui-sharp/Makefile.in | 50 +- avahi-ui/Makefile.am | 9 +- avahi-ui/Makefile.in | 57 +- avahi-ui/bssh.desktop.in.in | 5 +- avahi-ui/bvnc.desktop.in.in | 5 +- avahi-utils/Makefile.in | 50 +- bootstrap.sh | 10 +- common/ChangeLog | 2 +- common/Makefile.am | 2 +- common/Makefile.in | 52 +- common/intltool.m4 | 212 -- common/qt5-pie.m4 | 27 + config.guess | 584 ++-- config.h.in | 18 +- config.sub | 258 +- configure | 3359 +++++++++++++------- configure.ac | 78 +- depcomp | 6 +- docs/NEWS | 92 + examples/Makefile.in | 50 +- initscript/Makefile.in | 50 +- initscript/darwin/Makefile.in | 50 +- initscript/debian/Makefile.in | 50 +- initscript/fedora/Makefile.in | 50 +- initscript/freebsd/Makefile.in | 50 +- initscript/gentoo/Makefile.in | 50 +- initscript/lfs/Makefile.in | 50 +- initscript/mandriva/Makefile.in | 50 +- initscript/slackware/Makefile.in | 50 +- initscript/suse/Makefile.in | 50 +- man/Makefile.in | 50 +- man/avahi-autoipd.8 | 2 +- man/avahi-autoipd.action.8 | 2 +- man/avahi-browse.1 | 2 +- man/avahi-browse.1.xml.in | 2 +- man/avahi-daemon.8 | 14 +- man/avahi-daemon.conf.5 | 4 +- man/avahi-daemon.conf.5.xml.in | 10 + man/avahi-discover.1 | 16 - man/avahi-dnsconfd.8 | 4 +- man/avahi-dnsconfd.action.8 | 2 +- man/avahi.hosts.5 | 4 +- man/avahi.service.5 | 4 +- man/bssh.1 | 36 - po/ChangeLog | 2 +- po/Makefile.in.in | 556 +++- po/Makevars | 78 + po/POTFILES.in | 2 +- po/POTFILES.skip | 4 - po/Rules-quot | 58 + po/ach.gmo | Bin 0 -> 412 bytes po/ar.gmo | Bin 0 -> 6907 bytes po/avahi.pot | 818 +++++ po/bg.gmo | Bin 0 -> 21435 bytes po/boldquot.sed | 10 + po/ca.gmo | Bin 0 -> 17663 bytes po/cs.gmo | Bin 0 -> 13140 bytes po/cs.po | 2 +- po/da.gmo | Bin 0 -> 16741 bytes po/da.po | 174 +- po/de.gmo | Bin 0 -> 17399 bytes po/de.po | 41 +- po/el.gmo | Bin 0 -> 21783 bytes po/en@boldquot.header | 25 + po/en@quot.header | 22 + po/en_AU.gmo | Bin 0 -> 526 bytes po/en_CA.gmo | Bin 0 -> 305 bytes po/en_GB.gmo | Bin 0 -> 16272 bytes po/en_NZ.gmo | Bin 0 -> 14220 bytes po/eo.gmo | Bin 0 -> 4046 bytes po/es.gmo | Bin 0 -> 17415 bytes po/et.gmo | Bin 0 -> 9657 bytes po/fa.gmo | Bin 0 -> 5845 bytes po/fi.gmo | Bin 0 -> 15951 bytes po/fo.gmo | Bin 0 -> 8623 bytes po/fr.gmo | Bin 0 -> 17409 bytes po/gl.gmo | Bin 0 -> 17992 bytes po/he.gmo | Bin 0 -> 7843 bytes po/hu.gmo | Bin 0 -> 17821 bytes po/id.gmo | Bin 0 -> 16508 bytes po/insert-header.sin | 23 + po/it.gmo | Bin 0 -> 17366 bytes po/ja.gmo | Bin 0 -> 19023 bytes po/ko.gmo | Bin 0 -> 419 bytes po/lv.gmo | Bin 0 -> 16858 bytes po/ms.gmo | Bin 0 -> 2468 bytes po/nl.gmo | Bin 0 -> 16548 bytes po/oc.gmo | Bin 0 -> 17491 bytes po/pl.gmo | Bin 0 -> 17861 bytes po/pl.po | 423 +-- po/pt_BR.gmo | Bin 0 -> 17347 bytes po/pt_BR.po | 193 +- po/quot.sed | 6 + po/remove-potcdate.sin | 19 + po/ro.gmo | Bin 0 -> 17054 bytes po/ro.po | 252 +- po/ru.gmo | Bin 0 -> 20792 bytes po/sk.gmo | Bin 0 -> 17434 bytes po/sl.gmo | Bin 0 -> 17219 bytes po/sr.gmo | Bin 0 -> 21702 bytes po/sr@latin.gmo | Bin 0 -> 17413 bytes po/stamp-po | 1 + po/sv.gmo | Bin 0 -> 17014 bytes po/tr.gmo | Bin 0 -> 17181 bytes po/uk.gmo | Bin 0 -> 21863 bytes po/zh_CN.gmo | Bin 0 -> 15737 bytes po/zh_TW.gmo | Bin 0 -> 16045 bytes py-compile | 6 +- service-type-database/Makefile.am | 18 +- service-type-database/Makefile.in | 68 +- service-type-database/build-db.in | 44 - service-type-database/service-types | 7 + tests/Makefile.in | 50 +- 197 files changed, 9992 insertions(+), 4963 deletions(-) create mode 100644 avahi-libevent.pc.in create mode 100644 avahi-libevent/Makefile.am create mode 100644 avahi-libevent/Makefile.in create mode 100644 avahi-libevent/libevent-watch-test.c create mode 100644 avahi-libevent/libevent-watch.c create mode 100644 avahi-libevent/libevent-watch.h delete mode 100755 avahi-python/avahi-discover/__init__.py create mode 100755 avahi-python/avahi/test.py create mode 100644 avahi-qt5.pc.in delete mode 100644 common/intltool.m4 create mode 100644 common/qt5-pie.m4 delete mode 100644 man/avahi-discover.1 delete mode 100644 man/bssh.1 create mode 100644 po/Makevars delete mode 100644 po/POTFILES.skip create mode 100644 po/Rules-quot create mode 100644 po/ach.gmo create mode 100644 po/ar.gmo create mode 100644 po/avahi.pot create mode 100644 po/bg.gmo create mode 100644 po/boldquot.sed create mode 100644 po/ca.gmo create mode 100644 po/cs.gmo create mode 100644 po/da.gmo create mode 100644 po/de.gmo create mode 100644 po/el.gmo create mode 100644 po/en@boldquot.header create mode 100644 po/en@quot.header create mode 100644 po/en_AU.gmo create mode 100644 po/en_CA.gmo create mode 100644 po/en_GB.gmo create mode 100644 po/en_NZ.gmo create mode 100644 po/eo.gmo create mode 100644 po/es.gmo create mode 100644 po/et.gmo create mode 100644 po/fa.gmo create mode 100644 po/fi.gmo create mode 100644 po/fo.gmo create mode 100644 po/fr.gmo create mode 100644 po/gl.gmo create mode 100644 po/he.gmo create mode 100644 po/hu.gmo create mode 100644 po/id.gmo create mode 100644 po/insert-header.sin create mode 100644 po/it.gmo create mode 100644 po/ja.gmo create mode 100644 po/ko.gmo create mode 100644 po/lv.gmo create mode 100644 po/ms.gmo create mode 100644 po/nl.gmo create mode 100644 po/oc.gmo create mode 100644 po/pl.gmo create mode 100644 po/pt_BR.gmo create mode 100644 po/quot.sed create mode 100644 po/remove-potcdate.sin create mode 100644 po/ro.gmo create mode 100644 po/ru.gmo create mode 100644 po/sk.gmo create mode 100644 po/sl.gmo create mode 100644 po/sr.gmo create mode 100644 po/sr@latin.gmo create mode 100644 po/stamp-po create mode 100644 po/sv.gmo create mode 100644 po/tr.gmo create mode 100644 po/uk.gmo create mode 100644 po/zh_CN.gmo create mode 100644 po/zh_TW.gmo delete mode 100755 service-type-database/build-db.in diff --git a/ChangeLog b/ChangeLog index 49b9354..f6fd259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2017-07-10 gettextize +2020-02-18 gettextize * Makefile.am (EXTRA_DIST): Add config.rpath. * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in. diff --git a/Makefile.am b/Makefile.am index 8234d69..474cca1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I common include $(srcdir)/common/doxygen.mk -EXTRA_DIST = \ +EXTRA_DIST = config.rpath \ autogen.sh \ bootstrap.sh \ LICENSE \ @@ -40,9 +40,11 @@ EXTRA_DIST = \ avahi-core.pc.in \ avahi-client.pc.in \ avahi-glib.pc.in \ + avahi-libevent.pc.in \ avahi-gobject.pc.in \ avahi-qt3.pc.in \ avahi-qt4.pc.in \ + avahi-qt5.pc.in \ avahi-sharp.pc.in \ avahi-ui-sharp.pc.in \ avahi-compat-libdns_sd.pc.in \ @@ -76,6 +78,7 @@ SUBDIRS = \ avahi-autoipd \ avahi-ui \ avahi-ui-sharp \ + avahi-libevent \ po DX_INPUT = \ @@ -101,6 +104,10 @@ if HAVE_QT4 DX_INPUT += \ $(srcdir)/avahi-qt/qt-watch.h endif +if HAVE_QT5 +DX_INPUT += \ + $(srcdir)/avahi-qt/qt-watch.h +endif endif if HAVE_GLIB @@ -150,6 +157,11 @@ DX_INPUT += \ $(srcdir)/avahi-ui/avahi-ui.h endif +if HAVE_LIBEVENT +DX_INPUT += \ + $(srcdir)/avahi-libevent/libevent-watch.h +endif + pkgconfigdir = $(libdir)/pkgconfig %.pc: %.pc.in @@ -216,6 +228,16 @@ pkgconfig_DATA += avahi-qt4.pc CLEANFILES += avahi-qt4.pc endif +if HAVE_QT5 +pkgconfig_DATA += avahi-qt5.pc +CLEANFILES += avahi-qt5.pc +endif + +if HAVE_LIBEVENT +pkgconfig_DATA += avahi-libevent.pc +CLEANFILES += avahi-libevent.pc +endif + CLEANFILES += avahi.devhelp avahi.devhelp: doxygen-run @@ -238,6 +260,3 @@ homepage: $(MAKE) doxygen-run ssh tango rm -rf www/avahi.org/tree/download/doxygen scp -r doxygen/html tango:www/avahi.org/tree/download/doxygen - -DISTCLEANFILES = \ - po/.intltool-merge-cache diff --git a/Makefile.in b/Makefile.in index 4fb8ce5..e88e019 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,11 +141,14 @@ host_triplet = @host@ @HAVE_QT3_FALSE@@HAVE_QT4_TRUE@am__append_2 = \ @HAVE_QT3_FALSE@@HAVE_QT4_TRUE@ $(srcdir)/avahi-qt/qt-watch.h -@HAVE_GLIB_TRUE@am__append_3 = \ +@HAVE_QT3_FALSE@@HAVE_QT5_TRUE@am__append_3 = \ +@HAVE_QT3_FALSE@@HAVE_QT5_TRUE@ $(srcdir)/avahi-qt/qt-watch.h + +@HAVE_GLIB_TRUE@am__append_4 = \ @HAVE_GLIB_TRUE@ $(srcdir)/avahi-glib/glib-watch.h \ @HAVE_GLIB_TRUE@ $(srcdir)/avahi-glib/glib-malloc.h -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_4 = \ +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_5 = \ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@ $(srcdir)/avahi-gobject/ga-client.h \ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@ $(srcdir)/avahi-gobject/ga-entry-group.h \ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@ $(srcdir)/avahi-gobject/ga-enums.h \ @@ -154,57 +157,69 @@ host_triplet = @host@ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@ $(srcdir)/avahi-gobject/ga-service-browser.h \ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@ $(srcdir)/avahi-gobject/ga-service-resolver.h -@HAVE_DBUS_TRUE@am__append_5 = \ +@HAVE_DBUS_TRUE@am__append_6 = \ @HAVE_DBUS_TRUE@ $(srcdir)/avahi-client/client.h \ @HAVE_DBUS_TRUE@ $(srcdir)/avahi-client/lookup.h \ @HAVE_DBUS_TRUE@ $(srcdir)/avahi-client/publish.h -@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_6 = \ +@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_7 = \ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@ $(srcdir)/avahi-ui/avahi-ui.h -@ENABLE_CORE_DOCS_TRUE@am__append_7 = \ +@ENABLE_CORE_DOCS_TRUE@am__append_8 = \ @ENABLE_CORE_DOCS_TRUE@ $(srcdir)/avahi-core/core.h \ @ENABLE_CORE_DOCS_TRUE@ $(srcdir)/avahi-core/lookup.h \ @ENABLE_CORE_DOCS_TRUE@ $(srcdir)/avahi-core/publish.h \ @ENABLE_CORE_DOCS_TRUE@ $(srcdir)/avahi-core/rr.h \ @ENABLE_CORE_DOCS_TRUE@ $(srcdir)/avahi-core/log.h -@HAVE_GTK_TRUE@am__append_8 = \ +@HAVE_GTK_TRUE@am__append_9 = \ @HAVE_GTK_TRUE@ $(srcdir)/avahi-ui/avahi-ui.h -@HAVE_DBUS_TRUE@am__append_9 = avahi-client.pc -@HAVE_DBUS_TRUE@am__append_10 = avahi-client.pc -@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@am__append_11 = avahi-compat-howl.pc -@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@am__append_12 = avahi-compat-howl.pc -@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am__append_13 = avahi-compat-libdns_sd.pc -@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am__append_14 = avahi-compat-libdns_sd.pc -@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@am__append_15 = avahi-sharp.pc avahi-ui-sharp.pc -@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@am__append_16 = avahi-sharp.pc avahi-ui-sharp.pc -@HAVE_GLIB_TRUE@am__append_17 = avahi-glib.pc -@HAVE_GLIB_TRUE@am__append_18 = avahi-glib.pc -@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_19 = avahi-gobject.pc -@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_20 = avahi-gobject.pc -@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_21 = avahi-ui.pc -@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_22 = avahi-ui.pc -@HAVE_DBUS_TRUE@@HAVE_GTK3_TRUE@am__append_23 = avahi-ui-gtk3.pc -@HAVE_DBUS_TRUE@@HAVE_GTK3_TRUE@am__append_24 = avahi-ui-gtk3.pc -@HAVE_QT3_TRUE@am__append_25 = avahi-qt3.pc -@HAVE_QT3_TRUE@am__append_26 = avahi-qt3.pc -@HAVE_QT4_TRUE@am__append_27 = avahi-qt4.pc -@HAVE_QT4_TRUE@am__append_28 = avahi-qt4.pc +@HAVE_LIBEVENT_TRUE@am__append_10 = \ +@HAVE_LIBEVENT_TRUE@ $(srcdir)/avahi-libevent/libevent-watch.h + +@HAVE_DBUS_TRUE@am__append_11 = avahi-client.pc +@HAVE_DBUS_TRUE@am__append_12 = avahi-client.pc +@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@am__append_13 = avahi-compat-howl.pc +@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@am__append_14 = avahi-compat-howl.pc +@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am__append_15 = avahi-compat-libdns_sd.pc +@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@am__append_16 = avahi-compat-libdns_sd.pc +@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@am__append_17 = avahi-sharp.pc avahi-ui-sharp.pc +@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@am__append_18 = avahi-sharp.pc avahi-ui-sharp.pc +@HAVE_GLIB_TRUE@am__append_19 = avahi-glib.pc +@HAVE_GLIB_TRUE@am__append_20 = avahi-glib.pc +@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_21 = avahi-gobject.pc +@HAVE_GLIB_TRUE@@HAVE_GOBJECT_TRUE@am__append_22 = avahi-gobject.pc +@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_23 = avahi-ui.pc +@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@am__append_24 = avahi-ui.pc +@HAVE_DBUS_TRUE@@HAVE_GTK3_TRUE@am__append_25 = avahi-ui-gtk3.pc +@HAVE_DBUS_TRUE@@HAVE_GTK3_TRUE@am__append_26 = avahi-ui-gtk3.pc +@HAVE_QT3_TRUE@am__append_27 = avahi-qt3.pc +@HAVE_QT3_TRUE@am__append_28 = avahi-qt3.pc +@HAVE_QT4_TRUE@am__append_29 = avahi-qt4.pc +@HAVE_QT4_TRUE@am__append_30 = avahi-qt4.pc +@HAVE_QT5_TRUE@am__append_31 = avahi-qt5.pc +@HAVE_QT5_TRUE@am__append_32 = avahi-qt5.pc +@HAVE_LIBEVENT_TRUE@am__append_33 = avahi-libevent.pc +@HAVE_LIBEVENT_TRUE@am__append_34 = avahi-libevent.pc subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -306,7 +321,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \ $(srcdir)/config.h.in ABOUT-NLS ChangeLog README compile \ config.guess config.rpath config.sub install-sh ltmain.sh \ - missing + missing py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -350,7 +365,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -363,8 +377,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -375,7 +387,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -416,11 +427,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -434,16 +446,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -462,16 +465,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -479,15 +490,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -506,10 +517,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -524,6 +532,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -534,6 +544,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -577,8 +589,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -629,7 +639,7 @@ ACLOCAL_AMFLAGS = -I common @DX_COND_doc_TRUE@ $(DX_CLEAN_PDF) \ @DX_COND_doc_TRUE@ $(DX_CLEAN_LATEX) -EXTRA_DIST = \ +EXTRA_DIST = config.rpath \ autogen.sh \ bootstrap.sh \ LICENSE \ @@ -650,9 +660,11 @@ EXTRA_DIST = \ avahi-core.pc.in \ avahi-client.pc.in \ avahi-glib.pc.in \ + avahi-libevent.pc.in \ avahi-gobject.pc.in \ avahi-qt3.pc.in \ avahi-qt4.pc.in \ + avahi-qt5.pc.in \ avahi-sharp.pc.in \ avahi-ui-sharp.pc.in \ avahi-compat-libdns_sd.pc.in \ @@ -686,6 +698,7 @@ SUBDIRS = \ avahi-autoipd \ avahi-ui \ avahi-ui-sharp \ + avahi-libevent \ po DX_INPUT = $(srcdir)/avahi-common/address.h \ @@ -698,27 +711,26 @@ DX_INPUT = $(srcdir)/avahi-common/address.h \ $(srcdir)/avahi-common/thread-watch.h $(am__append_1) \ $(am__append_2) $(am__append_3) $(am__append_4) \ $(am__append_5) $(am__append_6) $(am__append_7) \ - $(am__append_8) + $(am__append_8) $(am__append_9) $(am__append_10) DX_EXAMPLE_PATH = $(srcdir)/examples DX_EXAMPLE_PATTERNS = *.c pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = avahi-core.pc $(am__append_9) $(am__append_11) \ - $(am__append_13) $(am__append_15) $(am__append_17) \ - $(am__append_19) $(am__append_21) $(am__append_23) \ - $(am__append_25) $(am__append_27) -CLEANFILES = avahi-core.pc $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_16) $(am__append_18) \ - $(am__append_20) $(am__append_22) $(am__append_24) \ - $(am__append_26) $(am__append_28) avahi.devhelp +pkgconfig_DATA = avahi-core.pc $(am__append_11) $(am__append_13) \ + $(am__append_15) $(am__append_17) $(am__append_19) \ + $(am__append_21) $(am__append_23) $(am__append_25) \ + $(am__append_27) $(am__append_29) $(am__append_31) \ + $(am__append_33) +CLEANFILES = avahi-core.pc $(am__append_12) $(am__append_14) \ + $(am__append_16) $(am__append_18) $(am__append_20) \ + $(am__append_22) $(am__append_24) $(am__append_26) \ + $(am__append_28) $(am__append_30) $(am__append_32) \ + $(am__append_34) avahi.devhelp MOSTLYCLEANFILES = $(DX_CLEANFILES) DISTCHECK_CONFIGURE_FLAGS = \ --disable-monodoc \ --enable-introspection \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -DISTCLEANFILES = \ - po/.intltool-merge-cache - all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -974,7 +986,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(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 + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -1000,7 +1012,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -1018,7 +1030,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -1028,7 +1040,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -1133,7 +1145,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/acinclude.m4 b/acinclude.m4 index 4d07999..ccf2ac6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1 +1,2 @@ -sinclude(common/doxygen.m4) \ No newline at end of file +sinclude(common/doxygen.m4) +sincldue(common/qt5-pie.m4) diff --git a/aclocal.m4 b/aclocal.m4 index 39a656b..af9c41e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,111 +20,24 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. -dnl -dnl Copied from intlmacosx.m4 in gettext, GPL. -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. -glib_DEFUN([glib_gt_INTL_MACOSX], +AC_DEFUN([gt_INTL_MACOSX], [ dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], @@ -164,346 +77,6 @@ glib_DEFUN([glib_gt_INTL_MACOSX], AC_SUBST([INTL_MACOSX_LIBS]) ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - glib_gt_INTL_MACOSX - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ], - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- dnl serial 11 (pkg-config-0.29.1) dnl @@ -780,7 +353,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -795,7 +368,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -811,14 +384,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -870,7 +443,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -901,7 +474,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1092,7 +665,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1168,7 +741,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1365,7 +938,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1386,7 +959,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1407,7 +980,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1457,7 +1030,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1496,7 +1069,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1525,7 +1098,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1572,7 +1145,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1605,8 +1178,9 @@ AC_DEFUN([AM_PATH_PYTHON], [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1807,7 +1381,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1826,7 +1400,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1907,7 +1481,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1967,7 +1541,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1995,7 +1569,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2014,7 +1588,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2148,13 +1722,20 @@ AC_SUBST([am__untar]) m4_include([common/acx_pthread.m4]) m4_include([common/gcc_stack_protect.m4]) m4_include([common/gcc_visibility.m4]) -m4_include([common/intltool.m4]) +m4_include([common/gettext.m4]) +m4_include([common/iconv.m4]) m4_include([common/introspection.m4]) +m4_include([common/lib-ld.m4]) +m4_include([common/lib-link.m4]) +m4_include([common/lib-prefix.m4]) m4_include([common/libtool.m4]) m4_include([common/ltoptions.m4]) m4_include([common/ltsugar.m4]) m4_include([common/ltversion.m4]) m4_include([common/lt~obsolete.m4]) m4_include([common/nls.m4]) +m4_include([common/po.m4]) +m4_include([common/progtest.m4]) m4_include([common/python.m4]) +m4_include([common/qt5-pie.m4]) m4_include([acinclude.m4]) diff --git a/autogen.sh b/autogen.sh index f75d625..64d62d7 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,7 +40,7 @@ run_versioned() { "$P" "$@" } -set -ex +set -e test -n "$srcdir" || srcdir=$(dirname "$0") test -n "$srcdir" || srcdir=. @@ -70,7 +70,6 @@ else test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize - intltoolize --copy --force --automake "$LIBTOOLIZE" -c --force run_versioned aclocal "$AM_VERSION" -I common run_versioned autoconf "$AC_VERSION" -Wall diff --git a/avahi-autoipd/Makefile.in b/avahi-autoipd/Makefile.in index d288235..3fec14f 100644 --- a/avahi-autoipd/Makefile.in +++ b/avahi-autoipd/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -115,14 +115,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -249,7 +254,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -262,8 +266,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -274,7 +276,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -315,11 +316,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -333,16 +335,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -361,16 +354,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -378,15 +379,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -405,10 +406,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -423,6 +421,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -433,6 +433,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -476,8 +478,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-autoipd/main.c b/avahi-autoipd/main.c index dff3368..96c9188 100644 --- a/avahi-autoipd/main.c +++ b/avahi-autoipd/main.c @@ -1115,7 +1115,7 @@ static int loop(int iface, uint32_t addr) { uint32_t a = 1; for (i = 0; i < ETHER_ADDRLEN; i++) - a += hw_address[i]*i; + a += hw_address[i]*(i+1); a = (a % 0xFE00) + 0x0100; diff --git a/avahi-client/Makefile.in b/avahi-client/Makefile.in index 9aa5225..42d991f 100644 --- a/avahi-client/Makefile.in +++ b/avahi-client/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -120,14 +120,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -318,7 +323,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -331,8 +335,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -343,7 +345,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -384,11 +385,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -402,16 +404,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -430,16 +423,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -447,15 +448,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -474,10 +475,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -492,6 +490,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -502,6 +502,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -545,8 +547,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-client/lookup.h b/avahi-client/lookup.h index 52407f4..1a30d08 100644 --- a/avahi-client/lookup.h +++ b/avahi-client/lookup.h @@ -172,20 +172,30 @@ typedef void (*AvahiServiceResolverCallback) ( AvahiLookupResultFlags flags, void *userdata); -/** Create a new service resolver object. Please make sure to pass all - * the service data you received via avahi_service_browser_new()'s - * callback function, especially interface and protocol. The protocol - * argument specifies the protocol (IPv4 or IPv6) to use as transport - * for the queries which are sent out by this resolver. The - * aprotocol argument specifies the adress family (IPv4 or IPv6) of - * the address of the service we are looking for. Generally, on - * "protocol" you should only pass what was supplied to you as - * parameter to your AvahiServiceBrowserCallback. In "aprotocol" you - * should pass what your application code can deal with when - * connecting to the service. Or, more technically speaking: protocol - * specifies if the mDNS queries should be sent as UDP/IPv4 - * resp. UDP/IPv6 packets. aprotocol specifies whether the query is for a A - * resp. AAAA resource record. */ +/** Create a new service resolver object. Please make sure to pass all the + * service data you received via avahi_service_browser_new()'s callback + * function, especially interface and protocol. The protocol argument specifies + * the protocol (IPv4 or IPv6) to use as transport for the queries which are + * sent out by this resolver. The aprotocol argument specifies the adress + * family (IPv4 or IPv6) of the address of the service we are looking for. + * Generally, on "protocol" you should only pass what was supplied to you as + * parameter to your AvahiServiceBrowserCallback. In "aprotocol" you should + * pass what your application code can deal with when connecting to the + * service. Or, more technically speaking: protocol specifies if the mDNS + * queries should be sent as UDP/IPv4 resp. UDP/IPv6 packets. aprotocol + * specifies whether the query is for a A resp. AAAA resource record. + * + * Avahi browser and resolver callbacks only receive a concrete protocol; + * always AVAHI_PROTO_INET or AVAHI_PROTO_INET6 and never AVAHI_PROTO_UNSPEC. A + * new browser given UNSPEC will receive both (separate) INET and INET6 events. + * A new resolver given a query protocol of UNSPEC will default to querying + * with INET6. A new resolver given an address protocol of UNSPEC will always + * resolve a service to an address matching the query protocol. So a resolver + * with UNSPEC/UNSPEC is equivalent to INET6/INET6. By default the avahi daemon + * publishes AAAA (IPv6) records over IPv4, but not A (IPv4) records over IPv6 + * (see 'publish-aaaa-on-ipv4' and 'publish-a-on-ipv6' in 'avahi-daemon.conf'). + * That's why, given most daemons, all four combinations of concrete query and + * address protocols resolve except INET addresses via INET6 queries. */ AvahiServiceResolver * avahi_service_resolver_new( AvahiClient *client, AvahiIfIndex interface, /**< Pass the interface argument you received in AvahiServiceBrowserCallback here. */ diff --git a/avahi-common/Makefile.in b/avahi-common/Makefile.in index e16dfeb..63b4d4a 100644 --- a/avahi-common/Makefile.in +++ b/avahi-common/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,14 +118,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -322,7 +327,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -335,8 +339,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -347,7 +349,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -388,11 +389,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -406,16 +408,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -434,16 +427,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -451,15 +452,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -478,10 +479,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -496,6 +494,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -506,6 +506,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -549,8 +551,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h index ea3e8a2..63319b0 100644 --- a/avahi-common/dbus.h +++ b/avahi-common/dbus.h @@ -29,6 +29,7 @@ AVAHI_C_DECL_BEGIN #define AVAHI_DBUS_NAME "org.freedesktop.Avahi" #define AVAHI_DBUS_INTERFACE_SERVER AVAHI_DBUS_NAME".Server" +#define AVAHI_DBUS_INTERFACE_SERVER2 AVAHI_DBUS_NAME".Server2" #define AVAHI_DBUS_PATH_SERVER "/" #define AVAHI_DBUS_INTERFACE_ENTRY_GROUP AVAHI_DBUS_NAME".EntryGroup" #define AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER AVAHI_DBUS_NAME".DomainBrowser" @@ -45,8 +46,9 @@ number is increased the API has been extended but is downwards compatible. If the release changes compatibility is lost. Avahi 0.6 implements API version 0x0201; -Avahi 0.6.1 implements API version 0x0202 */ -#define AVAHI_DBUS_API_VERSION ((uint32_t) 0x0203) +Avahi 0.6.1 implements API version 0x0202 +Avahi 0.7 implements API version 0x0203 */ +#define AVAHI_DBUS_API_VERSION ((uint32_t) 0x0204) #define AVAHI_DBUS_ERR_OK "org.freedesktop.Avahi.Success" #define AVAHI_DBUS_ERR_FAILURE "org.freedesktop.Avahi.Failure" diff --git a/avahi-common/strlst-test.c b/avahi-common/strlst-test.c index 0945b37..4c1ad9d 100644 --- a/avahi-common/strlst-test.c +++ b/avahi-common/strlst-test.c @@ -48,6 +48,7 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { a = avahi_string_list_add_pair(a, "blubb", "blaa"); a = avahi_string_list_add_pair(a, "uxknurz", NULL); a = avahi_string_list_add_pair_arbitrary(a, "uxknurz2", (const uint8_t*) "blafasel\0oerks", 14); + a = avahi_string_list_add(a, "i am a \"string\" with embedded double-quotes (\\\")\nand newlines (\\n)."); a = avahi_string_list_add(a, "end"); diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c index b861cf8..f09ec38 100644 --- a/avahi-common/strlst.c +++ b/avahi-common/strlst.c @@ -128,19 +128,65 @@ AvahiStringList* avahi_string_list_reverse(AvahiStringList *l) { return r; } +/** + * This routine is used for both human- and machine-readable output of + * TXT records. As such it must cope with escaping, in order to allow + * machines to reconstruct the original data. + * + * AFAIK no RFC specifies syntax for TXT data other than raw binary, + * though presumably zonefile syntax would make sense: + * + * - RFC 1035 says that TXT records contain ``s, and section + * 5 says: + * + * is expressed in one or two ways: as a contiguous set + * of characters without interior spaces, or as a string beginning with a " + * and ending with a ". Inside a " delimited string any character can + * occur, except for a " itself, which must be quoted using \ (back slash). + * + * This omits escaping of backslashes (!). + * + * - RFC 1034 doesn't say anything relevant. + * + * - RFC 1464 suggests a specific encoding of information within a TXT + * record but does not discuss formatting of TXT records in + * general. + * + * In order to also escape newlines, which interfere with line-by-line + * machine processing of records, this routine: + * + * - escapes >>> " <<< to >>> \" <<< + * - escapes >>> \ <<< to >>> \\ <<< + * - escapes bytes less than 32 to backslash-prefixed 3-digit DECIMAL form + */ char* avahi_string_list_to_string(AvahiStringList *l) { AvahiStringList *n; size_t s = 0; - char *t, *e; + char *p, *t, *e; for (n = l; n; n = n->next) { if (n != l) - s ++; - - s += n->size+2; + s ++; /* for the inter-string separating space */ + + for (p = (char*) n->text; ((size_t) (p - (char*) n->text) < n->size); p++) { + switch (*p) { + case '"': + case '\\': + s += 2; + break; + default: + if (*p < 32) { + s += 4; + } else { + s ++; + break; + } + } + } + s += 2; /* for the leading and trailing double-quotes */ } - if (!(t = e = avahi_new(char, s+1))) + if (!(t = e = avahi_new(char, s+1))) /* plus one for the trailing NUL */ return NULL; l = avahi_string_list_reverse(l); @@ -150,9 +196,23 @@ char* avahi_string_list_to_string(AvahiStringList *l) { *(e++) = ' '; *(e++) = '"'; - strncpy(e, (char*) n->text, n->size); - e[n->size] = 0; - e = strchr(e, 0); + for (p = (char*) n->text; ((size_t) (p - (char*) n->text) < n->size); p++) { + switch (*p) { + case '"': + case '\\': + *(e++) = '\\'; + /* FALL THROUGH */ + default: + if (*p < 32) { + *(e++) = '\\'; + *(e++) = '0' + (char) ((uint8_t) *p / 100); + *(e++) = '0' + (char) (((uint8_t) *p / 10) % 10); + *(e++) = '0' + (char) ((uint8_t) *p % 10); + } else { + *(e++) = *p; + } + } + } *(e++) = '"'; assert(e); diff --git a/avahi-compat-howl/Makefile.in b/avahi-compat-howl/Makefile.in index 6172057..c95c1f0 100644 --- a/avahi-compat-howl/Makefile.in +++ b/avahi-compat-howl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -115,14 +115,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -405,7 +410,6 @@ am__relativize = \ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -418,8 +422,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -430,7 +432,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -471,11 +472,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -489,16 +491,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -517,16 +510,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -534,15 +535,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -561,10 +562,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -579,6 +577,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -589,6 +589,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -632,8 +634,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-compat-howl/samples/Makefile.in b/avahi-compat-howl/samples/Makefile.in index e72fc01..ae30603 100644 --- a/avahi-compat-howl/samples/Makefile.in +++ b/avahi-compat-howl/samples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,14 +114,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -233,7 +238,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -246,8 +250,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -258,7 +260,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -299,11 +300,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -317,16 +319,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -345,16 +338,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -362,15 +363,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -389,10 +390,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -407,6 +405,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -417,6 +417,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -460,8 +462,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-compat-libdns_sd/Makefile.in b/avahi-compat-libdns_sd/Makefile.in index 2cb5009..e3fed28 100644 --- a/avahi-compat-libdns_sd/Makefile.in +++ b/avahi-compat-libdns_sd/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,14 +114,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -272,7 +277,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -285,8 +289,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -297,7 +299,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -338,11 +339,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -356,16 +358,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -384,16 +377,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -401,15 +402,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -428,10 +429,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -446,6 +444,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -456,6 +456,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -499,8 +501,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-core/Makefile.in b/avahi-core/Makefile.in index 0b263be..4b4cd66 100644 --- a/avahi-core/Makefile.in +++ b/avahi-core/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -132,14 +132,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -561,7 +566,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -574,8 +578,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -586,7 +588,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -627,11 +628,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -645,16 +647,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -673,16 +666,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -690,15 +691,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -717,10 +718,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -735,6 +733,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -745,6 +745,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -788,8 +790,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c index 8b2376f..2a7872b 100644 --- a/avahi-core/avahi-test.c +++ b/avahi-core/avahi-test.c @@ -353,22 +353,30 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { avahi_server_config_free(&config); k = avahi_key_new("_http._tcp.0pointer.de", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR); - r = avahi_s_record_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, k, 0, record_browser_callback, NULL); + r = avahi_s_record_browser_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, k, 0, record_browser_callback, NULL); + avahi_s_record_browser_start_query(r); avahi_key_unref(k); - hnr = avahi_s_host_name_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "cname.local", AVAHI_PROTO_UNSPEC, 0, hnr_callback, NULL); + hnr = avahi_s_host_name_resolver_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "cname.local", AVAHI_PROTO_UNSPEC, 0, hnr_callback, NULL); + avahi_s_host_name_resolver_start(hnr); - ar = avahi_s_address_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, avahi_address_parse("192.168.50.1", AVAHI_PROTO_INET, &a), 0, ar_callback, NULL); + ar = avahi_s_address_resolver_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, avahi_address_parse("192.168.50.1", AVAHI_PROTO_INET, &a), 0, ar_callback, NULL); + avahi_s_address_resolver_start(ar); - db = avahi_s_domain_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, db_callback, NULL); + db = avahi_s_domain_browser_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, db_callback, NULL); + avahi_s_domain_browser_start(db); - stb = avahi_s_service_type_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, 0, stb_callback, NULL); + stb = avahi_s_service_type_browser_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, 0, stb_callback, NULL); + avahi_s_service_type_browser_start(stb); - sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, 0, sb_callback, NULL); + sb = avahi_s_service_browser_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, 0, sb_callback, NULL); + avahi_s_service_browser_start(sb); - sr = avahi_s_service_resolver_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "Ecstasy HTTP", "_http._tcp", "local", AVAHI_PROTO_UNSPEC, 0, sr_callback, NULL); + sr = avahi_s_service_resolver_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "Ecstasy HTTP", "_http._tcp", "local", AVAHI_PROTO_UNSPEC, 0, sr_callback, NULL); + avahi_s_service_resolver_start(sr); - dsb = avahi_s_dns_server_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "local", AVAHI_DNS_SERVER_RESOLVE, AVAHI_PROTO_UNSPEC, 0, dsb_callback, NULL); + dsb = avahi_s_dns_server_browser_prepare(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "local", AVAHI_DNS_SERVER_RESOLVE, AVAHI_PROTO_UNSPEC, 0, dsb_callback, NULL); + avahi_s_dns_server_browser_start(dsb); avahi_elapse_time(&tv, 1000*5, 0); poll_api->timeout_new(poll_api, &tv, dump_timeout_callback, server); diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c index a51c38f..049752e 100644 --- a/avahi-core/browse-dns-server.c +++ b/avahi-core/browse-dns-server.c @@ -172,7 +172,7 @@ static void record_browser_callback( i->interface = interface; i->protocol = protocol; i->srv_record = avahi_record_ref(record); - i->host_name_resolver = avahi_s_host_name_resolver_new( + i->host_name_resolver = avahi_s_host_name_resolver_prepare( b->server, interface, protocol, record->data.srv.name, @@ -181,6 +181,9 @@ static void record_browser_callback( host_name_resolver_callback, i); i->flags = flags; + if(i->host_name_resolver) + avahi_s_host_name_resolver_start(i->host_name_resolver); + AVAHI_LLIST_PREPEND(AvahiDNSServerInfo, info, b->info, i); b->n_info++; @@ -231,7 +234,7 @@ static void record_browser_callback( } } -AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( +AvahiSDNSServerBrowser *avahi_s_dns_server_browser_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -290,7 +293,7 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( goto fail; } - if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b))) + if (!(b->record_browser = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, b))) goto fail; avahi_key_unref(k); @@ -306,6 +309,13 @@ fail: return NULL; } +void avahi_s_dns_server_browser_start(AvahiSDNSServerBrowser *b) { + assert(b); + + if(b->record_browser) + avahi_s_record_browser_start_query(b->record_browser); +} + void avahi_s_dns_server_browser_free(AvahiSDNSServerBrowser *b) { assert(b); @@ -320,3 +330,20 @@ void avahi_s_dns_server_browser_free(AvahiSDNSServerBrowser *b) { avahi_free(b); } +AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiDNSServerType type, + AvahiProtocol aprotocol, + AvahiLookupFlags flags, + AvahiSDNSServerBrowserCallback callback, + void* userdata) { + AvahiSDNSServerBrowser* b; + + b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); + avahi_s_dns_server_browser_start(b); + + return b; +} \ No newline at end of file diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c index 9705b2a..f145d56 100644 --- a/avahi-core/browse-domain.c +++ b/avahi-core/browse-domain.c @@ -135,7 +135,7 @@ static void defer_callback(AvahiTimeEvent *e, void *userdata) { avahi_s_domain_browser_free(b); } -AvahiSDomainBrowser *avahi_s_domain_browser_new( +AvahiSDomainBrowser *avahi_s_domain_browser_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -196,7 +196,7 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( goto fail; } - if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b))) + if (!(b->record_browser = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, b))) goto fail; avahi_key_unref(k); @@ -216,6 +216,13 @@ fail: return NULL; } +void avahi_s_domain_browser_start(AvahiSDomainBrowser *b) { + assert(b); + + if(b->record_browser) + avahi_s_record_browser_start_query(b->record_browser); +} + void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) { assert(b); @@ -233,3 +240,20 @@ void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) { avahi_free(b); } + +AvahiSDomainBrowser *avahi_s_domain_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiDomainBrowserType type, + AvahiLookupFlags flags, + AvahiSDomainBrowserCallback callback, + void* userdata) { + AvahiSDomainBrowser *b; + + b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); + avahi_s_domain_browser_start(b); + + return b; +} \ No newline at end of file diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c index 6fff071..fdd22dc 100644 --- a/avahi-core/browse-service-type.c +++ b/avahi-core/browse-service-type.c @@ -74,7 +74,7 @@ static void record_browser_callback( b->callback(b, interface, protocol, event, NULL, b->domain_name, flags, b->userdata); } -AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( +AvahiSServiceTypeBrowser *avahi_s_service_type_browser_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -126,7 +126,7 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( goto fail; } - if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b))) + if (!(b->record_browser = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, b))) goto fail; avahi_key_unref(k); @@ -154,4 +154,25 @@ void avahi_s_service_type_browser_free(AvahiSServiceTypeBrowser *b) { avahi_free(b); } +void avahi_s_service_type_browser_start(AvahiSServiceTypeBrowser *b) { + assert(b); + + avahi_s_record_browser_start_query(b->record_browser); +} + +AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiLookupFlags flags, + AvahiSServiceTypeBrowserCallback callback, + void* userdata) { + AvahiSServiceTypeBrowser *b; + + b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); + avahi_s_service_type_browser_start(b); + + return b; +} diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c index dde36bc..5531360 100644 --- a/avahi-core/browse-service.c +++ b/avahi-core/browse-service.c @@ -80,7 +80,7 @@ static void record_browser_callback( } -AvahiSServiceBrowser *avahi_s_service_browser_new( +AvahiSServiceBrowser *avahi_s_service_browser_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -137,7 +137,7 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( goto fail; } - if (!(b->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, b))) + if (!(b->record_browser = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, b))) goto fail; avahi_key_unref(k); @@ -165,3 +165,26 @@ void avahi_s_service_browser_free(AvahiSServiceBrowser *b) { avahi_free(b->service_type); avahi_free(b); } + +void avahi_s_service_browser_start(AvahiSServiceBrowser *b) { + assert(b); + + avahi_s_record_browser_start_query(b->record_browser); +} + +AvahiSServiceBrowser *avahi_s_service_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *service_type, + const char *domain, + AvahiLookupFlags flags, + AvahiSServiceBrowserCallback callback, + void* userdata) { + AvahiSServiceBrowser *b; + + b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); + avahi_s_service_browser_start(b); + + return b; +} diff --git a/avahi-core/browse.c b/avahi-core/browse.c index eabd7ea..2941e57 100644 --- a/avahi-core/browse.c +++ b/avahi-core/browse.c @@ -519,7 +519,7 @@ void avahi_s_record_browser_restart(AvahiSRecordBrowser *b) { } } -AvahiSRecordBrowser *avahi_s_record_browser_new( +AvahiSRecordBrowser *avahi_s_record_browser_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -547,6 +547,7 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( } b->dead = 0; + b->defer_time_event = NULL; b->server = server; b->interface = interface; b->protocol = protocol; @@ -560,13 +561,24 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( AVAHI_LLIST_PREPEND(AvahiSRecordBrowser, browser, server->record_browsers, b); - /* The currently cached entries are scanned a bit later, and than we will start querying, too */ - b->defer_time_event = avahi_time_event_new(server->time_event_queue, NULL, defer_callback, b); - assert(b->defer_time_event); - return b; } + +void avahi_s_record_browser_start_query(AvahiSRecordBrowser *b) { + assert(b); + assert(!b->dead); + + /* If the number of lookups greater than zero, the object has already been used. + * To restart querying, call only avahi_s_record_browser_restart */ + if(b->n_lookups > 0) + return; + + /* The currently cached entries are scanned a bit later, and than we will start querying, too */ + avahi_s_record_browser_restart(b); +} + + void avahi_s_record_browser_free(AvahiSRecordBrowser *b) { assert(b); assert(!b->dead); @@ -611,3 +623,18 @@ void avahi_browser_cleanup(AvahiServer *server) { avahi_multicast_lookup_engine_cleanup(server->multicast_lookup_engine); } +AvahiSRecordBrowser *avahi_s_record_browser_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiKey *key, + AvahiLookupFlags flags, + AvahiSRecordBrowserCallback callback, + void* userdata) { + AvahiSRecordBrowser *b; + + b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); + avahi_s_record_browser_start_query(b); + + return b; +} diff --git a/avahi-core/core.h b/avahi-core/core.h index 3fba55e..f412e03 100644 --- a/avahi-core/core.h +++ b/avahi-core/core.h @@ -56,6 +56,7 @@ typedef struct AvahiServerConfig { int use_iff_running; /**< Require IFF_RUNNING on local network interfaces. This is the official way to check for link beat. Unfortunately this doesn't work with all drivers. So bettere leave this off. */ int enable_reflector; /**< Reflect incoming mDNS traffic to all local networks. This allows mDNS based network browsing beyond ethernet borders */ int reflect_ipv; /**< if enable_reflector is 1, enable/disable reflecting between IPv4 and IPv6 */ + AvahiStringList *reflect_filters; /**< if enable_reflector is 1, will only add services containing one of these strings */ int add_service_cookie; /**< Add magic service cookie to all locally generated records implicitly */ int enable_wide_area; /**< Enable wide area support */ AvahiAddress wide_area_servers[AVAHI_WIDE_AREA_SERVERS_MAX]; /** Unicast DNS server to use for wide area lookup */ diff --git a/avahi-core/dns-srv-rr.h b/avahi-core/dns-srv-rr.h index fdd9010..e8f67f7 100644 --- a/avahi-core/dns-srv-rr.h +++ b/avahi-core/dns-srv-rr.h @@ -79,6 +79,21 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( AvahiSDNSServerBrowserCallback callback, void* userdata); +/** Prepare a new AvahiSDNSServerBrowser object */ +AvahiSDNSServerBrowser *avahi_s_dns_server_browser_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiDNSServerType type, + AvahiProtocol aprotocol, /**< Address protocol for the DNS server */ + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSDNSServerBrowserCallback callback, + void* userdata); + +/** Start querying on an AvahiSDNSBrowser object */ +void avahi_s_dns_server_browser_start(AvahiSDNSServerBrowser *b); + /** Free an AvahiSDNSServerBrowser object */ void avahi_s_dns_server_browser_free(AvahiSDNSServerBrowser *b); diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c index c6c5f77..e116c7b 100644 --- a/avahi-core/iface-linux.c +++ b/avahi-core/iface-linux.c @@ -104,8 +104,8 @@ static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdat hw->flags_ok = (ifinfomsg->ifi_flags & IFF_UP) && (!m->server->config.use_iff_running || (ifinfomsg->ifi_flags & IFF_RUNNING)) && - !(ifinfomsg->ifi_flags & IFF_LOOPBACK) && - (ifinfomsg->ifi_flags & IFF_MULTICAST) && + ((ifinfomsg->ifi_flags & IFF_LOOPBACK) || + (ifinfomsg->ifi_flags & IFF_MULTICAST)) && (m->server->config.allow_point_to_point || !(ifinfomsg->ifi_flags & IFF_POINTOPOINT)); /* Handle interface attributes */ diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c index 9a2e953..45fd970 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi-core/iface-pfroute.c @@ -80,8 +80,8 @@ static void rtm_info(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m) hw->flags_ok = (ifm->ifm_flags & IFF_UP) && (!m->server->config.use_iff_running || (ifm->ifm_flags & IFF_RUNNING)) && - !(ifm->ifm_flags & IFF_LOOPBACK) && - (ifm->ifm_flags & IFF_MULTICAST) && + ((ifm->ifm_flags & IFF_LOOPBACK) || + (ifm->ifm_flags & IFF_MULTICAST)) && (m->server->config.allow_point_to_point || !(ifm->ifm_flags & IFF_POINTOPOINT)); avahi_free(hw->name); @@ -427,8 +427,8 @@ static void if_add_interface(struct lifreq *lifreq, AvahiInterfaceMonitor *m, in hw->flags_ok = (flags & IFF_UP) && (!m->server->config.use_iff_running || (flags & IFF_RUNNING)) && - !(flags & IFF_LOOPBACK) && - (flags & IFF_MULTICAST) && + ((flags & IFF_LOOPBACK) || + (flags & IFF_MULTICAST)) && (m->server->config.allow_point_to_point || !(flags & IFF_POINTOPOINT)); hw->name = avahi_strdup(lifreq->lifr_name); hw->mtu = mtu; diff --git a/avahi-core/iface.c b/avahi-core/iface.c index 39a860a..a68a4b9 100644 --- a/avahi-core/iface.c +++ b/avahi-core/iface.c @@ -74,7 +74,10 @@ void avahi_interface_address_update_rrs(AvahiInterfaceAddress *a, int remove_rrs avahi_log_info("Registering new address record for %s on %s.%s.", t, a->interface->hardware->name, p == AVAHI_PROTO_UNSPEC ? "*" : avahi_proto_to_string(p)); if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, p, 0, NULL, &a->address) < 0) { - avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error)); + if (!m->server->config.disable_publishing || m->server->error != AVAHI_ERR_NOT_PERMITTED) { + /* suppress warning if disable_publishing set as this is expected state */ + avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error)); + } avahi_s_entry_group_free(a->entry_group); a->entry_group = NULL; return; diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h index 06dec6e..155973f 100644 --- a/avahi-core/lookup.h +++ b/avahi-core/lookup.h @@ -72,9 +72,22 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( AvahiSRecordBrowserCallback callback, /**< The callback to call on browsing events */ void* userdata /**< Arbitrary use suppliable data which is passed to the callback */); +/** Prepare a new browsing object for arbitrary RRs */ +AvahiSRecordBrowser *avahi_s_record_browser_prepare( + AvahiServer *server, /**< The server object to which attach this query */ + AvahiIfIndex interface, /**< Logical OS interface number where to look for the records, or AVAHI_IF_UNSPEC to look on interfaces */ + AvahiProtocol protocol, /**< Protocol number to use when looking for the record, or AVAHI_PROTO_UNSPEC to look on all protocols */ + AvahiKey *key, /**< The search key */ + AvahiLookupFlags flags, /**< Lookup flags. Must have set either AVAHI_LOOKUP_FORCE_WIDE_AREA or AVAHI_LOOKUP_FORCE_MULTICAST, since domain based detection is not available here. */ + AvahiSRecordBrowserCallback callback, /**< The callback to call on browsing events */ + void* userdata /**< Arbitrary use suppliable data which is passed to the callback */); + /** Free an AvahiSRecordBrowser object */ void avahi_s_record_browser_free(AvahiSRecordBrowser *b); +/** Start querying on an AvahiSRecordBrowser object */ +void avahi_s_record_browser_start_query(AvahiSRecordBrowser *b); + /** Callback prototype for AvahiSHostNameResolver events */ typedef void (*AvahiSHostNameResolverCallback)( AvahiSHostNameResolver *r, @@ -97,6 +110,20 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( AvahiSHostNameResolverCallback calback, void* userdata); +/** Prepare an AvahiSHostNameResolver object for resolving a host name to an adddress. See AvahiSRecordBrowser for more info on the paramters. */ +AvahiSHostNameResolver *avahi_s_host_name_resolver_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *host_name, /**< The host name to look for */ + AvahiProtocol aprotocol, /**< The address family of the desired address or AVAHI_PROTO_UNSPEC if doesn't matter. */ + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSHostNameResolverCallback calback, + void* userdata); + +/** Start querying on an AvahiSHostNameResolver object */ +void avahi_s_host_name_resolver_start(AvahiSHostNameResolver *r); + /** Free a AvahiSHostNameResolver object */ void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r); @@ -121,6 +148,19 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( AvahiSAddressResolverCallback calback, void* userdata); +/** Prepare an AvahiSAddressResolver object. See AvahiSRecordBrowser for more info on the paramters. */ +AvahiSAddressResolver *avahi_s_address_resolver_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const AvahiAddress *address, + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSAddressResolverCallback calback, + void* userdata); + +/** Start querying on an AvahiSAddressResolver object */ +void avahi_s_address_resolver_start(AvahiSAddressResolver *r); + /** Free an AvahiSAddressResolver object */ void avahi_s_address_resolver_free(AvahiSAddressResolver *r); @@ -145,6 +185,20 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( AvahiSDomainBrowserCallback callback, void* userdata); +/** Prepare a new AvahiSDomainBrowser object */ +AvahiSDomainBrowser *avahi_s_domain_browser_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiDomainBrowserType type, + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSDomainBrowserCallback callback, + void* userdata); + +/** Start querying on an AvahiSDomainBrowser object */ +void avahi_s_domain_browser_start(AvahiSDomainBrowser *b); + /** Free an AvahiSDomainBrowser object */ void avahi_s_domain_browser_free(AvahiSDomainBrowser *b); @@ -169,6 +223,19 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( AvahiSServiceTypeBrowserCallback callback, void* userdata); +/** Prepare a new AvahiSServiceTypeBrowser object. */ +AvahiSServiceTypeBrowser *avahi_s_service_type_browser_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *domain, + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSServiceTypeBrowserCallback callback, + void* userdata); + +/** Start querying on an AvahiSServiceTypeBrowser object */ +void avahi_s_service_type_browser_start(AvahiSServiceTypeBrowser *b); + /** Free an AvahiSServiceTypeBrowser object */ void avahi_s_service_type_browser_free(AvahiSServiceTypeBrowser *b); @@ -195,6 +262,20 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( AvahiSServiceBrowserCallback callback, void* userdata); +/** Prepare a new AvahiSServiceBrowser object. */ +AvahiSServiceBrowser *avahi_s_service_browser_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *service_type /** DNS-SD service type, e.g. "_http._tcp" */, + const char *domain, + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSServiceBrowserCallback callback, + void* userdata); + +/** Start querying on an AvahiSServiceBrowser object */ +void avahi_s_service_browser_start(AvahiSServiceBrowser *b); + /** Free an AvahiSServiceBrowser object */ void avahi_s_service_browser_free(AvahiSServiceBrowser *b); @@ -227,6 +308,22 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( AvahiSServiceResolverCallback calback, void* userdata); +/** Prepare a new AvahiSServiceResolver object. The specified callback function will be called with the resolved service data. */ +AvahiSServiceResolver *avahi_s_service_resolver_prepare( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *name, + const char *type, + const char *domain, + AvahiProtocol aprotocol, /**< Address family of the desired service address. Use AVAHI_PROTO_UNSPEC if you don't care */ + AvahiLookupFlags flags, /**< Lookup flags. */ + AvahiSServiceResolverCallback calback, + void* userdata); + +/** Start querying on an AvahiSServiceResolver object */ +void avahi_s_service_resolver_start(AvahiSServiceResolver *r); + /** Free an AvahiSServiceResolver object */ void avahi_s_service_resolver_free(AvahiSServiceResolver *r); diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c index dd4adbc..ac0b29b 100644 --- a/avahi-core/resolve-address.c +++ b/avahi-core/resolve-address.c @@ -160,9 +160,10 @@ static void record_browser_callback( r->retry_with_multicast = 0; avahi_s_record_browser_free(r->record_browser); - r->record_browser = avahi_s_record_browser_new(r->server, r->interface, r->protocol, r->key, AVAHI_LOOKUP_USE_MULTICAST, record_browser_callback, r); + r->record_browser = avahi_s_record_browser_prepare(r->server, r->interface, r->protocol, r->key, AVAHI_LOOKUP_USE_MULTICAST, record_browser_callback, r); if (r->record_browser) { + avahi_s_record_browser_start_query(r->record_browser); start_timeout(r); break; } @@ -174,7 +175,7 @@ static void record_browser_callback( } } -AvahiSAddressResolver *avahi_s_address_resolver_new( +AvahiSAddressResolver *avahi_s_address_resolver_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -235,7 +236,7 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( } } - r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r); + r->record_browser = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, r); if (!r->record_browser) { avahi_s_address_resolver_free(r); @@ -247,6 +248,13 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( return r; } +void avahi_s_address_resolver_start(AvahiSAddressResolver *r) { + assert(r); + + if(r->record_browser) + avahi_s_record_browser_start_query(r->record_browser); +} + void avahi_s_address_resolver_free(AvahiSAddressResolver *r) { assert(r); @@ -266,3 +274,19 @@ void avahi_s_address_resolver_free(AvahiSAddressResolver *r) { avahi_free(r); } + +AvahiSAddressResolver *avahi_s_address_resolver_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const AvahiAddress *address, + AvahiLookupFlags flags, + AvahiSAddressResolverCallback callback, + void* userdata) { + AvahiSAddressResolver *b; + + b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); + avahi_s_address_resolver_start(b); + + return b; +} \ No newline at end of file diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c index 08f209b..808b0e7 100644 --- a/avahi-core/resolve-host-name.c +++ b/avahi-core/resolve-host-name.c @@ -201,7 +201,7 @@ static void record_browser_callback( } } -AvahiSHostNameResolver *avahi_s_host_name_resolver_new( +AvahiSHostNameResolver *avahi_s_host_name_resolver_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -248,7 +248,7 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( if (aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_UNSPEC) { k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A); - r->record_browser_a = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r); + r->record_browser_a = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, r); avahi_key_unref(k); if (!r->record_browser_a) @@ -257,7 +257,7 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) { k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA); - r->record_browser_aaaa = avahi_s_record_browser_new(server, interface, protocol, k, flags, record_browser_callback, r); + r->record_browser_aaaa = avahi_s_record_browser_prepare(server, interface, protocol, k, flags, record_browser_callback, r); avahi_key_unref(k); if (!r->record_browser_aaaa) @@ -275,6 +275,16 @@ fail: return NULL; } +void avahi_s_host_name_resolver_start(AvahiSHostNameResolver *r) { + assert(r); + + if(r->record_browser_a) + avahi_s_record_browser_start_query(r->record_browser_a); + + if(r->record_browser_aaaa) + avahi_s_record_browser_start_query(r->record_browser_aaaa); +} + void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r) { assert(r); @@ -295,3 +305,20 @@ void avahi_s_host_name_resolver_free(AvahiSHostNameResolver *r) { avahi_free(r->host_name); avahi_free(r); } + +AvahiSHostNameResolver *avahi_s_host_name_resolver_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *host_name, + AvahiProtocol aprotocol, + AvahiLookupFlags flags, + AvahiSHostNameResolverCallback callback, + void* userdata) { + AvahiSHostNameResolver *b; + + b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); + avahi_s_host_name_resolver_start(b); + + return b; +} \ No newline at end of file diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c index 3377a50..66bf3ca 100644 --- a/avahi-core/resolve-service.c +++ b/avahi-core/resolve-service.c @@ -222,13 +222,17 @@ static void record_browser_callback( if (r->address_protocol == AVAHI_PROTO_INET || r->address_protocol == AVAHI_PROTO_UNSPEC) { AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A); - r->record_browser_a = avahi_s_record_browser_new(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); + r->record_browser_a = avahi_s_record_browser_prepare(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); + if(r->record_browser_a) + avahi_s_record_browser_start_query(r->record_browser_a); avahi_key_unref(k); } if (r->address_protocol == AVAHI_PROTO_INET6 || r->address_protocol == AVAHI_PROTO_UNSPEC) { AvahiKey *k = avahi_key_new(r->srv_record->data.srv.name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA); - r->record_browser_aaaa = avahi_s_record_browser_new(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); + r->record_browser_aaaa = avahi_s_record_browser_prepare(r->server, r->interface, r->protocol, k, r->user_flags & ~(AVAHI_LOOKUP_NO_TXT|AVAHI_LOOKUP_NO_ADDRESS), record_browser_callback, r); + if(r->record_browser_aaaa) + avahi_s_record_browser_start_query(r->record_browser_aaaa); avahi_key_unref(k); } } @@ -375,7 +379,7 @@ static void record_browser_callback( } } -AvahiSServiceResolver *avahi_s_service_resolver_new( +AvahiSServiceResolver *avahi_s_service_resolver_prepare( AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, @@ -458,6 +462,19 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( return r; } +void avahi_s_service_resolver_start(AvahiSServiceResolver *r) { + assert(r); + + if (r->record_browser_srv) + avahi_s_record_browser_start_query(r->record_browser_srv); + if (r->record_browser_txt) + avahi_s_record_browser_start_query(r->record_browser_txt); + if (r->record_browser_a) + avahi_s_record_browser_start_query(r->record_browser_a); + if (r->record_browser_aaaa) + avahi_s_record_browser_start_query(r->record_browser_aaaa); +} + void avahi_s_service_resolver_free(AvahiSServiceResolver *r) { assert(r); @@ -487,3 +504,22 @@ void avahi_s_service_resolver_free(AvahiSServiceResolver *r) { avahi_free(r->domain_name); avahi_free(r); } + +AvahiSServiceResolver *avahi_s_service_resolver_new( + AvahiServer *server, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *name, + const char *type, + const char *domain, + AvahiProtocol aprotocol, + AvahiLookupFlags flags, + AvahiSServiceResolverCallback callback, + void* userdata) { + AvahiSServiceResolver *b; + + b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); + avahi_s_service_resolver_start(b); + + return b; +} \ No newline at end of file diff --git a/avahi-core/server.c b/avahi-core/server.c index a2cb19a..e507750 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -674,15 +674,56 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter } if (!avahi_key_is_pattern(record->key)) { + /* Filter services that will be cached. Allow all local services */ + if (!from_local_iface && s->config.enable_reflector && s->config.reflect_filters != NULL) { + AvahiStringList *l; + int match = 0; + + if (record->key->type == AVAHI_DNS_TYPE_PTR) { + /* Need to match DNS pointer target with filter */ + for (l = s->config.reflect_filters; l; l = l->next) { + if (strstr(record->data.ptr.name, (char*) l->text) != NULL) { + match = 1; + break; + } + } + + if (!match) { + avahi_log_debug("Reject Ptr SRC [%s] Dest [%s]", record->key->name, record->data.ptr.name); + goto unref; + } + else + avahi_log_debug("Match Ptr SRC [%s] Dest [%s]", record->key->name, record->data.ptr.name); + } + else if (record->key->type == AVAHI_DNS_TYPE_SRV || record->key->type == AVAHI_DNS_TYPE_TXT) { + /* Need to match key name with filter */ + for (l = s->config.reflect_filters; l; l = l->next) { + if (strstr(record->key->name, (char*) l->text) != NULL) { + match = 1; + break; + } + } + + if (!match) { + avahi_log_debug("Reject Key [%s] iface [%d]", record->key->name, from_local_iface); + goto unref; + } + else + avahi_log_debug("Match Key [%s] iface [%d]", record->key->name, from_local_iface); + } + } if (handle_conflict(s, i, record, cache_flush)) { - if (!from_local_iface && !avahi_record_is_link_local_address(record)) - reflect_response(s, i, record, cache_flush); - avahi_cache_update(i->cache, record, cache_flush, a); + if (!from_local_iface) { + if (!avahi_record_is_link_local_address(record)) + reflect_response(s, i, record, cache_flush); + avahi_cache_update(i->cache, record, cache_flush, a); + } avahi_response_scheduler_incoming(i->response_scheduler, record, cache_flush); } } + unref: avahi_record_unref(record); } @@ -930,6 +971,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres if (avahi_dns_packet_is_query(p)) { int legacy_unicast = 0; + char t[AVAHI_ADDRESS_STR_MAX]; /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the * AR section completely here, so far. Until the day we add @@ -947,6 +989,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres legacy_unicast = 1; } + if (!is_mdns_mcast_address(dst_address) && + !avahi_interface_address_on_link(i, src_address)) { + + avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); + return; + } + if (legacy_unicast) reflect_legacy_unicast_query_packet(s, p, i, src_address, port); @@ -1161,6 +1210,7 @@ static void register_hinfo(AvahiServer *s) { if (avahi_server_add(s, s->hinfo_entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_PUBLISH_UNIQUE, r) < 0) { avahi_log_warn("Failed to add HINFO RR: %s", avahi_strerror(s->error)); + avahi_record_unref(r); return; } } @@ -1589,6 +1639,7 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { c->use_iff_running = 0; c->enable_reflector = 0; c->reflect_ipv = 0; + c->reflect_filters = NULL; c->add_service_cookie = 0; c->enable_wide_area = 0; c->n_wide_area_servers = 0; @@ -1611,13 +1662,14 @@ void avahi_server_config_free(AvahiServerConfig *c) { avahi_free(c->host_name); avahi_free(c->domain_name); avahi_string_list_free(c->browse_domains); + avahi_string_list_free(c->reflect_filters); avahi_string_list_free(c->allow_interfaces); avahi_string_list_free(c->deny_interfaces); } AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiServerConfig *c) { char *d = NULL, *h = NULL; - AvahiStringList *browse = NULL, *allow = NULL, *deny = NULL; + AvahiStringList *browse = NULL, *allow = NULL, *deny = NULL, *reflect = NULL ; assert(ret); assert(c); @@ -1652,12 +1704,22 @@ AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiS return NULL; } + if (!(reflect = avahi_string_list_copy(c->reflect_filters)) && c->reflect_filters) { + avahi_string_list_free(allow); + avahi_string_list_free(browse); + avahi_string_list_free(deny); + avahi_free(h); + avahi_free(d); + return NULL; + } + *ret = *c; ret->host_name = h; ret->domain_name = d; ret->browse_domains = browse; ret->allow_interfaces = allow; ret->deny_interfaces = deny; + ret->reflect_filters = reflect; return ret; } diff --git a/avahi-core/socket.c b/avahi-core/socket.c index 5a00300..7583dae 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -235,13 +235,13 @@ static int ipv4_pktinfo(int fd) { #ifdef IP_RECVINTERFACE yes = 1; - if (setsockopt (fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof(yes)) < 0) { + if (setsockopt(fd, IPPROTO_IP, IP_RECVINTERFACE, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVINTERFACE failed: %s", strerror(errno)); return -1; } #elif defined(IP_RECVIF) yes = 1; - if (setsockopt (fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof(yes)) < 0) { + if (setsockopt(fd, IPPROTO_IP, IP_RECVIF, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVIF failed: %s", strerror(errno)); return -1; } @@ -249,7 +249,7 @@ static int ipv4_pktinfo(int fd) { #ifdef IP_RECVDSTADDR yes = 1; - if (setsockopt (fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof(yes)) < 0) { + if (setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR, &yes, sizeof(yes)) < 0) { avahi_log_warn("IP_RECVDSTADDR failed: %s", strerror(errno)); return -1; } @@ -454,11 +454,20 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) { if (errno != EAGAIN) { char where[64]; - struct sockaddr_in *sin = msg->msg_name; + struct sockaddr_storage *ss = msg->msg_name; + + if (ss->ss_family == PF_INET) { + inet_ntop(ss->ss_family, &((struct sockaddr_in*)ss)->sin_addr, where, sizeof(where)); + } else if (ss->ss_family == PF_INET6) { + inet_ntop(ss->ss_family, &((struct sockaddr_in6*)ss)->sin6_addr, where, sizeof(where)); + } else { + where[0] = '\0'; + } - inet_ntop(sin->sin_family, &sin->sin_addr, where, sizeof(where)); avahi_log_debug("sendmsg() to %s failed: %s", where, strerror(errno)); + return -1; + } if (avahi_wait_for_write(fd) < 0) diff --git a/avahi-daemon/Makefile.in b/avahi-daemon/Makefile.in index e28dc9a..4db69dd 100644 --- a/avahi-daemon/Makefile.in +++ b/avahi-daemon/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -151,14 +151,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -357,7 +362,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/avahi-dbus.conf.in \ $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -370,8 +374,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -382,7 +384,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -423,11 +424,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -441,16 +443,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -469,16 +462,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -486,15 +487,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -513,10 +514,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -531,6 +529,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -541,6 +541,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -584,8 +586,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf index ff9a4c5..f2eca08 100644 --- a/avahi-daemon/avahi-daemon.conf +++ b/avahi-daemon/avahi-daemon.conf @@ -57,6 +57,7 @@ publish-workstation=no [reflector] #enable-reflector=no #reflect-ipv=no +#reflect-filters=_airplay._tcp.local,_raop._tcp.local [rlimits] #rlimit-as= diff --git a/avahi-daemon/dbus-async-address-resolver.c b/avahi-daemon/dbus-async-address-resolver.c index a77e03c..d757da5 100644 --- a/avahi-daemon/dbus-async-address-resolver.c +++ b/avahi-daemon/dbus-async-address-resolver.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_async_address_resolver_free(AsyncAddressResolverInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->address_resolver) avahi_s_address_resolver_free(i->address_resolver); @@ -50,6 +58,13 @@ void avahi_dbus_async_address_resolver_free(AsyncAddressResolverInfo *i) { avahi_free(i); } +void avahi_dbus_async_address_resolver_start(AsyncAddressResolverInfo *i) { + assert(i); + + if(i->address_resolver) + avahi_s_address_resolver_start(i->address_resolver); +} + void avahi_dbus_async_address_resolver_callback(AvahiSAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *host_name, AvahiLookupResultFlags flags, void* userdata) { AsyncAddressResolverInfo *i = userdata; DBusMessage *reply; @@ -132,6 +147,18 @@ DBusHandlerResult avahi_dbus_msg_async_address_resolver_impl(DBusConnection *c, return avahi_dbus_respond_ok(c, m); } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing AddressResolver::Start message"); + goto fail; + } + + avahi_dbus_async_address_resolver_start(i); + return avahi_dbus_respond_ok(c, m); + } + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-async-host-name-resolver.c b/avahi-daemon/dbus-async-host-name-resolver.c index 7c2d063..0cd7cfe 100644 --- a/avahi-daemon/dbus-async-host-name-resolver.c +++ b/avahi-daemon/dbus-async-host-name-resolver.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_async_host_name_resolver_free(AsyncHostNameResolverInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->host_name_resolver) avahi_s_host_name_resolver_free(i->host_name_resolver); @@ -49,6 +57,13 @@ void avahi_dbus_async_host_name_resolver_free(AsyncHostNameResolverInfo *i) { avahi_free(i); } +void avahi_dbus_async_host_name_resolver_start(AsyncHostNameResolverInfo *i) { + assert(i); + + if(i->host_name_resolver) + avahi_s_host_name_resolver_start(i->host_name_resolver); +} + void avahi_dbus_async_host_name_resolver_callback(AvahiSHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *host_name, const AvahiAddress *a, AvahiLookupResultFlags flags, void* userdata) { AsyncHostNameResolverInfo *i = userdata; DBusMessage *reply; @@ -130,6 +145,18 @@ DBusHandlerResult avahi_dbus_msg_async_host_name_resolver_impl(DBusConnection *c return avahi_dbus_respond_ok(c, m); } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing HostNameResolver::Start message"); + goto fail; + } + + avahi_dbus_async_host_name_resolver_start(i); + return avahi_dbus_respond_ok(c, m); + } + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-async-service-resolver.c b/avahi-daemon/dbus-async-service-resolver.c index 2b58e2d..1737abb 100644 --- a/avahi-daemon/dbus-async-service-resolver.c +++ b/avahi-daemon/dbus-async-service-resolver.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_async_service_resolver_free(AsyncServiceResolverInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->service_resolver) avahi_s_service_resolver_free(i->service_resolver); @@ -50,6 +58,13 @@ void avahi_dbus_async_service_resolver_free(AsyncServiceResolverInfo *i) { avahi_free(i); } +void avahi_dbus_async_service_resolver_start(AsyncServiceResolverInfo *i) { + assert(i); + + if(i->service_resolver) + avahi_s_service_resolver_start(i->service_resolver); +} + void avahi_dbus_async_service_resolver_callback( AvahiSServiceResolver *r, AvahiIfIndex interface, @@ -100,10 +115,12 @@ void avahi_dbus_async_service_resolver_callback( i_interface = (int32_t) interface; i_protocol = (int32_t) protocol; + if (a) - i_aprotocol = (int32_t) a->proto; - else - i_aprotocol = AVAHI_PROTO_UNSPEC; + i_aprotocol = (int32_t) a->proto; + else + i_aprotocol = AVAHI_PROTO_UNSPEC; + u_flags = (uint32_t) flags; dbus_message_append_args( @@ -169,6 +186,18 @@ DBusHandlerResult avahi_dbus_msg_async_service_resolver_impl(DBusConnection *c, return avahi_dbus_respond_ok(c, m); } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing ServiceResolver::Start message"); + goto fail; + } + + avahi_dbus_async_service_resolver_start(i); + return avahi_dbus_respond_ok(c, m); + } + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-domain-browser.c b/avahi-daemon/dbus-domain-browser.c index e51996f..28fbbbc 100644 --- a/avahi-daemon/dbus-domain-browser.c +++ b/avahi-daemon/dbus-domain-browser.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_domain_browser_free(DomainBrowserInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->domain_browser) avahi_s_domain_browser_free(i->domain_browser); @@ -50,6 +58,13 @@ void avahi_dbus_domain_browser_free(DomainBrowserInfo *i) { avahi_free(i); } +void avahi_dbus_domain_browser_start(DomainBrowserInfo *i) { + assert(i); + + if(i->domain_browser) + avahi_s_domain_browser_start(i->domain_browser); +} + DBusHandlerResult avahi_dbus_msg_domain_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) { DBusError error; DomainBrowserInfo *i = userdata; @@ -85,6 +100,20 @@ DBusHandlerResult avahi_dbus_msg_domain_browser_impl(DBusConnection *c, DBusMess } + + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing DomainBrowser::Start message"); + goto fail; + } + + avahi_dbus_domain_browser_start(i); + return avahi_dbus_respond_ok(c, m); + + } + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-internal.h b/avahi-daemon/dbus-internal.h index 0b86578..52e93af 100644 --- a/avahi-daemon/dbus-internal.h +++ b/avahi-daemon/dbus-internal.h @@ -46,6 +46,7 @@ typedef struct RecordBrowserInfo RecordBrowserInfo; #define DEFAULT_CLIENTS_MAX 4096 #define DEFAULT_OBJECTS_PER_CLIENT_MAX 1024 #define DEFAULT_ENTRIES_PER_ENTRY_GROUP_MAX 32 +#define DEFAULT_START_DELAY_MS 10 struct EntryGroupInfo { unsigned id; @@ -71,6 +72,7 @@ struct AsyncHostNameResolverInfo { Client *client; AvahiSHostNameResolver *host_name_resolver; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(AsyncHostNameResolverInfo, async_host_name_resolvers); }; @@ -88,6 +90,7 @@ struct AsyncAddressResolverInfo { Client *client; AvahiSAddressResolver *address_resolver; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(AsyncAddressResolverInfo, async_address_resolvers); }; @@ -97,6 +100,7 @@ struct DomainBrowserInfo { Client *client; AvahiSDomainBrowser *domain_browser; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(DomainBrowserInfo, domain_browsers); }; @@ -106,6 +110,7 @@ struct ServiceTypeBrowserInfo { Client *client; AvahiSServiceTypeBrowser *service_type_browser; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(ServiceTypeBrowserInfo, service_type_browsers); }; @@ -115,6 +120,7 @@ struct ServiceBrowserInfo { Client *client; AvahiSServiceBrowser *service_browser; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(ServiceBrowserInfo, service_browsers); }; @@ -132,6 +138,7 @@ struct AsyncServiceResolverInfo { Client *client; AvahiSServiceResolver *service_resolver; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(AsyncServiceResolverInfo, async_service_resolvers); }; @@ -141,6 +148,7 @@ struct RecordBrowserInfo { Client *client; AvahiSRecordBrowser *record_browser; char *path; + AvahiTimeout *delay_timeout; AVAHI_LLIST_FIELDS(RecordBrowserInfo, record_browsers); }; @@ -192,6 +200,7 @@ void avahi_dbus_sync_host_name_resolver_free(SyncHostNameResolverInfo *i); void avahi_dbus_sync_host_name_resolver_callback(AvahiSHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *host_name, const AvahiAddress *a, AvahiLookupResultFlags flags, void* userdata); void avahi_dbus_async_host_name_resolver_free(AsyncHostNameResolverInfo *i); +void avahi_dbus_async_host_name_resolver_start(AsyncHostNameResolverInfo *i); void avahi_dbus_async_host_name_resolver_callback(AvahiSHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *host_name, const AvahiAddress *a, AvahiLookupResultFlags flags, void* userdata); DBusHandlerResult avahi_dbus_msg_async_host_name_resolver_impl(DBusConnection *c, DBusMessage *m, void *userdata); @@ -199,18 +208,22 @@ void avahi_dbus_sync_address_resolver_free(SyncAddressResolverInfo *i); void avahi_dbus_sync_address_resolver_callback(AvahiSAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *host_name, AvahiLookupResultFlags flags, void* userdata); void avahi_dbus_async_address_resolver_free(AsyncAddressResolverInfo *i); +void avahi_dbus_async_address_resolver_start(AsyncAddressResolverInfo *i); void avahi_dbus_async_address_resolver_callback(AvahiSAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *host_name, AvahiLookupResultFlags flags, void* userdata); DBusHandlerResult avahi_dbus_msg_async_address_resolver_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_domain_browser_free(DomainBrowserInfo *i); +void avahi_dbus_domain_browser_start(DomainBrowserInfo *i); DBusHandlerResult avahi_dbus_msg_domain_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_domain_browser_callback(AvahiSDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, AvahiLookupResultFlags flags, void* userdata); void avahi_dbus_service_type_browser_free(ServiceTypeBrowserInfo *i); +void avahi_dbus_service_type_browser_start(ServiceTypeBrowserInfo *i); DBusHandlerResult avahi_dbus_msg_service_type_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_service_type_browser_callback(AvahiSServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *type, const char *domain, AvahiLookupResultFlags flags, void* userdata); void avahi_dbus_service_browser_free(ServiceBrowserInfo *i); +void avahi_dbus_service_browser_start(ServiceBrowserInfo *i); DBusHandlerResult avahi_dbus_msg_service_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_service_browser_callback(AvahiSServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags flags, void* userdata); @@ -232,6 +245,7 @@ void avahi_dbus_sync_service_resolver_callback( void* userdata); void avahi_dbus_async_service_resolver_free(AsyncServiceResolverInfo *i); +void avahi_dbus_async_service_resolver_start(AsyncServiceResolverInfo *i); void avahi_dbus_async_service_resolver_callback( AvahiSServiceResolver *r, AvahiIfIndex interface, @@ -250,7 +264,18 @@ void avahi_dbus_async_service_resolver_callback( DBusHandlerResult avahi_dbus_msg_async_service_resolver_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_record_browser_free(RecordBrowserInfo *i); +void avahi_dbus_record_browser_start(RecordBrowserInfo *i); DBusHandlerResult avahi_dbus_msg_record_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata); void avahi_dbus_record_browser_callback(AvahiSRecordBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, AvahiLookupResultFlags flags, void* userdata); + +#define GET_DBUS_DELAY_FUNC(object_type, object_name) dbus_delay_##object_type##_##object_name##_start + +#define CREATE_DBUS_DELAY_FUNC(object_type, object_name, start_func) \ +static void GET_DBUS_DELAY_FUNC(object_type, object_name)(AVAHI_GCC_UNUSED AvahiTimeout *t, AVAHI_GCC_UNUSED void *userdata) { \ + object_type *data; \ + data = userdata; \ + start_func(data->object_name); \ +}\ + #endif diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index eb8a662..70d7687 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -171,6 +171,14 @@ static void reconnect_callback(AvahiTimeout *t, AVAHI_GCC_UNUSED void *userdata) } } +static DBusHandlerResult dbus_parsing_error(const char *txt, DBusError *error) { + avahi_log_warn("%s",txt); + if (dbus_error_is_set(error)) + dbus_error_free(error); + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) { DBusError error; @@ -206,8 +214,7 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection char *name; if (!dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing NameAcquired message"); - goto fail; + return dbus_parsing_error("Error parsing NameAcquired message", &error); } /* avahi_log_info(__FILE__": name acquired (%s)", name); */ @@ -217,8 +224,7 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection char *name, *old, *new; if (!dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing NameOwnerChanged message"); - goto fail; + return dbus_parsing_error("Error parsing NameOwnerChanged message", &error); } if (!*new) { @@ -231,777 +237,971 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection } } -fail: if (dbus_error_is_set(&error)) dbus_error_free(&error); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) { - DBusError error; +static DBusHandlerResult dbus_get_host_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!dbus_message_get_args(m, error, DBUS_TYPE_INVALID)) { + return dbus_parsing_error("Error parsing Server::GetHostName message", error); + } - dbus_error_init(&error); + return avahi_dbus_respond_string(c, m, avahi_server_get_host_name(avahi_server)); +} - avahi_log_debug(__FILE__": interface=%s, path=%s, member=%s", - dbus_message_get_interface(m), - dbus_message_get_path(m), - dbus_message_get_member(m)); +static DBusHandlerResult dbus_set_host_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + char *name; - if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) - return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.Server.xml"); + if (!dbus_message_get_args(m, error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) { + return dbus_parsing_error("Error parsing Server::SetHostName message", error); + } - else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetHostName")) { + if (avahi_server_set_host_name(avahi_server, name) < 0) + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing Server::GetHostName message"); - goto fail; - } + avahi_log_info("Changing host name to '%s'.", name); - return avahi_dbus_respond_string(c, m, avahi_server_get_host_name(avahi_server)); + return avahi_dbus_respond_ok(c, m); +} - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "SetHostName")) { +static DBusHandlerResult dbus_get_domain_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!dbus_message_get_args(m, error, DBUS_TYPE_INVALID)) { + return dbus_parsing_error("Error parsing Server::GetDomainName message", error); + } - char *name; + return avahi_dbus_respond_string(c, m, avahi_server_get_domain_name(avahi_server)); +} - if (!dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing Server::SetHostName message"); - goto fail; - } +static DBusHandlerResult dbus_get_host_name_fqdn(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetHostNameFqdn message", error); + } - if (avahi_server_set_host_name(avahi_server, name) < 0) - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + return avahi_dbus_respond_string(c, m, avahi_server_get_host_name_fqdn(avahi_server)); +} - avahi_log_info("Changing host name to '%s'.", name); +static DBusHandlerResult dbus_is_ns_support_available(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::IsNSSSupportAvailable message", error); + } - return avahi_dbus_respond_ok(c, m); + return avahi_dbus_respond_boolean(c, m, nss_support); +} - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetDomainName")) { +static DBusHandlerResult dbus_get_version_string(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetVersionString message", error); + } - if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing Server::GetDomainName message"); - goto fail; - } + return avahi_dbus_respond_string(c, m, PACKAGE_STRING); +} - return avahi_dbus_respond_string(c, m, avahi_server_get_domain_name(avahi_server)); +static DBusHandlerResult dbus_get_api_version(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetAPIVersion message", error); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetHostNameFqdn")) { + return avahi_dbus_respond_uint32(c, m, AVAHI_DBUS_API_VERSION); +} - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetHostNameFqdn message"); - goto fail; - } +static DBusHandlerResult dbus_get_state(DBusConnection *c, DBusMessage *m, DBusError *error) { + AvahiServerState state; - return avahi_dbus_respond_string(c, m, avahi_server_get_host_name_fqdn(avahi_server)); + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetState message", error); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "IsNSSSupportAvailable")) { - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::IsNSSSupportAvailable message"); - goto fail; - } + state = avahi_server_get_state(avahi_server); + return avahi_dbus_respond_int32(c, m, (int32_t) state); +} - return avahi_dbus_respond_boolean(c, m, nss_support); +static DBusHandlerResult dbus_get_local_service_cookie(DBusConnection *c, DBusMessage *m, DBusError *error) { + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetLocalServiceCookie message", error); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetVersionString")) { + return avahi_dbus_respond_uint32(c, m, avahi_server_get_local_service_cookie(avahi_server)); +} - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetVersionString message"); - goto fail; - } +static DBusHandlerResult dbus_get_net_if_by_index(DBusConnection *c, DBusMessage *m, DBusError *error) { + int32_t idx; + char name[IF_NAMESIZE]; - return avahi_dbus_respond_string(c, m, PACKAGE_STRING); + if (!(dbus_message_get_args(m, error, DBUS_TYPE_INT32, &idx, DBUS_TYPE_INVALID))) { + return dbus_parsing_error("Error parsing Server::GetNetworkInterfaceNameByIndex message", error); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetAPIVersion")) { +#ifdef VALGRIND_WORKAROUND + return respond_string(c, m, "blah"); +#else + if ((!if_indextoname(idx, name))) { + char txt[256]; + snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); + } - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetAPIVersion message"); - goto fail; - } + return avahi_dbus_respond_string(c, m, name); +#endif +} - return avahi_dbus_respond_uint32(c, m, AVAHI_DBUS_API_VERSION); +static DBusHandlerResult dbus_get_net_if_by_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + char *n; + int32_t idx; - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetState")) { - AvahiServerState state; + if (!(dbus_message_get_args(m, error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { + return dbus_parsing_error("Error parsing Server::GetNetworkInterfaceIndexByName message", error); + } - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetState message"); - goto fail; - } +#ifdef VALGRIND_WORKAROUND + return respond_int32(c, m, 1); +#else + if (!(idx = if_nametoindex(n))) { + char txt[256]; + snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); + } - state = avahi_server_get_state(avahi_server); - return avahi_dbus_respond_int32(c, m, (int32_t) state); + return avahi_dbus_respond_int32(c, m, idx); +#endif +} - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetLocalServiceCookie")) { +static DBusHandlerResult dbus_get_alternative_host_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + char *n, * t; - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetLocalServiceCookie message"); - goto fail; - } + if (!(dbus_message_get_args(m, error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { + return dbus_parsing_error("Error parsing Server::GetAlternativeHostName message", error); + } - return avahi_dbus_respond_uint32(c, m, avahi_server_get_local_service_cookie(avahi_server)); + t = avahi_alternative_host_name(n); + avahi_dbus_respond_string(c, m, t); + avahi_free(t); - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceNameByIndex")) { - int32_t idx; - char name[IF_NAMESIZE]; + return DBUS_HANDLER_RESULT_HANDLED; +} - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INT32, &idx, DBUS_TYPE_INVALID))) { - avahi_log_warn("Error parsing Server::GetNetworkInterfaceNameByIndex message"); - goto fail; - } +static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DBusMessage *m, DBusError *error) { + char *n, *t; -#ifdef VALGRIND_WORKAROUND - return respond_string(c, m, "blah"); -#else - if ((!if_indextoname(idx, name))) { - char txt[256]; - snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); - } + if (!(dbus_message_get_args(m, error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { + return dbus_parsing_error("Error parsing Server::GetAlternativeServiceName message", error); + } - return avahi_dbus_respond_string(c, m, name); -#endif + t = avahi_alternative_service_name(n); + avahi_dbus_respond_string(c, m, t); + avahi_free(t); - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceIndexByName")) { - char *n; - int32_t idx; + return DBUS_HANDLER_RESULT_HANDLED; +} - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { - avahi_log_warn("Error parsing Server::GetNetworkInterfaceIndexByName message"); - goto fail; - } +static DBusHandlerResult dbus_create_new_entry_group(DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + EntryGroupInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_entry_group_impl, + NULL, + NULL, + NULL, + NULL + }; -#ifdef VALGRIND_WORKAROUND - return respond_int32(c, m, 1); -#else - if (!(idx = if_nametoindex(n))) { - char txt[256]; - snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); - } + if (!dbus_message_get_args(m, error, DBUS_TYPE_INVALID)) { + return dbus_parsing_error("Error parsing Server::EntryGroupNew message", error); + } - return avahi_dbus_respond_int32(c, m, idx); -#endif + if (server->disable_user_service_publishing) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_PERMITTED, NULL); - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetAlternativeHostName")) { - char *n, * t; + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { - avahi_log_warn("Error parsing Server::GetAlternativeHostName message"); - goto fail; - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - t = avahi_alternative_host_name(n); - avahi_dbus_respond_string(c, m, t); - avahi_free(t); + i = avahi_new(EntryGroupInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->n_entries = 0; + AVAHI_LLIST_PREPEND(EntryGroupInfo, entry_groups, client->entry_groups, i); + client->n_objects++; + + if (!(i->entry_group = avahi_s_entry_group_new(avahi_server, avahi_dbus_entry_group_callback, i))) { + avahi_dbus_entry_group_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - return DBUS_HANDLER_RESULT_HANDLED; + i->path = avahi_strdup_printf("/Client%u/EntryGroup%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + return avahi_dbus_respond_path(c, m, i->path); +} - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetAlternativeServiceName")) { - char *n, *t; +static DBusHandlerResult dbus_prepare_domain_browser_object(DomainBrowserInfo **dbi, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + DomainBrowserInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_domain_browser_impl, + NULL, + NULL, + NULL, + NULL + }; + int32_t interface, protocol, type; + uint32_t flags; + char *domain; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INT32, &type, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || type < 0 || type >= AVAHI_DOMAIN_BROWSER_MAX) { + return dbus_parsing_error("Error parsing Server::DomainBrowserNew message", error); + } - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { - avahi_log_warn("Error parsing Server::GetAlternativeServiceName message"); - goto fail; - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - t = avahi_alternative_service_name(n); - avahi_dbus_respond_string(c, m, t); - avahi_free(t); + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - return DBUS_HANDLER_RESULT_HANDLED; + if (!*domain) + domain = NULL; - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "EntryGroupNew")) { - Client *client; - EntryGroupInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_entry_group_impl, - NULL, - NULL, - NULL, - NULL - }; - - if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing Server::EntryGroupNew message"); - goto fail; - } + i = avahi_new(DomainBrowserInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(DomainBrowserInfo, domain_browsers, client->domain_browsers, i); + client->n_objects++; - if (server->disable_user_service_publishing) - return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_PERMITTED, NULL); + if (!(i->domain_browser = avahi_s_domain_browser_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, domain, (AvahiDomainBrowserType) type, (AvahiLookupFlags) flags, avahi_dbus_domain_browser_callback, i))) { + avahi_dbus_domain_browser_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + i->path = avahi_strdup_printf("/Client%u/DomainBrowser%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *dbi = i; + return avahi_dbus_respond_path(c, m, i->path); +} - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } - i = avahi_new(EntryGroupInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - i->n_entries = 0; - AVAHI_LLIST_PREPEND(EntryGroupInfo, entry_groups, client->entry_groups, i); - client->n_objects++; - - if (!(i->entry_group = avahi_s_entry_group_new(avahi_server, avahi_dbus_entry_group_callback, i))) { - avahi_dbus_entry_group_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } +static DBusHandlerResult dbus_prepare_service_type_browser_object(ServiceTypeBrowserInfo **stbi, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + ServiceTypeBrowserInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_service_type_browser_impl, + NULL, + NULL, + NULL, + NULL + }; + int32_t interface, protocol; + uint32_t flags; + char *domain; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID)) { + return dbus_parsing_error("Error parsing Server::ServiceTypeBrowserNew message", error); + } - i->path = avahi_strdup_printf("/Client%u/EntryGroup%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ResolveHostName")) { - Client *client; - int32_t interface, protocol, aprotocol; - uint32_t flags; - char *name; - SyncHostNameResolverInfo *i; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INT32, &aprotocol, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !name) { - avahi_log_warn("Error parsing Server::ResolveHostName message"); - goto fail; - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (!*domain) + domain = NULL; - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + i = avahi_new(ServiceTypeBrowserInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(ServiceTypeBrowserInfo, service_type_browsers, client->service_type_browsers, i); + client->n_objects++; - i = avahi_new(SyncHostNameResolverInfo, 1); - i->client = client; - i->message = dbus_message_ref(m); - AVAHI_LLIST_PREPEND(SyncHostNameResolverInfo, sync_host_name_resolvers, client->sync_host_name_resolvers, i); - client->n_objects++; + if (!(i->service_type_browser = avahi_s_service_type_browser_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, domain, (AvahiLookupFlags) flags, avahi_dbus_service_type_browser_callback, i))) { + avahi_dbus_service_type_browser_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (!(i->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_sync_host_name_resolver_callback, i))) { - avahi_dbus_sync_host_name_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + i->path = avahi_strdup_printf("/Client%u/ServiceTypeBrowser%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *stbi = i; + return avahi_dbus_respond_path(c, m, i->path); +} - return DBUS_HANDLER_RESULT_HANDLED; - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ResolveAddress")) { - Client *client; - int32_t interface, protocol; - uint32_t flags; - char *address; - SyncAddressResolverInfo *i; - AvahiAddress a; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &address, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !address) { - avahi_log_warn("Error parsing Server::ResolveAddress message"); - goto fail; - } +static DBusHandlerResult dbus_prepare_service_browser_object(ServiceBrowserInfo **sbi, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + ServiceBrowserInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_service_browser_impl, + NULL, + NULL, + NULL, + NULL + }; + int32_t interface, protocol; + uint32_t flags; + char *domain, *type; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !type) { + return dbus_parsing_error("Error parsing Server::ServiceBrowserNew message", error); + } - if (!avahi_address_parse(address, AVAHI_PROTO_UNSPEC, &a)) - return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_ADDRESS, NULL); + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + if (!*domain) + domain = NULL; - i = avahi_new(SyncAddressResolverInfo, 1); - i->client = client; - i->message = dbus_message_ref(m); - AVAHI_LLIST_PREPEND(SyncAddressResolverInfo, sync_address_resolvers, client->sync_address_resolvers, i); - client->n_objects++; + i = avahi_new(ServiceBrowserInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(ServiceBrowserInfo, service_browsers, client->service_browsers, i); + client->n_objects++; - if (!(i->address_resolver = avahi_s_address_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, &a, (AvahiLookupFlags) flags, avahi_dbus_sync_address_resolver_callback, i))) { - avahi_dbus_sync_address_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + if (!(i->service_browser = avahi_s_service_browser_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, type, domain, (AvahiLookupFlags) flags, avahi_dbus_service_browser_callback, i))) { + avahi_dbus_service_browser_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - return DBUS_HANDLER_RESULT_HANDLED; + i->path = avahi_strdup_printf("/Client%u/ServiceBrowser%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *sbi = i; + return avahi_dbus_respond_path(c, m, i->path); +} - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "DomainBrowserNew")) { - Client *client; - DomainBrowserInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_domain_browser_impl, - NULL, - NULL, - NULL, - NULL - }; - int32_t interface, protocol, type; - uint32_t flags; - char *domain; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_INT32, &type, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || type < 0 || type >= AVAHI_DOMAIN_BROWSER_MAX) { - avahi_log_warn("Error parsing Server::DomainBrowserNew message"); - goto fail; - } +static DBusHandlerResult dbus_create_sync_service_resolver_object(DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol, aprotocol; + uint32_t flags; + char *name, *type, *domain; + SyncServiceResolverInfo *i; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INT32, &aprotocol, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !type) { + return dbus_parsing_error("Error parsing Server::ResolveService message", error); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (!*domain) - domain = NULL; + if (!*domain) + domain = NULL; - i = avahi_new(DomainBrowserInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(DomainBrowserInfo, domain_browsers, client->domain_browsers, i); - client->n_objects++; + if (!*name) + name = NULL; - if (!(i->domain_browser = avahi_s_domain_browser_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, domain, (AvahiDomainBrowserType) type, (AvahiLookupFlags) flags, avahi_dbus_domain_browser_callback, i))) { - avahi_dbus_domain_browser_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + i = avahi_new(SyncServiceResolverInfo, 1); + i->client = client; + i->message = dbus_message_ref(m); + AVAHI_LLIST_PREPEND(SyncServiceResolverInfo, sync_service_resolvers, client->sync_service_resolvers, i); + client->n_objects++; - i->path = avahi_strdup_printf("/Client%u/DomainBrowser%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); - - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ServiceTypeBrowserNew")) { - Client *client; - ServiceTypeBrowserInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_service_type_browser_impl, - NULL, - NULL, - NULL, - NULL - }; - int32_t interface, protocol; - uint32_t flags; - char *domain; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID)) { - avahi_log_warn("Error parsing Server::ServiceTypeBrowserNew message"); - goto fail; - } + if (!(i->service_resolver = avahi_s_service_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_sync_service_resolver_callback, i))) { + avahi_dbus_sync_service_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + return DBUS_HANDLER_RESULT_HANDLED; +} - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } +static DBusHandlerResult dbus_prepare_async_service_resolver_object(AsyncServiceResolverInfo **sri, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol, aprotocol; + uint32_t flags; + char *name, *type, *domain; + AsyncServiceResolverInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_async_service_resolver_impl, + NULL, + NULL, + NULL, + NULL + }; - if (!*domain) - domain = NULL; + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INT32, &aprotocol, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !type) { + return dbus_parsing_error("Error parsing Server::ServiceResolverNew message", error); + } - i = avahi_new(ServiceTypeBrowserInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(ServiceTypeBrowserInfo, service_type_browsers, client->service_type_browsers, i); - client->n_objects++; + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn(__FILE__": Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!(i->service_type_browser = avahi_s_service_type_browser_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, domain, (AvahiLookupFlags) flags, avahi_dbus_service_type_browser_callback, i))) { - avahi_dbus_service_type_browser_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - i->path = avahi_strdup_printf("/Client%u/ServiceTypeBrowser%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); - - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ServiceBrowserNew")) { - Client *client; - ServiceBrowserInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_service_browser_impl, - NULL, - NULL, - NULL, - NULL - }; - int32_t interface, protocol; - uint32_t flags; - char *domain, *type; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &type, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !type) { - avahi_log_warn("Error parsing Server::ServiceBrowserNew message"); - goto fail; - } + if (!*domain) + domain = NULL; - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (!*name) + name = NULL; - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + i = avahi_new(AsyncServiceResolverInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(AsyncServiceResolverInfo, async_service_resolvers, client->async_service_resolvers, i); + client->n_objects++; - if (!*domain) - domain = NULL; + if (!(i->service_resolver = avahi_s_service_resolver_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_async_service_resolver_callback, i))) { + avahi_dbus_async_service_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - i = avahi_new(ServiceBrowserInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(ServiceBrowserInfo, service_browsers, client->service_browsers, i); - client->n_objects++; +/* avahi_log_debug(__FILE__": [%s], new service resolver for <%s.%s.%s>", i->path, name, type, domain); */ - if (!(i->service_browser = avahi_s_service_browser_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, type, domain, (AvahiLookupFlags) flags, avahi_dbus_service_browser_callback, i))) { - avahi_dbus_service_browser_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + i->path = avahi_strdup_printf("/Client%u/ServiceResolver%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *sri = i; + return avahi_dbus_respond_path(c, m, i->path); +} - i->path = avahi_strdup_printf("/Client%u/ServiceBrowser%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); - - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ResolveService")) { - Client *client; - int32_t interface, protocol, aprotocol; - uint32_t flags; - char *name, *type, *domain; - SyncServiceResolverInfo *i; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &type, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_INT32, &aprotocol, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !type) { - avahi_log_warn("Error parsing Server::ResolveService message"); - goto fail; - } +static DBusHandlerResult dbus_create_sync_host_name_resolver_object(DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol, aprotocol; + uint32_t flags; + char *name; + SyncHostNameResolverInfo *i; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_INT32, &aprotocol, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !name) { + return dbus_parsing_error("Error parsing Server::ResolveHostName message", error); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (!*domain) - domain = NULL; + i = avahi_new(SyncHostNameResolverInfo, 1); + i->client = client; + i->message = dbus_message_ref(m); + AVAHI_LLIST_PREPEND(SyncHostNameResolverInfo, sync_host_name_resolvers, client->sync_host_name_resolvers, i); + client->n_objects++; - if (!*name) - name = NULL; + if (!(i->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_sync_host_name_resolver_callback, i))) { + avahi_dbus_sync_host_name_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - i = avahi_new(SyncServiceResolverInfo, 1); - i->client = client; - i->message = dbus_message_ref(m); - AVAHI_LLIST_PREPEND(SyncServiceResolverInfo, sync_service_resolvers, client->sync_service_resolvers, i); - client->n_objects++; + return DBUS_HANDLER_RESULT_HANDLED; +} - if (!(i->service_resolver = avahi_s_service_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_sync_service_resolver_callback, i))) { - avahi_dbus_sync_service_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } +static DBusHandlerResult dbus_prepare_async_host_name_resolver_object(AsyncHostNameResolverInfo **hri, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol, aprotocol; + uint32_t flags; + char *name; + AsyncHostNameResolverInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_async_host_name_resolver_impl, + NULL, + NULL, + NULL, + NULL + }; - return DBUS_HANDLER_RESULT_HANDLED; + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_INT32, &aprotocol, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !name) { + return dbus_parsing_error("Error parsing Server::HostNameResolverNew message", error); + } - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "ServiceResolverNew")) { - Client *client; - int32_t interface, protocol, aprotocol; - uint32_t flags; - char *name, *type, *domain; - AsyncServiceResolverInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_async_service_resolver_impl, - NULL, - NULL, - NULL, - NULL - }; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_STRING, &type, - DBUS_TYPE_STRING, &domain, - DBUS_TYPE_INT32, &aprotocol, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !type) { - avahi_log_warn("Error parsing Server::ServiceResolverNew message"); - goto fail; - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn(__FILE__": Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn(__FILE__": Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + i = avahi_new(AsyncHostNameResolverInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(AsyncHostNameResolverInfo, async_host_name_resolvers, client->async_host_name_resolvers, i); + client->n_objects++; + + if (!(i->host_name_resolver = avahi_s_host_name_resolver_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, aprotocol, (AvahiLookupFlags) flags, avahi_dbus_async_host_name_resolver_callback, i))) { + avahi_dbus_async_host_name_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (!*domain) - domain = NULL; + i->path = avahi_strdup_printf("/Client%u/HostNameResolver%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *hri = i; + return avahi_dbus_respond_path(c, m, i->path); +} - if (!*name) - name = NULL; +static DBusHandlerResult dbus_create_sync_address_resolver_object(DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol; + uint32_t flags; + char *address; + SyncAddressResolverInfo *i; + AvahiAddress a; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &address, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !address) { + return dbus_parsing_error("Error parsing Server::ResolveAddress message", error); + } - i = avahi_new(AsyncServiceResolverInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(AsyncServiceResolverInfo, async_service_resolvers, client->async_service_resolvers, i); - client->n_objects++; + if (!avahi_address_parse(address, AVAHI_PROTO_UNSPEC, &a)) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_ADDRESS, NULL); - if (!(i->service_resolver = avahi_s_service_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, (AvahiProtocol) aprotocol, (AvahiLookupFlags) flags, avahi_dbus_async_service_resolver_callback, i))) { - avahi_dbus_async_service_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } -/* avahi_log_debug(__FILE__": [%s], new service resolver for <%s.%s.%s>", i->path, name, type, domain); */ + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - i->path = avahi_strdup_printf("/Client%u/ServiceResolver%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); + i = avahi_new(SyncAddressResolverInfo, 1); + i->client = client; + i->message = dbus_message_ref(m); + AVAHI_LLIST_PREPEND(SyncAddressResolverInfo, sync_address_resolvers, client->sync_address_resolvers, i); + client->n_objects++; - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "HostNameResolverNew")) { - Client *client; - int32_t interface, protocol, aprotocol; - uint32_t flags; - char *name; - AsyncHostNameResolverInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_async_host_name_resolver_impl, - NULL, - NULL, - NULL, - NULL - }; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INT32, &aprotocol, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !name) { - avahi_log_warn("Error parsing Server::HostNameResolverNew message"); - goto fail; - } + if (!(i->address_resolver = avahi_s_address_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, &a, (AvahiLookupFlags) flags, avahi_dbus_sync_address_resolver_callback, i))) { + avahi_dbus_sync_address_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn(__FILE__": Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + return DBUS_HANDLER_RESULT_HANDLED; +} - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } +static DBusHandlerResult dbus_prepare_async_address_resolver_object(AsyncAddressResolverInfo **ari, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + int32_t interface, protocol; + uint32_t flags; + char *address; + AsyncAddressResolverInfo *i; + AvahiAddress a; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_async_address_resolver_impl, + NULL, + NULL, + NULL, + NULL + }; - i = avahi_new(AsyncHostNameResolverInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(AsyncHostNameResolverInfo, async_host_name_resolvers, client->async_host_name_resolvers, i); - client->n_objects++; + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &address, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !address) { + return dbus_parsing_error("Error parsing Server::AddressResolverNew message", error); + } - if (!(i->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, aprotocol, (AvahiLookupFlags) flags, avahi_dbus_async_host_name_resolver_callback, i))) { - avahi_dbus_async_host_name_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + if (!avahi_address_parse(address, AVAHI_PROTO_UNSPEC, &a)) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_ADDRESS, NULL); - i->path = avahi_strdup_printf("/Client%u/HostNameResolver%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); - - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "AddressResolverNew")) { - Client *client; - int32_t interface, protocol; - uint32_t flags; - char *address; - AsyncAddressResolverInfo *i; - AvahiAddress a; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_async_address_resolver_impl, - NULL, - NULL, - NULL, - NULL - }; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &address, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !address) { - avahi_log_warn("Error parsing Server::AddressResolverNew message"); - goto fail; - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn(__FILE__": Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!avahi_address_parse(address, AVAHI_PROTO_UNSPEC, &a)) - return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_ADDRESS, NULL); + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn(__FILE__": Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + i = avahi_new(AsyncAddressResolverInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(AsyncAddressResolverInfo, async_address_resolvers, client->async_address_resolvers, i); + client->n_objects++; + + if (!(i->address_resolver = avahi_s_address_resolver_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, &a, (AvahiLookupFlags) flags, avahi_dbus_async_address_resolver_callback, i))) { + avahi_dbus_async_address_resolver_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn(__FILE__": Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + i->path = avahi_strdup_printf("/Client%u/AddressResolver%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *ari = i; + return avahi_dbus_respond_path(c, m, i->path); +} - i = avahi_new(AsyncAddressResolverInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(AsyncAddressResolverInfo, async_address_resolvers, client->async_address_resolvers, i); - client->n_objects++; +static DBusHandlerResult dbus_prepare_record_browser_object(RecordBrowserInfo **rbi, DBusConnection *c, DBusMessage *m, DBusError *error) { + Client *client; + RecordBrowserInfo *i; + static const DBusObjectPathVTable vtable = { + NULL, + avahi_dbus_msg_record_browser_impl, + NULL, + NULL, + NULL, + NULL + }; + int32_t interface, protocol; + uint32_t flags; + char *name; + uint16_t type, clazz; + AvahiKey *key; + + if (!dbus_message_get_args( + m, error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_UINT16, &clazz, + DBUS_TYPE_UINT16, &type, + DBUS_TYPE_UINT32, &flags, + DBUS_TYPE_INVALID) || !name) { + return dbus_parsing_error("Error parsing Server::RecordBrowserNew message", error); + } - if (!(i->address_resolver = avahi_s_address_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, &a, (AvahiLookupFlags) flags, avahi_dbus_async_address_resolver_callback, i))) { - avahi_dbus_async_address_resolver_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + if (!avahi_is_valid_domain_name(name)) + return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_DOMAIN_NAME, NULL); - i->path = avahi_strdup_printf("/Client%u/AddressResolver%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); - - } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "RecordBrowserNew")) { - Client *client; - RecordBrowserInfo *i; - static const DBusObjectPathVTable vtable = { - NULL, - avahi_dbus_msg_record_browser_impl, - NULL, - NULL, - NULL, - NULL - }; - int32_t interface, protocol; - uint32_t flags; - char *name; - uint16_t type, clazz; - AvahiKey *key; - - if (!dbus_message_get_args( - m, &error, - DBUS_TYPE_INT32, &interface, - DBUS_TYPE_INT32, &protocol, - DBUS_TYPE_STRING, &name, - DBUS_TYPE_UINT16, &clazz, - DBUS_TYPE_UINT16, &type, - DBUS_TYPE_UINT32, &flags, - DBUS_TYPE_INVALID) || !name) { - avahi_log_warn("Error parsing Server::RecordBrowserNew message"); - goto fail; - } + if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { + avahi_log_warn("Too many clients, client request failed."); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); + } - if (!avahi_is_valid_domain_name(name)) - return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_DOMAIN_NAME, NULL); + if (client->n_objects >= server->n_objects_per_client_max) { + avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); + return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); + } - if (!(client = client_get(dbus_message_get_sender(m), TRUE))) { - avahi_log_warn("Too many clients, client request failed."); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_CLIENTS, NULL); - } + i = avahi_new(RecordBrowserInfo, 1); + i->id = ++client->current_id; + i->client = client; + i->path = NULL; + i->delay_timeout = NULL; + AVAHI_LLIST_PREPEND(RecordBrowserInfo, record_browsers, client->record_browsers, i); + client->n_objects++; - if (client->n_objects >= server->n_objects_per_client_max) { - avahi_log_warn("Too many objects for client '%s', client request failed.", client->name); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL); - } + key = avahi_key_new(name, clazz, type); + assert(key); - i = avahi_new(RecordBrowserInfo, 1); - i->id = ++client->current_id; - i->client = client; - i->path = NULL; - AVAHI_LLIST_PREPEND(RecordBrowserInfo, record_browsers, client->record_browsers, i); - client->n_objects++; + if (!(i->record_browser = avahi_s_record_browser_prepare(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, key, (AvahiLookupFlags) flags, avahi_dbus_record_browser_callback, i))) { + avahi_key_unref(key); + avahi_dbus_record_browser_free(i); + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + } - key = avahi_key_new(name, clazz, type); - assert(key); + avahi_key_unref(key); - if (!(i->record_browser = avahi_s_record_browser_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, key, (AvahiLookupFlags) flags, avahi_dbus_record_browser_callback, i))) { - avahi_key_unref(key); - avahi_dbus_record_browser_free(i); - return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); - } + i->path = avahi_strdup_printf("/Client%u/RecordBrowser%u", client->id, i->id); + dbus_connection_register_object_path(c, i->path, &vtable, i); + *rbi = i; + return avahi_dbus_respond_path(c, m, i->path); +} - avahi_key_unref(key); +static DBusHandlerResult dbus_select_common_methods(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata, const char *iface, DBusError *error) { + if (dbus_message_is_method_call(m, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) + return avahi_dbus_handle_introspect(c, m, "org.freedesktop.Avahi.Server.xml"); + + else if (dbus_message_is_method_call(m, iface, "GetHostName")) { + return dbus_get_host_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "SetHostName")) { + return dbus_set_host_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetDomainName")) { + return dbus_get_domain_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetHostNameFqdn")) { + return dbus_get_host_name_fqdn(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "IsNSSSupportAvailable")) { + return dbus_is_ns_support_available(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetVersionString")) { + return dbus_get_version_string(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetAPIVersion")) { + return dbus_get_api_version(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetState")) { + return dbus_get_state(c, m, error); - i->path = avahi_strdup_printf("/Client%u/RecordBrowser%u", client->id, i->id); - dbus_connection_register_object_path(c, i->path, &vtable, i); - return avahi_dbus_respond_path(c, m, i->path); + } else if (dbus_message_is_method_call(m, iface, "GetLocalServiceCookie")) { + return dbus_get_local_service_cookie(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetNetworkInterfaceNameByIndex")) { + return dbus_get_net_if_by_index(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetNetworkInterfaceIndexByName")) { + return dbus_get_net_if_by_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetAlternativeHostName")) { + return dbus_get_alternative_host_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "GetAlternativeServiceName")) { + return dbus_get_alternative_service_name(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "EntryGroupNew")) { + return dbus_create_new_entry_group(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "ResolveHostName")) { + return dbus_create_sync_host_name_resolver_object(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "ResolveAddress")) { + return dbus_create_sync_address_resolver_object(c, m, error); + + } else if (dbus_message_is_method_call(m, iface, "ResolveService")) { + return dbus_create_sync_service_resolver_object(c, m, error); } - avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} -fail: +CREATE_DBUS_DELAY_FUNC(DomainBrowserInfo, domain_browser, avahi_s_domain_browser_start) +CREATE_DBUS_DELAY_FUNC(ServiceTypeBrowserInfo, service_type_browser, avahi_s_service_type_browser_start) +CREATE_DBUS_DELAY_FUNC(ServiceBrowserInfo, service_browser, avahi_s_service_browser_start) +CREATE_DBUS_DELAY_FUNC(AsyncServiceResolverInfo, service_resolver, avahi_s_service_resolver_start) +CREATE_DBUS_DELAY_FUNC(AsyncHostNameResolverInfo, host_name_resolver, avahi_s_host_name_resolver_start) +CREATE_DBUS_DELAY_FUNC(AsyncAddressResolverInfo, address_resolver, avahi_s_address_resolver_start) +CREATE_DBUS_DELAY_FUNC(RecordBrowserInfo, record_browser, avahi_s_record_browser_start_query) + +static DBusHandlerResult dbus_select_browser(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata, const char *iface, DBusError *error) { + DBusHandlerResult r; + const AvahiPoll *poll_api = NULL; + struct timeval tv; + + poll_api = avahi_simple_poll_get(simple_poll_api); + avahi_elapse_time(&tv, DEFAULT_START_DELAY_MS, 0); + + if (dbus_message_is_method_call(m, iface, "DomainBrowserNew")) { + DomainBrowserInfo *db = NULL; + r = dbus_prepare_domain_browser_object(&db, c, m, error); + if (db) + db->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(DomainBrowserInfo, domain_browser), db); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceTypeBrowserNew")) { + ServiceTypeBrowserInfo *stbi = NULL; + r = dbus_prepare_service_type_browser_object(&stbi, c, m, error); + if (stbi) + stbi->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(ServiceTypeBrowserInfo, service_type_browser), stbi); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceBrowserNew")) { + ServiceBrowserInfo *sbi = NULL; + r = dbus_prepare_service_browser_object(&sbi, c, m, error); + if (sbi) + sbi->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(ServiceBrowserInfo, service_browser), sbi); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceResolverNew")) { + AsyncServiceResolverInfo *sri = NULL; + r = dbus_prepare_async_service_resolver_object(&sri, c, m, error); + if (sri) + sri->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(AsyncServiceResolverInfo, service_resolver), sri); + return r; + + } else if (dbus_message_is_method_call(m, iface, "HostNameResolverNew")) { + AsyncHostNameResolverInfo *hri = NULL; + r = dbus_prepare_async_host_name_resolver_object(&hri, c, m, error); + if (hri) + hri->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(AsyncHostNameResolverInfo, host_name_resolver), hri); + return r; + + } else if (dbus_message_is_method_call(m, iface, "AddressResolverNew")) { + AsyncAddressResolverInfo *ari = NULL; + r = dbus_prepare_async_address_resolver_object(&ari, c, m, error); + if (ari) + ari->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(AsyncAddressResolverInfo, address_resolver), ari); + return r; + + } else if (dbus_message_is_method_call(m, iface, "RecordBrowserNew")) { + RecordBrowserInfo *rbi = NULL; + r = dbus_prepare_record_browser_object(&rbi, c, m, error); + if (rbi) + rbi->delay_timeout = poll_api->timeout_new(poll_api, &tv, GET_DBUS_DELAY_FUNC(RecordBrowserInfo, record_browser), rbi); + return r; + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +static DBusHandlerResult dbus_select_prepare_browser(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata, const char *iface, DBusError *error) { + DBusHandlerResult r; + + if (dbus_message_is_method_call(m, iface, "DomainBrowserPrepare")) { + DomainBrowserInfo *db = NULL; + r = dbus_prepare_domain_browser_object(&db, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceTypeBrowserPrepare")) { + ServiceTypeBrowserInfo *stbi = NULL; + r = dbus_prepare_service_type_browser_object(&stbi, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceBrowserPrepare")) { + ServiceBrowserInfo *sbi = NULL; + r = dbus_prepare_service_browser_object(&sbi, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "ServiceResolverPrepare")) { + AsyncServiceResolverInfo *sri = NULL; + r = dbus_prepare_async_service_resolver_object(&sri, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "HostNameResolverPrepare")) { + AsyncHostNameResolverInfo *hri = NULL; + r = dbus_prepare_async_host_name_resolver_object(&hri, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "AddressResolverPrepare")) { + AsyncAddressResolverInfo *ari = NULL; + r = dbus_prepare_async_address_resolver_object(&ari, c, m, error); + return r; + + } else if (dbus_message_is_method_call(m, iface, "RecordBrowserPrepare")) { + RecordBrowserInfo *rbi = NULL; + r = dbus_prepare_record_browser_object(&rbi, c, m, error); + return r; + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAHI_GCC_UNUSED void *userdata) { + DBusHandlerResult r; + DBusError error; + + dbus_error_init(&error); + + avahi_log_debug(__FILE__": interface=%s, path=%s, member=%s", + dbus_message_get_interface(m), + dbus_message_get_path(m), + dbus_message_get_member(m)); + + r = dbus_select_common_methods(c,m,userdata, AVAHI_DBUS_INTERFACE_SERVER, &error); + if( r != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) + return r; + + r = dbus_select_browser(c,m,userdata, AVAHI_DBUS_INTERFACE_SERVER, &error); + if( r != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) + return r; + + r = dbus_select_common_methods(c,m,userdata, AVAHI_DBUS_INTERFACE_SERVER2, &error); + if( r != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) + return r; + + r = dbus_select_browser(c,m,userdata, AVAHI_DBUS_INTERFACE_SERVER2, &error); + if( r != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) + return r; + + r = dbus_select_prepare_browser(c,m,userdata, AVAHI_DBUS_INTERFACE_SERVER2, &error); + if( r != DBUS_HANDLER_RESULT_NOT_YET_HANDLED) + return r; + + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); if (dbus_error_is_set(&error)) dbus_error_free(&error); diff --git a/avahi-daemon/dbus-record-browser.c b/avahi-daemon/dbus-record-browser.c index c0337cf..b363ae7 100644 --- a/avahi-daemon/dbus-record-browser.c +++ b/avahi-daemon/dbus-record-browser.c @@ -30,10 +30,17 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_record_browser_free(RecordBrowserInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->record_browser) avahi_s_record_browser_free(i->record_browser); @@ -49,6 +56,13 @@ void avahi_dbus_record_browser_free(RecordBrowserInfo *i) { avahi_free(i); } +void avahi_dbus_record_browser_start(RecordBrowserInfo *i) { + assert(i); + + if(i->record_browser) + avahi_s_record_browser_start_query(i->record_browser); +} + DBusHandlerResult avahi_dbus_msg_record_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) { DBusError error; RecordBrowserInfo *i = userdata; @@ -84,6 +98,19 @@ DBusHandlerResult avahi_dbus_msg_record_browser_impl(DBusConnection *c, DBusMess } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_RECORD_BROWSER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing RecordBrowser::Start message"); + goto fail; + } + + avahi_dbus_record_browser_start(i); + return avahi_dbus_respond_ok(c, m); + + } + + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-service-browser.c b/avahi-daemon/dbus-service-browser.c index 962dca0..aadf91d 100644 --- a/avahi-daemon/dbus-service-browser.c +++ b/avahi-daemon/dbus-service-browser.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_service_browser_free(ServiceBrowserInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->service_browser) avahi_s_service_browser_free(i->service_browser); @@ -50,6 +58,13 @@ void avahi_dbus_service_browser_free(ServiceBrowserInfo *i) { avahi_free(i); } +void avahi_dbus_service_browser_start(ServiceBrowserInfo *i) { + assert(i); + + if(i->service_browser) + avahi_s_service_browser_start(i->service_browser); +} + DBusHandlerResult avahi_dbus_msg_service_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) { DBusError error; ServiceBrowserInfo *i = userdata; @@ -85,6 +100,18 @@ DBusHandlerResult avahi_dbus_msg_service_browser_impl(DBusConnection *c, DBusMes } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing ServiceBrowser::Start message"); + goto fail; + } + + avahi_dbus_service_browser_start(i); + return avahi_dbus_respond_ok(c, m); + + } + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-service-type-browser.c b/avahi-daemon/dbus-service-type-browser.c index 20afdbe..f3e7e3f 100644 --- a/avahi-daemon/dbus-service-type-browser.c +++ b/avahi-daemon/dbus-service-type-browser.c @@ -30,10 +30,18 @@ #include "dbus-util.h" #include "dbus-internal.h" +#include "main.h" void avahi_dbus_service_type_browser_free(ServiceTypeBrowserInfo *i) { + const AvahiPoll *poll_api = NULL; + assert(i); + poll_api = avahi_simple_poll_get(simple_poll_api); + + if (i->delay_timeout) + poll_api->timeout_free(i->delay_timeout); + if (i->service_type_browser) avahi_s_service_type_browser_free(i->service_type_browser); @@ -50,6 +58,13 @@ void avahi_dbus_service_type_browser_free(ServiceTypeBrowserInfo *i) { avahi_free(i); } +void avahi_dbus_service_type_browser_start(ServiceTypeBrowserInfo *i) { + assert(i); + + if(i->service_type_browser) + avahi_s_service_type_browser_start(i->service_type_browser); +} + DBusHandlerResult avahi_dbus_msg_service_type_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) { DBusError error; ServiceTypeBrowserInfo *i = userdata; @@ -85,6 +100,18 @@ DBusHandlerResult avahi_dbus_msg_service_type_browser_impl(DBusConnection *c, DB } + if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Start")) { + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing ServiceTypeBrowser::Start message"); + goto fail; + } + + avahi_dbus_service_type_browser_start(i); + return avahi_dbus_respond_ok(c, m); + + } + avahi_log_warn("Missed message %s::%s()", dbus_message_get_interface(m), dbus_message_get_member(m)); fail: diff --git a/avahi-daemon/dbus-util.c b/avahi-daemon/dbus-util.c index 2983b29..5baac2c 100644 --- a/avahi-daemon/dbus-util.c +++ b/avahi-daemon/dbus-util.c @@ -137,6 +137,9 @@ DBusHandlerResult avahi_dbus_respond_boolean(DBusConnection *c, DBusMessage *m, DBusHandlerResult avahi_dbus_respond_ok(DBusConnection *c, DBusMessage *m) { DBusMessage *reply; + if (dbus_message_get_no_reply(m)) + return DBUS_HANDLER_RESULT_HANDLED; + reply = dbus_message_new_method_return(m); if (!reply) { diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 10cb41e..346338f 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -826,6 +826,18 @@ static int load_config_file(DaemonConfig *c) { c->server_config.enable_reflector = is_yes(p->value); else if (strcasecmp(p->key, "reflect-ipv") == 0) c->server_config.reflect_ipv = is_yes(p->value); + else if (strcasecmp(p->key, "reflect-filters") == 0) { + char **e, **t; + + avahi_string_list_free(c->server_config.reflect_filters); + c->server_config.reflect_filters = NULL; + e = avahi_split_csv(p->value); + + for (t = e; *t; t++) + c->server_config.reflect_filters = avahi_string_list_add(c->server_config.reflect_filters, *t); + + avahi_strfreev(e); + } else { avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name); goto finish; diff --git a/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml b/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml index bae9c2f..9c2112d 100644 --- a/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml +++ b/avahi-daemon/org.freedesktop.Avahi.AddressResolver.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml b/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml index 22c614e..8a973e8 100644 --- a/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml +++ b/avahi-daemon/org.freedesktop.Avahi.DomainBrowser.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml b/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml index 0b43752..2a96390 100644 --- a/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml +++ b/avahi-daemon/org.freedesktop.Avahi.HostNameResolver.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml b/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml index 9ba86f4..dbabe0d 100644 --- a/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml +++ b/avahi-daemon/org.freedesktop.Avahi.RecordBrowser.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.Server.xml b/avahi-daemon/org.freedesktop.Avahi.Server.xml index c291274..d119aeb 100644 --- a/avahi-daemon/org.freedesktop.Avahi.Server.xml +++ b/avahi-daemon/org.freedesktop.Avahi.Server.xml @@ -214,6 +214,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml b/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml index d80298d..193d103 100644 --- a/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml +++ b/avahi-daemon/org.freedesktop.Avahi.ServiceBrowser.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml b/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml index 623f209..898287c 100644 --- a/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml +++ b/avahi-daemon/org.freedesktop.Avahi.ServiceResolver.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml b/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml index 4efec82..94db209 100644 --- a/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml +++ b/avahi-daemon/org.freedesktop.Avahi.ServiceTypeBrowser.xml @@ -33,6 +33,8 @@ + + diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c index fc94ede..9330fd3 100644 --- a/avahi-daemon/static-services.c +++ b/avahi-daemon/static-services.c @@ -627,8 +627,13 @@ static void XMLCALL xml_end(void *data, AVAHI_GCC_UNUSED const char *el) { switch (u->txt_type) { case TXT_RECORD_VALUE_TEXT: - value_buf_len = strlen(u->buf); - value_buf = (uint8_t*)u->buf; + if (u->buf != NULL) { + value_buf_len = strlen(u->buf); + value_buf = (uint8_t*)u->buf; + } else { + value_buf_len = 0; + value_buf = (uint8_t*)""; + } break; case TXT_RECORD_VALUE_BINARY_HEX: diff --git a/avahi-discover-standalone/Makefile.in b/avahi-discover-standalone/Makefile.in index 79ff789..a2c8988 100644 --- a/avahi-discover-standalone/Makefile.in +++ b/avahi-discover-standalone/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -124,14 +124,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -255,7 +260,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -268,8 +272,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -280,7 +282,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -321,11 +322,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -339,16 +341,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -367,16 +360,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -384,15 +385,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -411,10 +412,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -429,6 +427,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -439,6 +439,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -482,8 +484,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-dnsconfd/Makefile.in b/avahi-dnsconfd/Makefile.in index 265b226..42e5112 100644 --- a/avahi-dnsconfd/Makefile.in +++ b/avahi-dnsconfd/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,14 +114,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -240,7 +245,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -253,8 +257,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -265,7 +267,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -306,11 +307,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -324,16 +326,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -352,16 +345,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -369,15 +370,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -396,10 +397,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -414,6 +412,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -424,6 +424,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -467,8 +469,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-glib/Makefile.in b/avahi-glib/Makefile.in index e2339d5..a45b473 100644 --- a/avahi-glib/Makefile.in +++ b/avahi-glib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,14 +114,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -261,7 +266,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -274,8 +278,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -286,7 +288,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -327,11 +328,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -345,16 +347,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -373,16 +366,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -390,15 +391,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -417,10 +418,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -435,6 +433,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -445,6 +445,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -488,8 +490,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-gobject/Makefile.in b/avahi-gobject/Makefile.in index f238dba..21be220 100644 --- a/avahi-gobject/Makefile.in +++ b/avahi-gobject/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,14 +114,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -269,7 +274,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -282,8 +286,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -294,7 +296,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -335,11 +336,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -353,16 +355,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -381,16 +374,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -398,15 +399,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -425,10 +426,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -443,6 +441,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -453,6 +453,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -496,8 +498,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-libevent.pc.in b/avahi-libevent.pc.in new file mode 100644 index 0000000..a1dca01 --- /dev/null +++ b/avahi-libevent.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=@libdir@ +includedir=${prefix}/include + +Name: avahi-libevent +Description: Avahi Multicast DNS Responder (libevent Support) +Version: @PACKAGE_VERSION@ +Requires: libevent-2.1.5 +Libs: -L${libdir} -lavahi-libevent +Cflags: -D_REENTRANT -I${includedir} diff --git a/avahi-libevent/Makefile.am b/avahi-libevent/Makefile.am new file mode 100644 index 0000000..239f323 --- /dev/null +++ b/avahi-libevent/Makefile.am @@ -0,0 +1,51 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +AM_CFLAGS=-I$(top_srcdir) + +# This cool debug trap works on i386/gcc only +AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' + +if HAVE_LIBEVENT + +avahilibeventincludedir=$(includedir)/avahi-libevent + +avahilibeventinclude_HEADERS = \ + libevent-watch.h + +lib_LTLIBRARIES = \ + libavahi-libevent.la + +if ENABLE_TESTS +noinst_PROGRAMS = \ + libevent-watch-test +endif + +libavahi_libevent_la_SOURCES = \ + libevent-watch.c libevent-watch.h + +libavahi_libevent_la_CFLAGS = $(AM_CFLAGS) $(LIBEVENT_CFLAGS) +libavahi_libevent_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBEVENT_LIBS) +libavahi_libevent_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_LIBEVENT_VERSION_INFO) + +libevent_watch_test_SOURCES = \ + libevent-watch.c libevent-watch.h \ + libevent-watch-test.c +libevent_watch_test_CFLAGS = $(AM_CFLAGS) $(LIBEVENT_CFLAGS) +libevent_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBEVENT_LIBS) + +endif diff --git a/avahi-libevent/Makefile.in b/avahi-libevent/Makefile.in new file mode 100644 index 0000000..c99211b --- /dev/null +++ b/avahi-libevent/Makefile.in @@ -0,0 +1,930 @@ +# Makefile.in generated by automake 1.15.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2017 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@ENABLE_TESTS_TRUE@@HAVE_LIBEVENT_TRUE@noinst_PROGRAMS = libevent-watch-test$(EXEEXT) +subdir = avahi-libevent +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +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/gettext.m4 $(top_srcdir)/common/iconv.m4 \ + $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.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) +DIST_COMMON = $(srcdir)/Makefile.am \ + $(am__avahilibeventinclude_HEADERS_DIST) $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(avahilibeventincludedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +@HAVE_LIBEVENT_TRUE@libavahi_libevent_la_DEPENDENCIES = \ +@HAVE_LIBEVENT_TRUE@ ../avahi-common/libavahi-common.la \ +@HAVE_LIBEVENT_TRUE@ $(am__DEPENDENCIES_1) +am__libavahi_libevent_la_SOURCES_DIST = libevent-watch.c \ + libevent-watch.h +@HAVE_LIBEVENT_TRUE@am_libavahi_libevent_la_OBJECTS = \ +@HAVE_LIBEVENT_TRUE@ libavahi_libevent_la-libevent-watch.lo +libavahi_libevent_la_OBJECTS = $(am_libavahi_libevent_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libavahi_libevent_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libavahi_libevent_la_CFLAGS) $(CFLAGS) \ + $(libavahi_libevent_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_LIBEVENT_TRUE@am_libavahi_libevent_la_rpath = -rpath $(libdir) +PROGRAMS = $(noinst_PROGRAMS) +am__libevent_watch_test_SOURCES_DIST = libevent-watch.c \ + libevent-watch.h libevent-watch-test.c +@HAVE_LIBEVENT_TRUE@am_libevent_watch_test_OBJECTS = libevent_watch_test-libevent-watch.$(OBJEXT) \ +@HAVE_LIBEVENT_TRUE@ libevent_watch_test-libevent-watch-test.$(OBJEXT) +libevent_watch_test_OBJECTS = $(am_libevent_watch_test_OBJECTS) +@HAVE_LIBEVENT_TRUE@libevent_watch_test_DEPENDENCIES = \ +@HAVE_LIBEVENT_TRUE@ ../avahi-common/libavahi-common.la \ +@HAVE_LIBEVENT_TRUE@ $(am__DEPENDENCIES_1) +libevent_watch_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libevent_watch_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libavahi_libevent_la_SOURCES) \ + $(libevent_watch_test_SOURCES) +DIST_SOURCES = $(am__libavahi_libevent_la_SOURCES_DIST) \ + $(am__libevent_watch_test_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__avahilibeventinclude_HEADERS_DIST = libevent-watch.h +HEADERS = $(avahilibeventinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_AUTOIPD_GROUP = @AVAHI_AUTOIPD_GROUP@ +AVAHI_AUTOIPD_USER = @AVAHI_AUTOIPD_USER@ +AVAHI_GROUP = @AVAHI_GROUP@ +AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ +AVAHI_USER = @AVAHI_USER@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@ +DBUS_SYS_DIR = @DBUS_SYS_DIR@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB20_CFLAGS = @GLIB20_CFLAGS@ +GLIB20_LIBS = @GLIB20_LIBS@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GREP = @GREP@ +GTK20_CFLAGS = @GTK20_CFLAGS@ +GTK20_LIBS = @GTK20_LIBS@ +GTK30_CFLAGS = @GTK30_CFLAGS@ +GTK30_LIBS = @GTK30_LIBS@ +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@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@ +LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@ +LIBAVAHI_COMPAT_HOWL_VERSION_INFO = @LIBAVAHI_COMPAT_HOWL_VERSION_INFO@ +LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO@ +LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ +LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ +LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ +LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ +LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ +LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ +LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ +LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MCS = @MCS@ +MDASSEMBLER = @MDASSEMBLER@ +MKDIR_P = @MKDIR_P@ +MOC_QT3 = @MOC_QT3@ +MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ +MONODOCER = @MONODOCER@ +MONODOC_CFLAGS = @MONODOC_CFLAGS@ +MONODOC_DIR = @MONODOC_DIR@ +MONODOC_LIBS = @MONODOC_LIBS@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ +PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +QT3_CFLAGS = @QT3_CFLAGS@ +QT3_LIBS = @QT3_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STOW = @STOW@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +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_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +acx_pthread_config = @acx_pthread_config@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +avahi_runtime_dir = @avahi_runtime_dir@ +avahi_socket = @avahi_socket@ +avahilocaledir = @avahilocaledir@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_pkg_config = @have_pkg_config@ +have_xmltoman = @have_xmltoman@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +interfacesdir = @interfacesdir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ +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) '-DDEBUG_TRAP=__asm__("int $$3")' +@HAVE_LIBEVENT_TRUE@avahilibeventincludedir = $(includedir)/avahi-libevent +@HAVE_LIBEVENT_TRUE@avahilibeventinclude_HEADERS = \ +@HAVE_LIBEVENT_TRUE@ libevent-watch.h + +@HAVE_LIBEVENT_TRUE@lib_LTLIBRARIES = \ +@HAVE_LIBEVENT_TRUE@ libavahi-libevent.la + +@HAVE_LIBEVENT_TRUE@libavahi_libevent_la_SOURCES = \ +@HAVE_LIBEVENT_TRUE@ libevent-watch.c libevent-watch.h + +@HAVE_LIBEVENT_TRUE@libavahi_libevent_la_CFLAGS = $(AM_CFLAGS) $(LIBEVENT_CFLAGS) +@HAVE_LIBEVENT_TRUE@libavahi_libevent_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBEVENT_LIBS) +@HAVE_LIBEVENT_TRUE@libavahi_libevent_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_LIBEVENT_VERSION_INFO) +@HAVE_LIBEVENT_TRUE@libevent_watch_test_SOURCES = \ +@HAVE_LIBEVENT_TRUE@ libevent-watch.c libevent-watch.h \ +@HAVE_LIBEVENT_TRUE@ libevent-watch-test.c + +@HAVE_LIBEVENT_TRUE@libevent_watch_test_CFLAGS = $(AM_CFLAGS) $(LIBEVENT_CFLAGS) +@HAVE_LIBEVENT_TRUE@libevent_watch_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(LIBEVENT_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @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; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign avahi-libevent/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign avahi-libevent/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libavahi-libevent.la: $(libavahi_libevent_la_OBJECTS) $(libavahi_libevent_la_DEPENDENCIES) $(EXTRA_libavahi_libevent_la_DEPENDENCIES) + $(AM_V_CCLD)$(libavahi_libevent_la_LINK) $(am_libavahi_libevent_la_rpath) $(libavahi_libevent_la_OBJECTS) $(libavahi_libevent_la_LIBADD) $(LIBS) + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +libevent-watch-test$(EXEEXT): $(libevent_watch_test_OBJECTS) $(libevent_watch_test_DEPENDENCIES) $(EXTRA_libevent_watch_test_DEPENDENCIES) + @rm -f libevent-watch-test$(EXEEXT) + $(AM_V_CCLD)$(libevent_watch_test_LINK) $(libevent_watch_test_OBJECTS) $(libevent_watch_test_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_libevent_la-libevent-watch.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libevent_watch_test-libevent-watch-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libevent_watch_test-libevent-watch.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +libavahi_libevent_la-libevent-watch.lo: libevent-watch.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_libevent_la_CFLAGS) $(CFLAGS) -MT libavahi_libevent_la-libevent-watch.lo -MD -MP -MF $(DEPDIR)/libavahi_libevent_la-libevent-watch.Tpo -c -o libavahi_libevent_la-libevent-watch.lo `test -f 'libevent-watch.c' || echo '$(srcdir)/'`libevent-watch.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_libevent_la-libevent-watch.Tpo $(DEPDIR)/libavahi_libevent_la-libevent-watch.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libevent-watch.c' object='libavahi_libevent_la-libevent-watch.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_libevent_la_CFLAGS) $(CFLAGS) -c -o libavahi_libevent_la-libevent-watch.lo `test -f 'libevent-watch.c' || echo '$(srcdir)/'`libevent-watch.c + +libevent_watch_test-libevent-watch.o: libevent-watch.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -MT libevent_watch_test-libevent-watch.o -MD -MP -MF $(DEPDIR)/libevent_watch_test-libevent-watch.Tpo -c -o libevent_watch_test-libevent-watch.o `test -f 'libevent-watch.c' || echo '$(srcdir)/'`libevent-watch.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libevent_watch_test-libevent-watch.Tpo $(DEPDIR)/libevent_watch_test-libevent-watch.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libevent-watch.c' object='libevent_watch_test-libevent-watch.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -c -o libevent_watch_test-libevent-watch.o `test -f 'libevent-watch.c' || echo '$(srcdir)/'`libevent-watch.c + +libevent_watch_test-libevent-watch.obj: libevent-watch.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -MT libevent_watch_test-libevent-watch.obj -MD -MP -MF $(DEPDIR)/libevent_watch_test-libevent-watch.Tpo -c -o libevent_watch_test-libevent-watch.obj `if test -f 'libevent-watch.c'; then $(CYGPATH_W) 'libevent-watch.c'; else $(CYGPATH_W) '$(srcdir)/libevent-watch.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libevent_watch_test-libevent-watch.Tpo $(DEPDIR)/libevent_watch_test-libevent-watch.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libevent-watch.c' object='libevent_watch_test-libevent-watch.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -c -o libevent_watch_test-libevent-watch.obj `if test -f 'libevent-watch.c'; then $(CYGPATH_W) 'libevent-watch.c'; else $(CYGPATH_W) '$(srcdir)/libevent-watch.c'; fi` + +libevent_watch_test-libevent-watch-test.o: libevent-watch-test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -MT libevent_watch_test-libevent-watch-test.o -MD -MP -MF $(DEPDIR)/libevent_watch_test-libevent-watch-test.Tpo -c -o libevent_watch_test-libevent-watch-test.o `test -f 'libevent-watch-test.c' || echo '$(srcdir)/'`libevent-watch-test.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libevent_watch_test-libevent-watch-test.Tpo $(DEPDIR)/libevent_watch_test-libevent-watch-test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libevent-watch-test.c' object='libevent_watch_test-libevent-watch-test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -c -o libevent_watch_test-libevent-watch-test.o `test -f 'libevent-watch-test.c' || echo '$(srcdir)/'`libevent-watch-test.c + +libevent_watch_test-libevent-watch-test.obj: libevent-watch-test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -MT libevent_watch_test-libevent-watch-test.obj -MD -MP -MF $(DEPDIR)/libevent_watch_test-libevent-watch-test.Tpo -c -o libevent_watch_test-libevent-watch-test.obj `if test -f 'libevent-watch-test.c'; then $(CYGPATH_W) 'libevent-watch-test.c'; else $(CYGPATH_W) '$(srcdir)/libevent-watch-test.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libevent_watch_test-libevent-watch-test.Tpo $(DEPDIR)/libevent_watch_test-libevent-watch-test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libevent-watch-test.c' object='libevent_watch_test-libevent-watch-test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libevent_watch_test_CFLAGS) $(CFLAGS) -c -o libevent_watch_test-libevent-watch-test.obj `if test -f 'libevent-watch-test.c'; then $(CYGPATH_W) 'libevent-watch-test.c'; else $(CYGPATH_W) '$(srcdir)/libevent-watch-test.c'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-avahilibeventincludeHEADERS: $(avahilibeventinclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(avahilibeventinclude_HEADERS)'; test -n "$(avahilibeventincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(avahilibeventincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(avahilibeventincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(avahilibeventincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(avahilibeventincludedir)" || exit $$?; \ + done + +uninstall-avahilibeventincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(avahilibeventinclude_HEADERS)'; test -n "$(avahilibeventincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(avahilibeventincludedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -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 \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahilibeventincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-avahilibeventincludeHEADERS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-avahilibeventincludeHEADERS \ + uninstall-libLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-avahilibeventincludeHEADERS 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-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 tags-am uninstall uninstall-am \ + uninstall-avahilibeventincludeHEADERS uninstall-libLTLIBRARIES + +.PRECIOUS: Makefile + + +# 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: diff --git a/avahi-libevent/libevent-watch-test.c b/avahi-libevent/libevent-watch-test.c new file mode 100644 index 0000000..f17c5a1 --- /dev/null +++ b/avahi-libevent/libevent-watch-test.c @@ -0,0 +1,96 @@ +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "libevent-watch.h" + +static const AvahiPoll *api = NULL; +static struct event_base *base = NULL; + +static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) +{ + if (event & AVAHI_WATCH_IN) { + ssize_t r; + char c; + + if ((r = read(fd, &c, 1)) <= 0) { + fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF"); + api->watch_free(w); + return; + } + + printf("Read: %c\n", c >= 32 && c < 127 ? c : '.'); + } +} + +static void wakeup(AvahiTimeout *t, AVAHI_GCC_UNUSED void *userdata) +{ + struct timeval tv; + static unsigned i = 0; + + printf("Wakeup #%u\n", i++); + + if (i > 10) + event_base_loopbreak(base); + + avahi_elapse_time(&tv, 1000, 0); + api->timeout_update(t, &tv); +} + +int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) +{ + AvahiLibeventPoll *ep; + struct timeval tv; + + base = event_base_new(); + assert(base); + + ep = avahi_libevent_poll_new(base); + assert(ep); + + api = avahi_libevent_poll_get(ep); + + api->watch_new(api, 0, AVAHI_WATCH_IN, callback, NULL); + + avahi_elapse_time(&tv, 1000, 0); + api->timeout_new(api, &tv, wakeup, NULL); + + event_base_dispatch(base); + + avahi_libevent_poll_free(ep); + + event_base_free(base); + + return 0; +} diff --git a/avahi-libevent/libevent-watch.c b/avahi-libevent/libevent-watch.c new file mode 100644 index 0000000..0525d81 --- /dev/null +++ b/avahi-libevent/libevent-watch.c @@ -0,0 +1,318 @@ +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include + +#include +#include +#include +#include + +#include "libevent-watch.h" + +#ifndef HOST_NAME_MAX +# include +# define HOST_NAME_MAX _POSIX_HOST_NAME_MAX +#endif + +struct AvahiWatch { + AvahiLibeventPoll *eventpoll; + + struct event ev; + + AvahiWatchCallback cb; + void *userdata; + + AVAHI_LLIST_FIELDS(AvahiWatch, watches); +}; + +struct AvahiTimeout { + AvahiLibeventPoll *eventpoll; + + struct event ev; + + AvahiTimeoutCallback cb; + void *userdata; + + AVAHI_LLIST_FIELDS(AvahiTimeout, timeouts); +}; + +struct AvahiLibeventPoll { + AvahiPoll api; + + struct event_base *base; + + AVAHI_LLIST_HEAD(AvahiWatch, watches); + AVAHI_LLIST_HEAD(AvahiTimeout, timeouts); +}; + +/* AvahiPoll implementation for libevent */ + +static void +watch_cb(evutil_socket_t fd, short what, void *arg) +{ + AvahiWatch *w = arg; + AvahiWatchEvent events = 0; + + if (what & EV_READ) + events |= AVAHI_WATCH_IN; + if (what & EV_WRITE) + events |= AVAHI_WATCH_OUT; + + w->cb(w, fd, events, w->userdata); +} + +static int +watch_add(AvahiWatch *w, int fd, AvahiWatchEvent events) +{ + AvahiLibeventPoll *ep = w->eventpoll; + short ev_events = 0; + + if (events & AVAHI_WATCH_IN) + ev_events |= EV_READ; + if (events & AVAHI_WATCH_OUT) + ev_events |= EV_WRITE; + + event_assign(&w->ev, ep->base, fd, ev_events | EV_PERSIST, watch_cb, w); + + return event_add(&w->ev, NULL); +} + +static AvahiWatch * +watch_new(const AvahiPoll *api, int fd, AvahiWatchEvent events, AvahiWatchCallback cb, void *userdata) +{ + AvahiLibeventPoll *ep; + AvahiWatch *w; + int ret; + + assert(api); + assert(fd >= 0); + assert(cb); + + ep = api->userdata; + assert(ep); + + w = avahi_new(AvahiWatch, 1); + if (!w) + return NULL; + + w->eventpoll = ep; + w->cb = cb; + w->userdata = userdata; + + ret = watch_add(w, fd, events); + if (ret != 0) { + free(w); + return NULL; + } + + AVAHI_LLIST_PREPEND(AvahiWatch, watches, ep->watches, w); + + return w; +} + +static void +watch_update(AvahiWatch *w, AvahiWatchEvent events) +{ + event_del(&w->ev); + + watch_add(w, (int)event_get_fd(&w->ev), events); +} + +static AvahiWatchEvent +watch_get_events(AvahiWatch *w) +{ + AvahiWatchEvent events = 0; + + if (event_pending(&w->ev, EV_READ, NULL)) + events |= AVAHI_WATCH_IN; + if (event_pending(&w->ev, EV_WRITE, NULL)) + events |= AVAHI_WATCH_OUT; + + return events; +} + +static void +watch_free(AvahiWatch *w) +{ + AvahiLibeventPoll *ep = w->eventpoll; + + event_del(&w->ev); + + AVAHI_LLIST_REMOVE(AvahiWatch, watches, ep->watches, w); + + free(w); +} + +static void +timeout_cb(AVAHI_GCC_UNUSED evutil_socket_t fd, AVAHI_GCC_UNUSED short events, void *arg) +{ + AvahiTimeout *t = arg; + + t->cb(t, t->userdata); +} + +static int +timeout_add(AvahiTimeout *t, const struct timeval *tv) +{ + AvahiLibeventPoll *ep = t->eventpoll; + struct timeval now, e_tv; + + event_assign(&t->ev, ep->base, -1, EV_TIMEOUT, timeout_cb, t); + + if (!tv || ((tv->tv_sec == 0) && (tv->tv_usec == 0))) + evutil_timerclear(&e_tv); + else { + (void)gettimeofday(&now, NULL); + evutil_timersub(tv, &now, &e_tv); + } + + return evtimer_add(&t->ev, &e_tv); +} + +static AvahiTimeout * +timeout_new(const AvahiPoll *api, const struct timeval *tv, AvahiTimeoutCallback cb, void *userdata) +{ + AvahiLibeventPoll *ep; + AvahiTimeout *t; + int ret; + + assert(api); + assert(cb); + + ep = api->userdata; + + assert(ep); + + t = avahi_new(AvahiTimeout, 1); + if (!t) + return NULL; + + t->eventpoll = ep; + t->cb = cb; + t->userdata = userdata; + + ret = timeout_add(t, tv); + if (ret != 0) { + free(t); + return NULL; + } + + AVAHI_LLIST_PREPEND(AvahiTimeout, timeouts, ep->timeouts, t); + + return t; +} + +static void +timeout_update(AvahiTimeout *t, const struct timeval *tv) +{ + struct timeval now, e_tv; + + event_del(&t->ev); + + if (!tv) + return; + + (void)gettimeofday(&now, NULL); + evutil_timersub(tv, &now, &e_tv); + + event_add(&t->ev, &e_tv); +} + +static void +timeout_free(AvahiTimeout *t) +{ + AvahiLibeventPoll *ep = t->eventpoll; + + event_del(&t->ev); + + AVAHI_LLIST_REMOVE(AvahiTimeout, timeouts, ep->timeouts, t); + + free(t); +} + +AvahiLibeventPoll * +avahi_libevent_poll_new(struct event_base *base) +{ + AvahiLibeventPoll *ep = avahi_new(AvahiLibeventPoll, 1); + + ep->base = base; + + ep->api.userdata = ep; + + ep->api.watch_new = watch_new; + ep->api.watch_free = watch_free; + ep->api.watch_update = watch_update; + ep->api.watch_get_events = watch_get_events; + + ep->api.timeout_new = timeout_new; + ep->api.timeout_free = timeout_free; + ep->api.timeout_update = timeout_update; + + AVAHI_LLIST_HEAD_INIT(AvahiWatch, ep->watches); + AVAHI_LLIST_HEAD_INIT(AvahiTimeout, ep->timeouts); + + return ep; +} + +void +avahi_libevent_poll_free(AvahiLibeventPoll *ep) +{ + assert(ep); + + for (AvahiWatch *w_next, *w = ep->watches; w; w = w_next) { + w_next = w->watches_next; + + watch_free(w); + } + + for (AvahiTimeout *t_next, *t = ep->timeouts; t; t = t_next) { + t_next = t->timeouts_next; + + timeout_free(t); + } + + free(ep); +} + +void +avahi_libevent_poll_quit(AvahiLibeventPoll *ep) +{ + assert(ep); + + /* we don't actually have anything to do, since events are + * associated with watches and timeouts, not with this + * polling object itself. + */ +} + +const AvahiPoll * +avahi_libevent_poll_get(AvahiLibeventPoll *ep) +{ + assert(ep); + + return &ep->api; +} + diff --git a/avahi-libevent/libevent-watch.h b/avahi-libevent/libevent-watch.h new file mode 100644 index 0000000..56180a0 --- /dev/null +++ b/avahi-libevent/libevent-watch.h @@ -0,0 +1,52 @@ +#ifndef LIBEVENT_WATCH_H +#define LIBEVENT_WATCH_H + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +/** \file libevent-watch.h libevent main loop adapter */ + +#include + +#include +#include + +AVAHI_C_DECL_BEGIN + +/** libevent main loop adapter */ +typedef struct AvahiLibeventPoll AvahiLibeventPoll; + +/** Create a new libevent main loop adapter attached to the specified + event_base. */ +AvahiLibeventPoll *avahi_libevent_poll_new(struct event_base *base); + +/** Free libevent main loop adapter */ +void avahi_libevent_poll_free(AvahiLibeventPoll *ep); + +/** Quit libevent main loop adapter's thread if it has one */ +void avahi_libevent_poll_quit(AvahiLibeventPoll *ep); + +/** Return the abstract poll API structure for this object. This will + * return the same pointer to an internally allocated structure on each + * call */ +const AvahiPoll *avahi_libevent_poll_get(AvahiLibeventPoll *ep); + +AVAHI_C_DECL_END + +#endif diff --git a/avahi-python/Makefile.in b/avahi-python/Makefile.in index b3b3238..68ef6f7 100644 --- a/avahi-python/Makefile.in +++ b/avahi-python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -239,7 +244,6 @@ am__relativize = \ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -252,8 +256,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -264,7 +266,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -305,11 +306,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -323,16 +325,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -351,16 +344,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -368,15 +369,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -395,10 +396,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -413,6 +411,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -423,6 +423,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -466,8 +468,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-python/avahi-bookmarks.in b/avahi-python/avahi-bookmarks.in index dea7bef..7a562e3 100755 --- a/avahi-python/avahi-bookmarks.in +++ b/avahi-python/avahi-bookmarks.in @@ -20,9 +20,10 @@ import sys, getopt, os try: - import avahi, gobject, dbus + from gi.repository import GObject + import avahi, dbus except ImportError: - print "Sorry, to use this tool you need to install Avahi and python-dbus." + print("Sorry, to use this tool you need to install Avahi and python-dbus.") sys.exit(1) try: @@ -95,7 +96,7 @@ class AvahiBookmarks: else: t += '
    ' - for k, v in self.services.iteritems(): + for k, v in self.services.items(): if v[3] == 80: port = '' @@ -109,7 +110,7 @@ class AvahiBookmarks: t += '

    Served by %s

    ' % self.version_string - return str(t) + return str(t).encode('utf-8') def new_service(self, interface, protocol, name, type, domain, flags): @@ -138,16 +139,16 @@ class AvahiBookmarks: def usage(retval = 0): - print "%s [options]\n" % sys.argv[0] - print " -h --help Show this help" - print " -c --cgi Run as a CGI instead of as a server (default to server" - print " unless environment variable GATEWAY_INTERFACE is set)" - print " -t --timeout MS Specify the max time for CGI browsing (default %u)" % timeout - print " -p --port PORT Specify the port to use (default %u)" % port - print " -a --address ADDRESS Specify the address to bind to (default %s)" % address - print " -H --host-names Show links with real hostnames" - print " -A --addresses Show links with numeric IP addresses" - print " -d --domain DOMAIN Specify the domain to browse" + print("%s [options]\n" % sys.argv[0]) + print(" -h --help Show this help") + print(" -c --cgi Run as a CGI instead of as a server (default to server") + print(" unless environment variable GATEWAY_INTERFACE is set)") + print(" -t --timeout MS Specify the max time for CGI browsing (default %u)" % timeout) + print(" -p --port PORT Specify the port to use (default %u)" % port) + print(" -a --address ADDRESS Specify the address to bind to (default %s)" % address) + print(" -H --host-names Show links with real hostnames") + print(" -A --addresses Show links with numeric IP addresses") + print(" -d --domain DOMAIN Specify the domain to browse" ) sys.exit(retval) try: @@ -181,30 +182,31 @@ for o, a in opts: domain = a if use_CGI is None: - use_CGI = os.environ.has_key("GATEWAY_INTERFACE") + use_CGI = "GATEWAY_INTERFACE" in os.environ if use_CGI: cgi = AvahiBookmarks(use_host_names) - mainloop = gobject.MainLoop() - gobject.timeout_add(timeout, mainloop.quit) + mainloop = GObject.MainLoop() + GObject.timeout_add(timeout, mainloop.quit) try: mainloop.run() except KeyboardInterrupt: pass - print 'Content-type: text/html\n\n' + cgi.render_html() + print('Content-type: text/html\n\n' + cgi.render_html()) else: try: - from twisted.internet import glib2reactor - glib2reactor.install() + from twisted.internet import gireactor + gireactor.install() from twisted.internet import reactor from twisted.web import server, resource except ImportError: - print "Sorry, to use this tool as a server you need to install twisted and twisted.web.\n" - sys.exit(1) + raise + print("Sorry, to use this tool as a server you need to install twisted and twisted.web.\n") + sys.exit(1) class AvahiBookmarksServer(AvahiBookmarks, resource.Resource): isLeaf = True @@ -219,7 +221,7 @@ else: site = server.Site(AvahiBookmarksServer(use_host_names)) reactor.listenTCP(port, site, interface=address) - print "Now point your web browser to http://%s:%u/!" % (address, port) + print("Now point your web browser to http://%s:%u/!" % (address, port)) try: reactor.run() diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am index 5fc4b25..f300f62 100644 --- a/avahi-python/avahi-discover/Makefile.am +++ b/avahi-python/avahi-discover/Makefile.am @@ -18,7 +18,6 @@ AM_CFLAGS=-I$(top_srcdir) EXTRA_DIST = \ - __init__.py \ avahi-discover.py \ avahi-discover.desktop.in.in @@ -31,28 +30,24 @@ pythonscripts = desktopdir = $(datadir)/applications desktop_DATA = -avahi_discoverdir = $(pythondir)/avahi_discover -avahi_discover_PYTHON = - if HAVE_GDBM pythonscripts += \ avahi-discover desktop_DATA += avahi-discover.desktop -@INTLTOOL_DESKTOP_RULE@ -avahi_discover_PYTHON += __init__.py endif if HAVE_DBM pythonscripts += \ avahi-discover desktop_DATA += avahi-discover.desktop -@INTLTOOL_DESKTOP_RULE@ -avahi_discover_PYTHON += __init__.py endif avahi-discover.desktop.in: avahi-discover.desktop.in.in $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ +avahi-discover.desktop: avahi-discover.desktop.in + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + avahi-discover: avahi-discover.py $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \ diff --git a/avahi-python/avahi-discover/Makefile.in b/avahi-python/avahi-discover/Makefile.in index a56d4d0..5c87ff7 100644 --- a/avahi-python/avahi-discover/Makefile.in +++ b/avahi-python/avahi-discover/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,31 +110,33 @@ host_triplet = @host@ @HAVE_GDBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ avahi-discover @HAVE_GDBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = avahi-discover.desktop -@HAVE_GDBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_3 = __init__.py -@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_4 = \ +@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_3 = \ @HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ avahi-discover -@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_5 = avahi-discover.desktop -@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_6 = __init__.py +@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_4 = avahi-discover.desktop subdir = avahi-python/avahi-discover ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.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) -DIST_COMMON = $(srcdir)/Makefile.am $(am__avahi_discover_PYTHON_DIST) \ - $(am__DIST_COMMON) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -166,8 +168,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(avahi_discoverdir)" "$(DESTDIR)$(desktopdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" SCRIPTS = $(bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -188,17 +189,11 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__avahi_discover_PYTHON_DIST = __init__.py -am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) -am__pep3147_tweak = \ - sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' -py_compile = $(top_srcdir)/py-compile DATA = $(desktop_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/py-compile +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -211,8 +206,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -223,7 +216,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -264,11 +256,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -282,16 +275,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -310,16 +294,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -327,15 +319,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -354,10 +346,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -372,6 +361,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -382,6 +373,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -425,8 +418,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -454,18 +445,14 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -I$(top_srcdir) EXTRA_DIST = \ - __init__.py \ avahi-discover.py \ avahi-discover.desktop.in.in @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@pythonscripts = $(am__append_1) \ -@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(am__append_4) +@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(am__append_3) @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@desktopdir = $(datadir)/applications @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@desktop_DATA = $(am__append_2) \ -@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(am__append_5) -@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi_discoverdir = $(pythondir)/avahi_discover -@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi_discover_PYTHON = $(am__append_3) \ -@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(am__append_6) +@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(am__append_4) @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@bin_SCRIPTS = $(pythonscripts) @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@CLEANFILES = $(pythonscripts) $(desktop_DATA) *.pyc *.pyo avahi-discover.desktop.in all: all-am @@ -541,54 +528,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-avahi_discoverPYTHON: $(avahi_discover_PYTHON) - @$(NORMAL_INSTALL) - @list='$(avahi_discover_PYTHON)'; dlist=; list2=; test -n "$(avahi_discoverdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(avahi_discoverdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(avahi_discoverdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ - if test -f $$b$$p; then \ - $(am__strip_dir) \ - dlist="$$dlist $$f"; \ - list2="$$list2 $$b$$p"; \ - else :; fi; \ - done; \ - for file in $$list2; do echo $$file; done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(avahi_discoverdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(avahi_discoverdir)" || exit $$?; \ - done || exit $$?; \ - if test -n "$$dlist"; then \ - $(am__py_compile) --destdir "$(DESTDIR)" \ - --basedir "$(avahi_discoverdir)" $$dlist; \ - else :; fi - -uninstall-avahi_discoverPYTHON: - @$(NORMAL_UNINSTALL) - @list='$(avahi_discover_PYTHON)'; test -n "$(avahi_discoverdir)" || list=; \ - py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$py_files" || exit 0; \ - dir='$(DESTDIR)$(avahi_discoverdir)'; \ - pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ - pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ - py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ - echo "$$py_files_pep3147";\ - pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ - pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ - st=0; \ - for files in \ - "$$py_files" \ - "$$pyc_files" \ - "$$pyo_files" \ - "$$pyc_files_pep3147" \ - "$$pyo_files_pep3147" \ - ; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ - done; \ - exit $$st install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ @@ -651,7 +590,7 @@ check-am: all-am check: check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(avahi_discoverdir)" "$(DESTDIR)$(desktopdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -705,7 +644,7 @@ info: info-am info-am: -install-data-am: install-avahi_discoverPYTHON install-desktopDATA +install-data-am: install-desktopDATA install-dvi: install-dvi-am @@ -749,34 +688,32 @@ ps: ps-am ps-am: -uninstall-am: uninstall-avahi_discoverPYTHON uninstall-binSCRIPTS \ - uninstall-desktopDATA +uninstall-am: uninstall-binSCRIPTS uninstall-desktopDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am 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 \ + install install-am 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 tags-am uninstall \ - uninstall-am uninstall-avahi_discoverPYTHON \ - uninstall-binSCRIPTS uninstall-desktopDATA + uninstall-am uninstall-binSCRIPTS uninstall-desktopDATA .PRECIOUS: Makefile -@HAVE_GDBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@ -@HAVE_DBM_TRUE@@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@@INTLTOOL_DESKTOP_RULE@ @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi-discover.desktop.in: avahi-discover.desktop.in.in @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ +@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi-discover.desktop: avahi-discover.desktop.in +@HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@avahi-discover: avahi-discover.py @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ @HAVE_PYGOBJECT_TRUE@@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \ diff --git a/avahi-python/avahi-discover/__init__.py b/avahi-python/avahi-discover/__init__.py deleted file mode 100755 index 6f3ec7f..0000000 --- a/avahi-python/avahi-discover/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -#!@PYTHON@ -# -*-python-*- -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -# License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. diff --git a/avahi-python/avahi-discover/avahi-discover.desktop.in.in b/avahi-python/avahi-discover/avahi-discover.desktop.in.in index dac9818..a8982ad 100644 --- a/avahi-python/avahi-discover/avahi-discover.desktop.in.in +++ b/avahi-python/avahi-discover/avahi-discover.desktop.in.in @@ -1,11 +1,10 @@ [Desktop Entry] Version=1.0 -_Name=Avahi Zeroconf Browser -_Comment=Browse for Zeroconf services available on your network +Name=Avahi Zeroconf Browser +Comment=Browse for Zeroconf services available on your network Exec=@bindir@/avahi-discover Terminal=false Type=Application Icon=network-wired Categories=GNOME;System; StartupNotify=false -GenericName= diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py index 95ccca5..0db705d 100755 --- a/avahi-python/avahi-discover/avahi-discover.py +++ b/avahi-python/avahi-discover/avahi-discover.py @@ -42,7 +42,8 @@ except Exception as e: ## try: from dbus import DBusException - import dbus.glib + from dbus.mainloop.glib import DBusGMainLoop + DBusGMainLoop(set_as_default=True) except ImportError as e: pass @@ -209,10 +210,10 @@ class Main_window: self.new_service_type(interface, protocol, self.stype, domain) def new_domain(self,interface, protocol, domain, flags): - if self.zc_ifaces.has_key((interface,protocol)) == False: + if (interface,protocol) not in self.zc_ifaces: ifn = self.get_interface_name(interface, protocol) self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn,None,interface,protocol,None,domain) - if self.zc_domains.has_key((interface,protocol,domain)) == False: + if (interface,protocol,domain) not in self.zc_domains: self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) if domain != "local": self.browse_domain(interface, protocol, domain) diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am index 3eb67d0..7c5e0cb 100644 --- a/avahi-python/avahi/Makefile.am +++ b/avahi-python/avahi/Makefile.am @@ -16,6 +16,11 @@ # USA. EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in +EXTRA_DIST += test.py + +TESTS = +TEST_EXTENSIONS = .py +PY_LOG_COMPILER = $(PYTHON) pkglibdatadir=$(libdir)/avahi @@ -25,29 +30,16 @@ avahidir = $(pythondir)/avahi if HAVE_GDBM nodist_avahi_SCRIPTS = ServiceTypeDatabase.py - -ServiceTypeDatabase.py: ServiceTypeDatabase.py.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ - -e 's,@DBM\@,gdbm,g' \ - -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ - -e 's,@CHECK_KEY\@,while key is not None:,g' \ - -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ - -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ - chmod +x $@ endif if HAVE_DBM nodist_avahi_SCRIPTS = ServiceTypeDatabase.py +endif ServiceTypeDatabase.py: ServiceTypeDatabase.py.in $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ - -e 's,@DBM\@,dbm,g' \ - -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ - -e 's,@CHECK_KEY\@,for key in keys:,g' \ - -e 's,@NEXT_KEY\@,,g' \ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ chmod +x $@ -endif avahi_PYTHON = $(avahi_SCRIPTS) @@ -55,6 +47,8 @@ if HAVE_PYTHON_DBUS avahi_PYTHON += __init__.py +TESTS += test.py + endif endif diff --git a/avahi-python/avahi/Makefile.in b/avahi-python/avahi/Makefile.in index e296f78..054206f 100644 --- a/avahi-python/avahi/Makefile.in +++ b/avahi-python/avahi/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,19 +106,25 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_1 = __init__.py +@HAVE_PYTHON_DBUS_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = test.py subdir = avahi-python/avahi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -183,10 +189,183 @@ am__pep3147_tweak = \ sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' py_compile = $(top_srcdir)/py-compile am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/py-compile +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.py.log=.log) +PY_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +PY_LOG_COMPILE = $(PY_LOG_COMPILER) $(AM_PY_LOG_FLAGS) $(PY_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/py-compile \ + $(top_srcdir)/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -199,8 +378,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -211,7 +388,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -252,11 +428,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -270,16 +447,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -298,16 +466,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -315,15 +491,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -342,10 +518,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -360,6 +533,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -370,6 +545,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -413,8 +590,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -440,7 +615,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in +EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in test.py +TESTS = $(am__append_2) +TEST_EXTENSIONS = .py +PY_LOG_COMPILER = $(PYTHON) pkglibdatadir = $(libdir)/avahi @HAVE_PYTHON_TRUE@avahidir = $(pythondir)/avahi @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@nodist_avahi_SCRIPTS = ServiceTypeDatabase.py @@ -450,6 +628,7 @@ CLEANFILES = *.pyc *.pyo ServiceTypeDatabase.py all: all-am .SUFFIXES: +.SUFFIXES: .log .py .py$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -575,6 +754,162 @@ ctags CTAGS: cscope cscopelist: +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.py.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(PY_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_PY_LOG_DRIVER_FLAGS) $(PY_LOG_DRIVER_FLAGS) -- $(PY_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.py$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(PY_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_PY_LOG_DRIVER_FLAGS) $(PY_LOG_DRIVER_FLAGS) -- $(PY_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -606,6 +941,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(SCRIPTS) installdirs: @@ -632,6 +968,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -709,42 +1048,30 @@ ps-am: uninstall-am: uninstall-avahiPYTHON uninstall-nodist_avahiSCRIPTS -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-avahiPYTHON 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-nodist_avahiSCRIPTS \ - 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 \ - tags-am uninstall uninstall-am uninstall-avahiPYTHON \ +.MAKE: check-am install-am install-strip + +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + clean-libtool cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-avahiPYTHON \ + 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-nodist_avahiSCRIPTS 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 recheck tags-am \ + uninstall uninstall-am uninstall-avahiPYTHON \ uninstall-nodist_avahiSCRIPTS .PRECIOUS: Makefile -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@DBM\@,gdbm,g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@CHECK_KEY\@,while key is not None:,g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ - -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@DBM\@,dbm,g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@CHECK_KEY\@,for key in keys:,g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@NEXT_KEY\@,,g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ +@HAVE_PYTHON_TRUE@ServiceTypeDatabase.py: ServiceTypeDatabase.py.in +@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@HAVE_PYTHON_TRUE@ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ +@HAVE_PYTHON_TRUE@ chmod +x $@ # 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. diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in index 4ddd654..d7f9969 100644 --- a/avahi-python/avahi/ServiceTypeDatabase.py.in +++ b/avahi-python/avahi/ServiceTypeDatabase.py.in @@ -17,7 +17,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -import @DBM@ +try: + import anydbm as dbm +except ImportError: + import dbm + import locale import re @@ -28,7 +32,7 @@ class ServiceTypeDatabase: def __init__(self, filename = "@pkglibdatadir@/service-types.db"): - self.db = @DBM@.open(filename, "r") + self.db = dbm.open(filename, "r") l = locale.getlocale(locale.LC_MESSAGES) @@ -90,13 +94,24 @@ class ServiceTypeDatabase: def __iter__(self): - @FIRST_KEY@ - @CHECK_KEY@ - - if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key) and not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key): - yield key - - @NEXT_KEY@ + def want_key(key): + if not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key): + return False + if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key): + return False + return True + + try: + key = self.db.firstkey() + except AttributeError: + for key in self.db.keys(): + if want_key(key): + yield key + else: + while key is not None: + if want_key(key): + yield key + key = self.db.nextkey(key) def __len__(self): diff --git a/avahi-python/avahi/__init__.py b/avahi-python/avahi/__init__.py index 7b45029..02305b0 100644 --- a/avahi-python/avahi/__init__.py +++ b/avahi-python/avahi/__init__.py @@ -17,6 +17,8 @@ # Some definitions matching those in avahi-common/defs.h +import sys + import dbus SERVER_INVALID, SERVER_REGISTERING, SERVER_RUNNING, SERVER_COLLISION, SERVER_FAILURE = range(0, 5) @@ -66,6 +68,9 @@ DBUS_INTERFACE_HOST_NAME_RESOLVER = DBUS_NAME + ".HostNameResolver" DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver" DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser" +if sys.version_info[0] >= 3: + unicode = str + def byte_array_to_string(s): r = "" @@ -86,12 +91,19 @@ def txt_array_to_string_array(t): return l - def string_to_byte_array(s): + if isinstance(s, unicode): + s = s.encode('utf-8') + r = [] for c in s: - r.append(dbus.Byte(ord(c))) + if isinstance(c, int): + # Python 3: iterating over bytes yields ints + r.append(dbus.Byte(c)) + else: + # Python 2: iterating over str yields str + r.append(dbus.Byte(ord(c))) return r @@ -107,6 +119,12 @@ def dict_to_txt_array(txt_dict): l = [] for k,v in txt_dict.items(): - l.append(string_to_byte_array("%s=%s" % (k,v))) + if isinstance(k, unicode): + k = k.encode('utf-8') + + if isinstance(v, unicode): + v = v.encode('utf-8') + + l.append(string_to_byte_array(b"%s=%s" % (k,v))) return l diff --git a/avahi-python/avahi/test.py b/avahi-python/avahi/test.py new file mode 100755 index 0000000..7afc480 --- /dev/null +++ b/avahi-python/avahi/test.py @@ -0,0 +1,85 @@ +#!/usr/bin/python +# +# Copyright 2018 Simon McVittie +# +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +import os +import os.path +import sys +import unittest +from collections import OrderedDict + +sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir)) + +import avahi +import dbus + +class TestUtilityMethods(unittest.TestCase): + def test_byte_array_to_string(self): + self.assertEqual( + avahi.byte_array_to_string([1, 2, 127, 128]), + '....') + self.assertEqual( + avahi.byte_array_to_string([ord('a'), ord(' '), ord('b')]), + 'a b') + + def test_txt_array_to_string_array(self): + self.assertEqual( + avahi.txt_array_to_string_array([[1, 2], [ord('a'), ord('b')]]), + ['..', 'ab']) + + def test_string_to_byte_array(self): + self.assertEqual( + avahi.string_to_byte_array('abc'), + [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)]) + self.assertIsInstance( + avahi.string_to_byte_array('abc')[0], + dbus.Byte) + self.assertEqual( + avahi.string_to_byte_array(b'\x01\xff'), + [dbus.Byte(0x01), dbus.Byte(0xff)]) + self.assertEqual( + avahi.string_to_byte_array(u'\u00e1'), + [dbus.Byte(0xc3), dbus.Byte(0xa1)]) + + def test_string_array_to_txt_array(self): + self.assertEqual( + avahi.string_array_to_txt_array(['abc', b'\x01', u'\u00e1']), + [ + [dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)], + [dbus.Byte(0x01)], + [dbus.Byte(0xc3), dbus.Byte(0xa1)]]) + self.assertIsInstance( + avahi.string_array_to_txt_array(['abc'])[0][0], + dbus.Byte) + + def test_dict_to_txt_array(self): + self.assertEqual( + avahi.dict_to_txt_array( + OrderedDict((('a', 'abc'), ('b', b'\x01'), ('c', u'\u00e1')))), + [ + [dbus.Byte(97), dbus.Byte(ord('=')), dbus.Byte(97), dbus.Byte(98), dbus.Byte(99)], + [dbus.Byte(98), dbus.Byte(ord('=')), dbus.Byte(0x01)], + [dbus.Byte(99), dbus.Byte(ord('=')), dbus.Byte(0xc3), dbus.Byte(0xa1)]]) + self.assertIsInstance( + avahi.dict_to_txt_array({'a': 'abc'})[0][0], + dbus.Byte) + +if __name__ == '__main__': + unittest.main() diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am index 64356a5..09ce7ca 100644 --- a/avahi-qt/Makefile.am +++ b/avahi-qt/Makefile.am @@ -65,4 +65,26 @@ libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LI libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO) endif +if HAVE_QT5 + +avahiqt5includedir=$(includedir)/avahi-qt5 +avahiqt5include_HEADERS = \ + qt-watch.h + +lib_LTLIBRARIES += \ + libavahi-qt5.la + +BUILT_SOURCES += qt-watch.moc5 + +libavahi_qt5_la_SOURCES = \ + qt-watch.cpp + +qt-watch.moc5: qt-watch.cpp + $(AM_V_GEN)$(MOC_QT5) $^ > $@ + +libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS) +libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS) +libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO) +endif + CLEANFILES = $(BUILT_SOURCES) diff --git a/avahi-qt/Makefile.in b/avahi-qt/Makefile.in index 0d4c1f7..72f1cd9 100644 --- a/avahi-qt/Makefile.in +++ b/avahi-qt/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,26 +114,36 @@ host_triplet = @host@ @HAVE_QT4_TRUE@ libavahi-qt4.la @HAVE_QT4_TRUE@am__append_4 = qt-watch.moc4 +@HAVE_QT5_TRUE@am__append_5 = \ +@HAVE_QT5_TRUE@ libavahi-qt5.la + +@HAVE_QT5_TRUE@am__append_6 = qt-watch.moc5 subdir = avahi-qt ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.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) DIST_COMMON = $(srcdir)/Makefile.am \ $(am__avahiqt3include_HEADERS_DIST) \ - $(am__avahiqt4include_HEADERS_DIST) $(am__DIST_COMMON) + $(am__avahiqt4include_HEADERS_DIST) \ + $(am__avahiqt5include_HEADERS_DIST) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -167,7 +177,8 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(avahiqt3includedir)" \ - "$(DESTDIR)$(avahiqt4includedir)" + "$(DESTDIR)$(avahiqt4includedir)" \ + "$(DESTDIR)$(avahiqt5includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \ @@ -198,6 +209,18 @@ libavahi_qt4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt4_la_LDFLAGS) \ $(LDFLAGS) -o $@ @HAVE_QT4_TRUE@am_libavahi_qt4_la_rpath = -rpath $(libdir) +@HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES = \ +@HAVE_QT5_TRUE@ ../avahi-common/libavahi-common.la \ +@HAVE_QT5_TRUE@ $(am__DEPENDENCIES_1) +am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp +@HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS = \ +@HAVE_QT5_TRUE@ libavahi_qt5_la-qt-watch.lo +libavahi_qt5_la_OBJECTS = $(am_libavahi_qt5_la_OBJECTS) +libavahi_qt5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt5_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@HAVE_QT5_TRUE@am_libavahi_qt5_la_rpath = -rpath $(libdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -232,9 +255,11 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES) +SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES) \ + $(libavahi_qt5_la_SOURCES) DIST_SOURCES = $(am__libavahi_qt3_la_SOURCES_DIST) \ - $(am__libavahi_qt4_la_SOURCES_DIST) + $(am__libavahi_qt4_la_SOURCES_DIST) \ + $(am__libavahi_qt5_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -242,7 +267,9 @@ am__can_run_installinfo = \ esac am__avahiqt3include_HEADERS_DIST = qt-watch.h am__avahiqt4include_HEADERS_DIST = qt-watch.h -HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS) +am__avahiqt5include_HEADERS_DIST = qt-watch.h +HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS) \ + $(avahiqt5include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -265,7 +292,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -278,8 +304,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -290,7 +314,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -331,11 +354,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -349,16 +373,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -377,16 +392,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -394,15 +417,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -421,10 +444,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -439,6 +459,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -449,6 +471,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -492,8 +516,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -520,8 +542,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -I$(top_srcdir) -lib_LTLIBRARIES = $(am__append_1) $(am__append_3) -BUILT_SOURCES = $(am__append_2) $(am__append_4) +lib_LTLIBRARIES = $(am__append_1) $(am__append_3) $(am__append_5) +BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6) @HAVE_QT3_TRUE@avahiqt3includedir = $(includedir)/avahi-qt3 @HAVE_QT3_TRUE@avahiqt3include_HEADERS = \ @HAVE_QT3_TRUE@ qt-watch.h @@ -542,6 +564,16 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS) @HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS) @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO) +@HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5 +@HAVE_QT5_TRUE@avahiqt5include_HEADERS = \ +@HAVE_QT5_TRUE@ qt-watch.h + +@HAVE_QT5_TRUE@libavahi_qt5_la_SOURCES = \ +@HAVE_QT5_TRUE@ qt-watch.cpp + +@HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS) +@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS) +@HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO) CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -619,6 +651,9 @@ libavahi-qt3.la: $(libavahi_qt3_la_OBJECTS) $(libavahi_qt3_la_DEPENDENCIES) $(EX libavahi-qt4.la: $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_DEPENDENCIES) $(EXTRA_libavahi_qt4_la_DEPENDENCIES) $(AM_V_CXXLD)$(libavahi_qt4_la_LINK) $(am_libavahi_qt4_la_rpath) $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_LIBADD) $(LIBS) +libavahi-qt5.la: $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_DEPENDENCIES) $(EXTRA_libavahi_qt5_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libavahi_qt5_la_LINK) $(am_libavahi_qt5_la_rpath) $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_LIBADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -627,6 +662,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -663,6 +699,13 @@ libavahi_qt4_la-qt-watch.lo: qt-watch.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt4_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt4_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp +libavahi_qt5_la-qt-watch.lo: qt-watch.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libavahi_qt5_la-qt-watch.lo -MD -MP -MF $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo $(DEPDIR)/libavahi_qt5_la-qt-watch.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qt-watch.cpp' object='libavahi_qt5_la-qt-watch.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp + mostlyclean-libtool: -rm -f *.lo @@ -710,6 +753,27 @@ uninstall-avahiqt4includeHEADERS: @list='$(avahiqt4include_HEADERS)'; test -n "$(avahiqt4includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(avahiqt4includedir)'; $(am__uninstall_files_from_dir) +install-avahiqt5includeHEADERS: $(avahiqt5include_HEADERS) + @$(NORMAL_INSTALL) + @list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(avahiqt5includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(avahiqt5includedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(avahiqt5includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(avahiqt5includedir)" || exit $$?; \ + done + +uninstall-avahiqt5includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(avahiqt5includedir)'; $(am__uninstall_files_from_dir) ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique @@ -798,7 +862,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)" "$(DESTDIR)$(avahiqt5includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -858,7 +922,7 @@ info: info-am info-am: install-data-am: install-avahiqt3includeHEADERS \ - install-avahiqt4includeHEADERS + install-avahiqt4includeHEADERS install-avahiqt5includeHEADERS install-dvi: install-dvi-am @@ -905,7 +969,8 @@ ps: ps-am ps-am: uninstall-am: uninstall-avahiqt3includeHEADERS \ - uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES + uninstall-avahiqt4includeHEADERS \ + uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES .MAKE: all check install install-am install-strip @@ -915,16 +980,18 @@ uninstall-am: uninstall-avahiqt3includeHEADERS \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am \ install-avahiqt3includeHEADERS install-avahiqt4includeHEADERS \ - 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-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 tags-am uninstall \ - uninstall-am uninstall-avahiqt3includeHEADERS \ - uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES + install-avahiqt5includeHEADERS 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-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 tags-am uninstall uninstall-am \ + uninstall-avahiqt3includeHEADERS \ + uninstall-avahiqt4includeHEADERS \ + uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES .PRECIOUS: Makefile @@ -935,6 +1002,9 @@ uninstall-am: uninstall-avahiqt3includeHEADERS \ @HAVE_QT4_TRUE@qt-watch.moc4: qt-watch.cpp @HAVE_QT4_TRUE@ $(AM_V_GEN)$(MOC_QT4) $^ > $@ +@HAVE_QT5_TRUE@qt-watch.moc5: qt-watch.cpp +@HAVE_QT5_TRUE@ $(AM_V_GEN)$(MOC_QT5) $^ > $@ + # 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: diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp index dac9dcc..14e0c6e 100644 --- a/avahi-qt/qt-watch.cpp +++ b/avahi-qt/qt-watch.cpp @@ -18,10 +18,10 @@ ***/ #include -#ifdef QT4 -#include -#include -#include +#if defined(QT5) || defined(QT4) +#include +#include +#include #else #include #include @@ -114,7 +114,7 @@ AvahiTimeout::AvahiTimeout(const struct timeval* tv, AvahiTimeoutCallback callba m_callback(callback), m_userdata(userdata) { connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout())); -#ifdef QT4 +#if defined(QT5) || defined(QT4) m_timer.setSingleShot(true); #endif update(tv); @@ -125,7 +125,7 @@ void AvahiTimeout::update(const struct timeval *tv) m_timer.stop(); if (tv) { AvahiUsec u = avahi_age(tv)/1000; -#ifdef QT4 +#if defined(QT5) || defined(QT4) m_timer.start( (u>0) ? 0 : -u); #else m_timer.start( (u>0) ? 0 : -u,true); @@ -191,8 +191,10 @@ const AvahiPoll* avahi_qt_poll_get(void) return &qt_poll; } -#ifdef QT4 +#if defined(QT5) +#include "qt-watch.moc5" +#elif defined(QT4) #include "qt-watch.moc4" -#else +#elif defined(QT3) #include "qt-watch.moc3" #endif diff --git a/avahi-qt5.pc.in b/avahi-qt5.pc.in new file mode 100644 index 0000000..71548ba --- /dev/null +++ b/avahi-qt5.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=@libdir@ +includedir=${prefix}/include + +Name: avahi-qt5 +Description: Avahi Multicast DNS Responder (QT5 Support) +Version: @PACKAGE_VERSION@ +Requires: Qt5Core >= 5.0.0 +Libs: -L${libdir} -lavahi-qt5 +Cflags: -D_REENTRANT -I${includedir} diff --git a/avahi-sharp/Makefile.in b/avahi-sharp/Makefile.in index bdfe3c3..bbf3d0f 100644 --- a/avahi-sharp/Makefile.in +++ b/avahi-sharp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-ui-sharp/Makefile.in b/avahi-ui-sharp/Makefile.in index fb7f4b1..f75bd04 100644 --- a/avahi-ui-sharp/Makefile.in +++ b/avahi-ui-sharp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am index 238d43a..7e75b2c 100644 --- a/avahi-ui/Makefile.am +++ b/avahi-ui/Makefile.am @@ -80,7 +80,6 @@ endif bin_PROGRAMS = bssh desktop_DATA += bssh.desktop bvnc.desktop -@INTLTOOL_DESKTOP_RULE@ bssh_SOURCES = bssh.c @@ -101,13 +100,17 @@ install-exec-local: bssh.desktop.in: bssh.desktop.in.in $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ +bssh.desktop: bssh.desktop.in + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + bvnc.desktop.in: bvnc.desktop.in.in $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ +bvnc.desktop: bvnc.desktop.in + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + endif # HAVE_GLIB endif endif -@INTLTOOL_DESKTOP_RULE@ - CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/avahi-ui/Makefile.in b/avahi-ui/Makefile.in index 335a643..fcd2c67 100644 --- a/avahi-ui/Makefile.in +++ b/avahi-ui/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -130,14 +130,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -305,7 +310,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -318,8 +322,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -330,7 +332,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -371,11 +372,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -389,16 +391,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -417,16 +410,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -434,15 +435,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -461,10 +462,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -479,6 +477,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -489,6 +489,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -532,8 +534,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -1081,7 +1081,6 @@ uninstall-am: uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \ .PRECIOUS: Makefile -@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@INTLTOOL_DESKTOP_RULE@ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@install-exec-local: @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ cd $(DESTDIR)/$(bindir) && \ @@ -1092,10 +1091,14 @@ uninstall-am: uninstall-avahiincludeHEADERS uninstall-binPROGRAMS \ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh.desktop.in: bssh.desktop.in.in @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh.desktop: bssh.desktop.in +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bvnc.desktop.in: bvnc.desktop.in.in @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ -@INTLTOOL_DESKTOP_RULE@ +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bvnc.desktop: bvnc.desktop.in +@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ # 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. diff --git a/avahi-ui/bssh.desktop.in.in b/avahi-ui/bssh.desktop.in.in index a4e54fe..2d7c692 100644 --- a/avahi-ui/bssh.desktop.in.in +++ b/avahi-ui/bssh.desktop.in.in @@ -1,11 +1,10 @@ [Desktop Entry] Version=1.0 -_Name=Avahi SSH Server Browser -_Comment=Browse for Zeroconf-enabled SSH Servers +Name=Avahi SSH Server Browser +Comment=Browse for Zeroconf-enabled SSH Servers Exec=@bindir@/bssh Terminal=false Type=Application Icon=network-wired Categories=GNOME;Network; StartupNotify=false -GenericName= diff --git a/avahi-ui/bvnc.desktop.in.in b/avahi-ui/bvnc.desktop.in.in index 92b8247..a31bfa7 100644 --- a/avahi-ui/bvnc.desktop.in.in +++ b/avahi-ui/bvnc.desktop.in.in @@ -1,11 +1,10 @@ [Desktop Entry] Version=1.0 -_Name=Avahi VNC Server Browser -_Comment=Browse for Zeroconf-enabled VNC Servers +Name=Avahi VNC Server Browser +Comment=Browse for Zeroconf-enabled VNC Servers Exec=@bindir@/bvnc Terminal=false Type=Application Icon=network-wired Categories=GNOME;Network; StartupNotify=false -GenericName= diff --git a/avahi-utils/Makefile.in b/avahi-utils/Makefile.in index f80ecbd..8c21975 100644 --- a/avahi-utils/Makefile.in +++ b/avahi-utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,14 +118,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -261,7 +266,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -274,8 +278,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -286,7 +288,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -327,11 +328,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -345,16 +347,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -373,16 +366,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -390,15 +391,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -417,10 +418,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -435,6 +433,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -445,6 +445,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -488,8 +490,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/bootstrap.sh b/bootstrap.sh index 105bdbf..efab203 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -36,14 +36,14 @@ case `uname -s` in export CFLAGS="-I/usr/local/include" export LDFLAGS="-L/usr/local/lib" export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" - FLAGS="$FLAGS --prefix=/opt/ --with-distro=none --disable-python --disable-dbus --disable-glib --disable-gtk" + FLAGS="$FLAGS --prefix=/opt/ --with-distro=none --disable-python --disable-dbus --disable-glib --disable-gtk --disable-libevent" ;; NetBSD) export LIBTOOLIZE=libtoolize export CFLAGS="-I/usr/pkg/include" export LDFLAGS="-L/usr/pkg/lib" export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" - FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-glib --disable-gtk --disable-manpages" + FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-glib --disable-gtk --disable-manpages --disable-libevent" ;; Linux) ;; @@ -51,11 +51,11 @@ esac case "$USER" in lathiat|trentl) - FLAGS="$FLAGS --disable-qt4" + FLAGS="$FLAGS" ;; sebest) - FLAGS="$FLAGS --disable-monodoc --enable-dbus=no --enable-mono=no --enable-qt3=no --enable-qt4=no --sysconfdir=/etc --localstatedir=/var --prefix=/usr --disable-manpages --disable-xmltoman" + FLAGS="$FLAGS --disable-monodoc --enable-dbus=no --enable-mono=no --enable-qt4=no --sysconfdir=/etc --localstatedir=/var --prefix=/usr --disable-manpages --disable-xmltoman" ;; esac -CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@" --enable-qt3=no +CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@" diff --git a/common/ChangeLog b/common/ChangeLog index f60da22..8c7cad8 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,4 +1,4 @@ -2017-07-10 gettextize +2020-02-18 gettextize * gettext.m4: New file, from gettext-0.19.8.1. * iconv.m4: New file, from gettext-0.19.8.1. diff --git a/common/Makefile.am b/common/Makefile.am index c6d6fd5..154bdd2 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -16,6 +16,6 @@ # USA. EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 \ - doxygen.m4 \ + doxygen.m4 \ doxygen.mk \ python.m4 diff --git a/common/Makefile.in b/common/Makefile.in index 1e68573..4b6fd88 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -109,14 +109,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -149,7 +154,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -162,8 +166,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -174,7 +176,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -215,11 +216,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -233,16 +235,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -261,16 +254,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -278,15 +279,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -305,10 +306,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -323,6 +321,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -333,6 +333,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -376,8 +378,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -404,7 +404,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 \ - doxygen.m4 \ + doxygen.m4 \ doxygen.mk \ python.m4 diff --git a/common/intltool.m4 b/common/intltool.m4 deleted file mode 100644 index c25b7b1..0000000 --- a/common/intltool.m4 +++ /dev/null @@ -1,212 +0,0 @@ -## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -## Copyright (C) 2001 Eazel, Inc. -## Author: Maciej Stachowiak -## Kenneth Christiansen -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | 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; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -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 - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - diff --git a/common/qt5-pie.m4 b/common/qt5-pie.m4 new file mode 100644 index 0000000..10d564c --- /dev/null +++ b/common/qt5-pie.m4 @@ -0,0 +1,27 @@ +AC_DEFUN([AC_AVAHI_QT_ADD_PIC_IF_NEEDED], +[ + AC_LANG_PUSH([C++]) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $QT5_CFLAGS" + AC_MSG_CHECKING([whether Qt works without -fPIC]) + AC_PREPROC_IFELSE( + [AC_LANG_SOURCE([[#include ]])], + [AC_MSG_RESULT(yes)], + [ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([whether Qt works with -fPIC]) + CPPFLAGS="$CPPFLAGS -fPIC" + AC_PREPROC_IFELSE( + [AC_LANG_SOURCE([[#include ]])], + [ + AC_MSG_RESULT(yes) + QT5_CFLAGS="$QT5_CFLAGS -fPIC" + ], + [ + AC_MSG_RESULT(no) + AC_MSG_ERROR(Couldn't compile Qt without -fPIC nor with -fPIC) + ]) + ]) + CPPFLAGS="$save_CPPFLAGS" + AC_LANG_POP([C++]) +]) diff --git a/config.guess b/config.guess index 2e9ad7f..f50dcdb 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2016-10-02' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2016-10-02' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,46 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -310,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -343,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -370,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. @@ -395,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -410,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -439,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -485,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -527,17 +534,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -554,7 +561,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -566,14 +573,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -584,7 +591,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -598,7 +605,7 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -607,18 +614,18 @@ EOF IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -633,28 +640,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -687,13 +694,13 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +719,15 @@ EOF HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -745,11 +752,11 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -758,7 +765,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -766,9 +773,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -793,127 +800,109 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -927,63 +916,63 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -997,70 +986,74 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1074,34 +1067,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1111,12 +1104,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1126,9 +1119,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1148,9 +1141,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1170,9 +1163,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1181,28 +1174,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1213,7 +1206,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1233,23 +1226,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1268,49 +1261,56 @@ EOF echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1321,7 +1321,7 @@ EOF # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1329,19 +1329,25 @@ EOF UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1350,7 +1356,7 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 @@ -1361,7 +1367,7 @@ EOF else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1382,14 +1388,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1398,32 +1404,44 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 </dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/config.h.in b/config.h.in index 4e13251..fbe8e36 100644 --- a/config.h.in +++ b/config.h.in @@ -18,7 +18,8 @@ /* Enable chroot() usage */ #undef ENABLE_CHROOT -/* always defined to indicate that i18n is enabled */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ #undef ENABLE_NLS /* Define if SSP C support is enabled. */ @@ -33,9 +34,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - /* Define to 1 if you have the header file. */ #undef HAVE_BSDXML_H @@ -65,7 +63,8 @@ /* Define to 1 if you have the `dbus_connection_close' function. */ #undef HAVE_DBUS_CONNECTION_CLOSE -/* Define to 1 if you have the `dcgettext' function. */ +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ #undef HAVE_DCGETTEXT /* Define to 1 if you have the declaration of `environ', and to 0 if you @@ -108,6 +107,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + /* Enable Linux inotify() usage */ #undef HAVE_INOTIFY @@ -117,15 +119,9 @@ /* Enable BSD kqueue() usage */ #undef HAVE_KQUEUE -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define to 1 if you have the `memchr' function. */ #undef HAVE_MEMCHR diff --git a/config.sub b/config.sub index dd2ca93..1d8e98b 100755 --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2016-11-04' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ timestamp='2016-11-04' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ timestamp='2016-11-04' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,7 +94,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -112,7 +112,7 @@ esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ @@ -120,16 +120,16 @@ case $maybe_os in kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; android-linux) os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -178,44 +178,44 @@ case $os in ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -227,10 +227,7 @@ case $os in os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -263,7 +260,7 @@ case $basic_machine in | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -299,7 +296,7 @@ case $basic_machine in | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pru \ | pyramid \ @@ -315,7 +312,7 @@ case $basic_machine in | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ - | we32k \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -336,7 +333,7 @@ case $basic_machine in basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; ms1) basic_machine=mt-unknown @@ -365,7 +362,7 @@ case $basic_machine in ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -388,7 +385,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -446,6 +443,7 @@ case $basic_machine in | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -459,7 +457,7 @@ case $basic_machine in # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -493,7 +491,7 @@ case $basic_machine in basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -538,7 +536,7 @@ case $basic_machine in os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -546,13 +544,13 @@ case $basic_machine in os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -641,7 +639,7 @@ case $basic_machine in basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; @@ -650,7 +648,7 @@ case $basic_machine in os=$os"spe" ;; e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) @@ -742,9 +740,6 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -757,26 +752,26 @@ case $basic_machine in basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -795,19 +790,16 @@ case $basic_machine in os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -839,10 +831,10 @@ case $basic_machine in os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -861,7 +853,7 @@ case $basic_machine in os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -903,7 +895,7 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -948,6 +940,12 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -980,7 +978,7 @@ case $basic_machine in os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -996,7 +994,7 @@ case $basic_machine in basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1011,16 +1009,16 @@ case $basic_machine in basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1030,23 +1028,23 @@ case $basic_machine in ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1100,17 +1098,10 @@ case $basic_machine in sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1129,7 +1120,7 @@ case $basic_machine in os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1251,6 +1242,9 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1259,20 +1253,12 @@ case $basic_machine in basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1301,10 +1287,6 @@ case $basic_machine in vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1314,9 +1296,6 @@ case $basic_machine in sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1336,7 +1315,7 @@ case $basic_machine in # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1344,10 +1323,10 @@ esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1358,8 +1337,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1370,18 +1349,19 @@ case $os in -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1391,25 +1371,26 @@ case $os in | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1426,12 +1407,12 @@ case $os in -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1440,10 +1421,10 @@ case $os in os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1454,12 +1435,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1484,7 +1459,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1506,7 +1481,7 @@ case $os in -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1521,24 +1496,28 @@ case $os in -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; -ios) @@ -1548,7 +1527,7 @@ case $os in *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1638,12 +1617,12 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1683,7 +1662,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1698,9 +1677,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1810,15 +1786,15 @@ case $basic_machine in vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index 06d254d..9a32219 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for avahi 0.7. +# Generated by GNU Autoconf 2.69 for avahi 0.8. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='avahi' PACKAGE_TARNAME='avahi' -PACKAGE_VERSION='0.7' -PACKAGE_STRING='avahi 0.7' +PACKAGE_VERSION='0.8' +PACKAGE_STRING='avahi 0.8' PACKAGE_BUGREPORT='avahi (at) lists (dot) freedesktop (dot) org' PACKAGE_URL='' @@ -632,6 +632,7 @@ ac_includes_default="\ # include #endif" +gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -763,6 +764,11 @@ HAVE_GTK_FALSE HAVE_GTK_TRUE GTK20_LIBS GTK20_CFLAGS +HAVE_QT5_FALSE +HAVE_QT5_TRUE +MOC_QT5 +QT5_LIBS +QT5_CFLAGS HAVE_QT4_FALSE HAVE_QT4_TRUE MOC_QT4 @@ -773,6 +779,10 @@ HAVE_QT3_TRUE MOC_QT3 QT3_LIBS QT3_CFLAGS +HAVE_LIBEVENT_FALSE +HAVE_LIBEVENT_TRUE +LIBEVENT_LIBS +LIBEVENT_CFLAGS HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -796,55 +806,24 @@ PKG_CONFIG_PATH PKG_CONFIG have_pkg_config avahilocaledir -MKINSTALLDIRS POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE +LTLIBINTL +LIBINTL INTLLIBS -INSTOBJEXT -GMOFILES -DATADIRNAME -CATOBJEXT -CATALOGS -MSGFMT_OPTS +LTLIBICONV +LIBICONV INTL_MACOSX_LIBS -GETTEXT_PACKAGE -ALL_LINGUAS -INTLTOOL_PERL -GMSGFMT -MSGFMT +XGETTEXT_EXTRA_OPTIONS MSGMERGE +XGETTEXT_015 XGETTEXT -INTLTOOL_POLICY_RULE -INTLTOOL_SERVICE_RULE -INTLTOOL_THEME_RULE -INTLTOOL_SCHEMAS_RULE -INTLTOOL_CAVES_RULE -INTLTOOL_XML_NOMERGE_RULE -INTLTOOL_XML_RULE -INTLTOOL_KBD_RULE -INTLTOOL_XAM_RULE -INTLTOOL_UI_RULE -INTLTOOL_SOUNDLIST_RULE -INTLTOOL_SHEET_RULE -INTLTOOL_SERVER_RULE -INTLTOOL_PONG_RULE -INTLTOOL_OAF_RULE -INTLTOOL_PROP_RULE -INTLTOOL_KEYS_RULE -INTLTOOL_DIRECTORY_RULE -INTLTOOL_DESKTOP_RULE -intltool__v_merge_options_0 -intltool__v_merge_options_ -INTLTOOL_V_MERGE_OPTIONS -INTLTOOL__v_MERGE_0 -INTLTOOL__v_MERGE_ -INTLTOOL_V_MERGE -INTLTOOL_EXTRACT -INTLTOOL_MERGE -INTLTOOL_UPDATE +GMSGFMT_015 +MSGFMT_015 +GMSGFMT +MSGFMT +GETTEXT_MACRO_VERSION USE_NLS +GETTEXT_PACKAGE HAVE_KQUEUE_FALSE HAVE_KQUEUE_TRUE HAVE_INOTIFY_FALSE @@ -949,9 +928,11 @@ HOWL_COMPAT_VERSION LIBAVAHI_COMPAT_HOWL_VERSION_INFO LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_UI_VERSION_INFO +LIBAVAHI_QT5_VERSION_INFO LIBAVAHI_QT4_VERSION_INFO LIBAVAHI_QT3_VERSION_INFO LIBAVAHI_GOBJECT_VERSION_INFO +LIBAVAHI_LIBEVENT_VERSION_INFO LIBAVAHI_GLIB_VERSION_INFO LIBAVAHI_CLIENT_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO @@ -1038,11 +1019,16 @@ with_sysroot enable_libtool_lock with_distro enable_nls +enable_rpath +with_libiconv_prefix +with_libintl_prefix enable_glib enable_gobject enable_introspection +enable_libevent enable_qt3 enable_qt4 +enable_qt5 enable_gtk enable_gtk3 enable_dbus @@ -1102,10 +1088,14 @@ GLIB20_CFLAGS GLIB20_LIBS GOBJECT_CFLAGS GOBJECT_LIBS +LIBEVENT_CFLAGS +LIBEVENT_LIBS QT3_CFLAGS QT3_LIBS QT4_CFLAGS QT4_LIBS +QT5_CFLAGS +QT5_LIBS GTK20_CFLAGS GTK20_LIBS GTK30_CFLAGS @@ -1670,7 +1660,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures avahi 0.7 to adapt to many kinds of systems. +\`configure' configures avahi 0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1741,7 +1731,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of avahi 0.7:";; + short | recursive ) echo "Configuration of avahi 0.8:";; esac cat <<\_ACEOF @@ -1763,12 +1753,15 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support + --disable-rpath do not hardcode runtime library paths --disable-glib Disable use of GLib --disable-gobject Disable use of GLib GObject --enable-introspection=[no/auto/yes] Enable introspection for this build - --disable-qt3 Disable building of Qt3 mainloop integration + --disable-libevent Disable use of libevent + --enable-qt3 Enable building of Qt3 mainloop integration --disable-qt4 Disable building of Qt4Core mainloop integration + --disable-qt5 Disable building of Qt5Core mainloop integration --disable-gtk Disable use of GTK+ 2 --disable-gtk3 Disable use of GTK+ 3 --disable-dbus Disable use of D-Bus @@ -1814,6 +1807,11 @@ Optional Packages: --with-distro=DISTRO Specify the distribution to target: One of lfs, debian, gentoo, archlinux, fedora, mandriva, darwin, netbsd, freebsd, slackware or none + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir --with-dbus-sys= Path to D-Bus system.d directory --with-dbus-system-address=
    Path to the D-Bus system socket, you probably want @@ -1862,10 +1860,16 @@ Some influential environment variables: C compiler flags for GOBJECT, overriding pkg-config GOBJECT_LIBS linker flags for GOBJECT, overriding pkg-config + LIBEVENT_CFLAGS + C compiler flags for LIBEVENT, overriding pkg-config + LIBEVENT_LIBS + linker flags for LIBEVENT, overriding pkg-config QT3_CFLAGS C compiler flags for QT3, overriding pkg-config QT3_LIBS linker flags for QT3, overriding pkg-config QT4_CFLAGS C compiler flags for QT4, overriding pkg-config QT4_LIBS linker flags for QT4, overriding pkg-config + QT5_CFLAGS C compiler flags for QT5, overriding pkg-config + QT5_LIBS linker flags for QT5, overriding pkg-config GTK20_CFLAGS C compiler flags for GTK20, overriding pkg-config GTK20_LIBS linker flags for GTK20, overriding pkg-config @@ -1956,7 +1960,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -avahi configure 0.7 +avahi configure 0.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2546,7 +2550,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by avahi $as_me 0.7, which was +It was created by avahi $as_me 0.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2826,6 +2830,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -3413,7 +3418,7 @@ fi # Define the identity of the package. PACKAGE='avahi' - VERSION='0.7' + VERSION='0.8' cat >>confdefs.h <<_ACEOF @@ -3595,20 +3600,24 @@ fi PACKAGE_URL=http://avahi.org/ -LIBAVAHI_COMMON_VERSION_INFO=8:3:5 +LIBAVAHI_COMMON_VERSION_INFO=8:4:5 -LIBAVAHI_CORE_VERSION_INFO=7:2:0 +LIBAVAHI_CORE_VERSION_INFO=8:0:1 LIBAVAHI_CLIENT_VERSION_INFO=5:9:2 LIBAVAHI_GLIB_VERSION_INFO=1:2:0 +LIBAVAHI_LIBEVENT_VERSION_INFO=1:0:0 + LIBAVAHI_GOBJECT_VERSION_INFO=0:5:0 LIBAVAHI_QT3_VERSION_INFO=1:2:0 LIBAVAHI_QT4_VERSION_INFO=1:2:0 +LIBAVAHI_QT5_VERSION_INFO=1:2:0 + LIBAVAHI_UI_VERSION_INFO=1:4:1 @@ -19451,6 +19460,14 @@ $as_echo "#define HAVE_KQUEUE 1" >>confdefs.h fi +GETTEXT_PACKAGE=avahi + + +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -19467,76 +19484,89 @@ $as_echo "$USE_NLS" >&6; } -case "$am__api_version" in - 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 - ;; - *) - ;; -esac + GETTEXT_MACRO_VERSION=0.19 + + + -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; }'` -if test -n "0.35.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$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_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" fi +rm -f conf$$.file -# Extract the first word of "intltool-update", so it can be a program name with args. -set dummy intltool-update; ac_word=$2 +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_UPDATE in + case "$MSGFMT" in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. - ;; + ac_cv_path_MSGFMT="$MSGFMT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; esac fi -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE -if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else { $as_echo "$as_me:${as_lineno-$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 + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_MERGE in + case $GMSGFMT in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -19546,7 +19576,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -19554,181 +19584,418 @@ done done IFS=$as_save_IFS + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE -if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else { $as_echo "$as_me:${as_lineno-$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 + + case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; + *) MSGFMT_015=$MSGFMT ;; + esac + + case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; + *) GMSGFMT_015=$GMSGFMT ;; + esac + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_EXTRACT in + case "$XGETTEXT" in [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. - ;; + ac_cv_path_XGETTEXT="$XGETTEXT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; esac fi -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT -if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + rm -f messages.po -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi - - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' - - - - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' + case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; + *) XGETTEXT_015=$XGETTEXT ;; + esac +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' + ac_executable_p="test -f" fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -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) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +rm -f conf$$.file +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac +fi +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + ac_config_commands="$ac_config_commands po-directories" + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${acl_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$acl_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${acl_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$acl_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$acl_cv_prog_gnu_ld + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +$as_echo_n "checking for shared library run path origin... " >&6; } +if ${acl_cv_rpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +$as_echo "$acl_cv_rpath" >&6; } + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + # Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then : + enableval=$enable_rpath; : +else + enable_rpath=yes +fi + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef _LP64 +sixtyfour bits +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" @@ -19741,318 +20008,483 @@ fi + use_additional=yes + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +# Check whether --with-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then : + withval=$with_libiconv_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" -# Check the gettext tools to make sure they are GNU -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi - ;; -esac -fi -XGETTEXT=$ac_cv_path_XGETTEXT -if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi - -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + LIBICONV= + LTLIBICONV= + INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi + fi + done done -IFS=$as_save_IFS - - ;; -esac -fi -MSGMERGE=$ac_cv_path_MSGMERGE -if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MSGFMT=$ac_cv_path_MSGFMT -if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -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_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -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:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$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_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } -fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 - fi -fi -# Substitute ALL_LINGUAS so we can use it in po/Makefile -GETTEXT_PACKAGE=avahi -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF - for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 -_ACEOF -fi -done - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes -else - am_cv_val_LC_MESSAGES=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h - fi - fi - USE_NLS=yes - gt_cv_have_gettext=no - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 @@ -20130,658 +20562,998 @@ $as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - # - # First check in libc - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -return !ngettext ("","", 1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_ngettext_libc=yes -else - gt_cv_func_ngettext_libc=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + LIBINTL= + LTLIBINTL= + POSUB= -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 -$as_echo "$gt_cv_func_ngettext_libc" >&6; } + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code int main () { -return !dgettext ("","") + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes + eval "$gt_func_gnugettext_libc=yes" else - gt_cv_func_dgettext_libc=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -fi -done + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* 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 bindtextdomain (); +#include +#include + int main () { -return bindtextdomain (); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_bindtextdomain=yes -else - ac_cv_lib_intl_bindtextdomain=no + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* 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 ngettext (); +#include +#include + int main () { -return ngettext (); +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes -else - ac_cv_lib_intl_ngettext=no + am_cv_lib_iconv=yes + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS="$am_save_LIBS" + fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* 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" +#include +#include + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const #endif -char dgettext (); + int main () { -return dgettext (); +int result = 0; + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + result |= 16; + return result; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dgettext=yes -else - ac_cv_lib_intl_dgettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -fi + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then +$as_echo "#define HAVE_ICONV 1" >>confdefs.h - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 -$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + fi + if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi -/* 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 ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes -else - ac_cv_lib_intl_ngettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* 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 dcgettext (); -int -main () -{ -return dcgettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dcgettext=yes -else - ac_cv_lib_intl_dcgettext=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -else - : -fi -else - : -fi - fi - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF -fi -done - LIBS="$glib_save_LIBS" - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - if test "$gt_cv_have_gettext" = "yes"; then + use_additional=yes -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi + +fi + + LIBINTL= + LTLIBINTL= + INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi fi - fi + done done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi -fi -done - MSGFMT_OPTS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 -$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF - -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -_ACEOF -if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -echo "$as_me: failed input was:" >&5 -sed 's/^/| /' conftest.foo >&5 -fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code +int +main () +{ - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libintl=yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + eval "$gt_func_gnugettext_libintl=no" fi - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + int main () { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - CATOBJEXT=.gmo - DATADIRNAME=share -else - CATOBJEXT=.mo - DATADIRNAME=lib -fi + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" fi +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi - if test "$gt_cv_have_gettext" = "yes" ; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then $as_echo "#define ENABLE_NLS 1" >>confdefs.h + else + USE_NLS=no fi + fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" + gt_source="libc" fi + else + gt_source="included intl directory" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi - # We need to process the po/ directory. - POSUB=po - - ac_config_commands="$ac_config_commands default-1" - - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + fi +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + fi + POSUB=po + fi + INTLLIBS="$LIBINTL" - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi - - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES avahilocaledir='${prefix}/${DATADIRNAME}/locale' @@ -21241,51 +22013,170 @@ fi ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - found_introspection=yes + found_introspection=yes +else + found_introspection=no +fi + ;; #( + *) : + as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +$as_echo "$found_introspection" >&6; } + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + + + + + + + + + + if test "x$found_introspection" = "xyes"; then + HAVE_INTROSPECTION_TRUE= + HAVE_INTROSPECTION_FALSE='#' +else + HAVE_INTROSPECTION_TRUE='#' + HAVE_INTROSPECTION_FALSE= +fi + + + + +# +# Check for libevent 2.0.21 +# +# Check whether --enable-libevent was given. +if test "${enable_libevent+set}" = set; then : + enableval=$enable_libevent; case "${enableval}" in + yes) HAVE_LIBEVENT=yes ;; + no) HAVE_LIBEVENT=no ;; + *) as_fn_error $? "bad value ${enableval} for --enable-libevent" "$LINENO" 5 ;; + esac +else + HAVE_LIBEVENT=yes +fi + + +if test "x$HAVE_LIBEVENT" = "xyes" ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEVENT" >&5 +$as_echo_n "checking for LIBEVENT... " >&6; } + +if test -n "$LIBEVENT_CFLAGS"; then + pkg_cv_LIBEVENT_CFLAGS="$LIBEVENT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libevent >= 2.0.21 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " libevent >= 2.0.21 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBEVENT_CFLAGS=`$PKG_CONFIG --cflags " libevent >= 2.0.21 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBEVENT_LIBS"; then + pkg_cv_LIBEVENT_LIBS="$LIBEVENT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libevent >= 2.0.21 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " libevent >= 2.0.21 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBEVENT_LIBS=`$PKG_CONFIG --libs " libevent >= 2.0.21 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - found_introspection=no + pkg_failed=yes +fi + else + pkg_failed=untried fi - ;; #( - *) : - as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 -$as_echo "$found_introspection" >&6; } - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBEVENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libevent >= 2.0.21 " 2>&1` + else + LIBEVENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libevent >= 2.0.21 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBEVENT_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements ( libevent >= 2.0.21 ) were not met: +$LIBEVENT_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables LIBEVENT_CFLAGS +and LIBEVENT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables LIBEVENT_CFLAGS +and LIBEVENT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test "x$found_introspection" = "xyes"; then - HAVE_INTROSPECTION_TRUE= - HAVE_INTROSPECTION_FALSE='#' +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - HAVE_INTROSPECTION_TRUE='#' - HAVE_INTROSPECTION_FALSE= + LIBEVENT_CFLAGS=$pkg_cv_LIBEVENT_CFLAGS + LIBEVENT_LIBS=$pkg_cv_LIBEVENT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi +fi + if test "x$HAVE_LIBEVENT" = "xyes"; then + HAVE_LIBEVENT_TRUE= + HAVE_LIBEVENT_FALSE='#' +else + HAVE_LIBEVENT_TRUE='#' + HAVE_LIBEVENT_FALSE= +fi # @@ -21299,7 +22190,7 @@ if test "${enable_qt3+set}" = set; then : *) as_fn_error $? "bad value ${enableval} for --enable-qt3" "$LINENO" 5 ;; esac else - HAVE_QT3=yes + HAVE_QT3=no fi @@ -21469,7 +22360,7 @@ if test "${enable_qt4+set}" = set; then : *) as_fn_error $? "bad value ${enableval} for --enable-qt4" "$LINENO" 5 ;; esac else - HAVE_QT4=yes + HAVE_QT4=no fi @@ -21629,6 +22520,231 @@ fi # +# Check for Qt 5 +# +# Check whether --enable-qt5 was given. +if test "${enable_qt5+set}" = set; then : + enableval=$enable_qt5; case "${enableval}" in + yes) HAVE_QT5=yes ;; + no) HAVE_QT5=no ;; + *) as_fn_error $? "bad value ${enableval} for --enable-qt5" "$LINENO" 5 ;; + esac +else + HAVE_QT5=yes +fi + + +if test "x$HAVE_QT5" = "xyes" ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5 +$as_echo_n "checking for QT5... " >&6; } + +if test -n "$QT5_CFLAGS"; then + pkg_cv_QT5_CFLAGS="$QT5_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags " Qt5Core >= 5.0.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$QT5_LIBS"; then + pkg_cv_QT5_LIBS="$QT5_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs " Qt5Core >= 5.0.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1` + else + QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$QT5_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ( Qt5Core >= 5.0.0 ) were not met: + +$QT5_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables QT5_CFLAGS +and QT5_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables QT5_CFLAGS +and QT5_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + QT5_CFLAGS=$pkg_cv_QT5_CFLAGS + QT5_LIBS=$pkg_cv_QT5_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $QT5_CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works without -fPIC" >&5 +$as_echo_n "checking whether Qt works without -fPIC... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works with -fPIC" >&5 +$as_echo_n "checking whether Qt works with -fPIC... " >&6; } + CPPFLAGS="$CPPFLAGS -fPIC" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + QT5_CFLAGS="$QT5_CFLAGS -fPIC" + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Couldn't compile Qt without -fPIC nor with -fPIC" "$LINENO" 5 + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`" + for ac_prog in moc-qt5 moc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MOC_QT5+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MOC_QT5 in + [\\/]* | ?:[\\/]*) + ac_cv_path_MOC_QT5="$MOC_QT5" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $QT5_PREFIX +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC_QT5="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +MOC_QT5=$ac_cv_path_MOC_QT5 +if test -n "$MOC_QT5"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC_QT5" >&5 +$as_echo "$MOC_QT5" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$MOC_QT5" && break +done +test -n "$MOC_QT5" || MOC_QT5="no" + + if test "$MOC_QT5" = no; then + as_fn_error $? "Could not find QT5 moc" "$LINENO" 5 + fi + +fi + if test "x$HAVE_QT5" = "xyes"; then + HAVE_QT5_TRUE= + HAVE_QT5_FALSE='#' +else + HAVE_QT5_TRUE='#' + HAVE_QT5_FALSE= +fi + + +# # Check for GTK+ 2.0 # # Check whether --enable-gtk was given. @@ -21639,7 +22755,7 @@ if test "${enable_gtk+set}" = set; then : *) as_fn_error $? "bad value ${enableval} for --enable-gtk" "$LINENO" 5 ;; esac else - HAVE_GTK=yes + HAVE_GTK=no fi @@ -22581,7 +23697,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -22977,11 +24093,11 @@ $as_echo "no" >&6; } as_fn_error $? "Could not find Python module socket" "$LINENO" 5 fi - if test "x$HAVE_GDBM" = "xyes"; then + if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then -py_mod_var=`echo gdbm'_' | sed 'y%./+-%__p_%'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module gdbm" >&5 -$as_echo_n "checking for python module gdbm... " >&6; } +py_mod_var=`echo anydbm'_' | sed 'y%./+-%__p_%'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module anydbm" >&5 +$as_echo_n "checking for python module anydbm... " >&6; } if eval \${py_cv_mod_$py_mod_var+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22989,7 +24105,7 @@ else prog=" import sys try: - import gdbm + import anydbm except ImportError: sys.exit(1) except: @@ -23011,11 +24127,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Could not find Python module gdbm" "$LINENO" 5 -fi - fi - if test "x$HAVE_DBM" = "xyes"; then py_mod_var=`echo dbm'_' | sed 'y%./+-%__p_%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbm" >&5 @@ -23052,6 +24164,9 @@ $as_echo "no" >&6; } as_fn_error $? "Could not find Python module dbm" "$LINENO" 5 fi + +fi + fi fi fi @@ -25682,7 +26797,7 @@ 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/suse/Makefile initscript/fedora/Makefile initscript/lfs/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/suse/Makefile initscript/fedora/Makefile initscript/lfs/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 avahi-libevent/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -25897,10 +27012,6 @@ if test -z "${HAVE_KQUEUE_TRUE}" && test -z "${HAVE_KQUEUE_FALSE}"; then as_fn_error $? "conditional \"HAVE_KQUEUE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi - - ac_config_commands="$ac_config_commands po/stamp-it" - - if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then as_fn_error $? "conditional \"HAVE_GLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -25913,6 +27024,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_LIBEVENT_TRUE}" && test -z "${HAVE_LIBEVENT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LIBEVENT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_QT3_TRUE}" && test -z "${HAVE_QT3_FALSE}"; then as_fn_error $? "conditional \"HAVE_QT3\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -25921,6 +27036,10 @@ if test -z "${HAVE_QT4_TRUE}" && test -z "${HAVE_QT4_FALSE}"; then as_fn_error $? "conditional \"HAVE_QT4\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_QT5_TRUE}" && test -z "${HAVE_QT5_FALSE}"; then + as_fn_error $? "conditional \"HAVE_QT5\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then as_fn_error $? "conditional \"HAVE_GTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26490,7 +27609,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by avahi $as_me 0.7, which was +This file was extended by avahi $as_me 0.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26556,7 +27675,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -avahi config.status 0.7 +avahi config.status 0.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -27057,6 +28176,12 @@ fi +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it + # from automake < 1.5. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" _ACEOF @@ -27070,7 +28195,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "avahi-common/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-common/Makefile" ;; "avahi-core/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-core/Makefile" ;; @@ -27108,8 +28233,8 @@ do "avahi-compat-howl/samples/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-compat-howl/samples/Makefile" ;; "avahi-autoipd/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-autoipd/Makefile" ;; "avahi-ui/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-ui/Makefile" ;; + "avahi-libevent/Makefile") CONFIG_FILES="$CONFIG_FILES avahi-libevent/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -28507,29 +29632,120 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; - "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac ;; - "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 - fi - rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" - >"po/stamp-it.tmp" - sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - - sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r po/POTFILES - } - ' "po/Makefile.in" >"po/Makefile" - rm -f "po/Makefile.tmp" - mv "po/stamp-it.tmp" "po/stamp-it" - ;; + "po-directories":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.in. + # Hide the ALL_LINGUAS assignment from automake < 1.5. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + # Compute POFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) + # Compute UPDATEPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) + # Compute DUMMYPOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) + # Compute GMOFILES + # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + UPDATEPOFILES= + DUMMYPOFILES= + GMOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; esac done # for ac_tag @@ -28597,6 +29813,7 @@ echo " Enable python-dbus: ${HAVE_PYTHON_DBUS} Enable QT3: ${HAVE_QT3} Enable QT4: ${HAVE_QT4} + Enable QT5: ${HAVE_QT5} Enable Mono: ${HAVE_MONO} Enable Monodoc: ${HAVE_MONODOC} Distribution/OS: ${with_distro} @@ -28666,6 +29883,7 @@ echo "\ Building avahi-discover-standalone: ${HAVE_GTK2OR3} Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4} + Building libavahi-qt5: ${HAVE_QT5} Building avahi-sharp: ${HAVE_MONO} Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} @@ -28673,4 +29891,5 @@ echo "\ Building avahi-core documentation: ${ENABLE_CORE_DOCS} Building avahi-autoipd: ${ENABLE_AUTOIPD} Building libavahi-ui: ${BUILD_UI} + Building libavahi-libevent: ${HAVE_LIBEVENT} " diff --git a/configure.ac b/configure.ac index 6678971..58db8c7 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # USA. AC_PREREQ(2.63) -AC_INIT([avahi],[0.7],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.8],[avahi (at) lists (dot) freedesktop (dot) org]) AC_CONFIG_SRCDIR([avahi-core/server.c]) AC_CONFIG_MACRO_DIR([common]) AC_CONFIG_HEADERS([config.h]) @@ -27,13 +27,15 @@ AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) AC_SUBST(PACKAGE_URL, [http://avahi.org/]) -AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:3:5]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [7:2:0]) +AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:4:5]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [8:0:1]) AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:9:2]) AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:2:0]) +AC_SUBST(LIBAVAHI_LIBEVENT_VERSION_INFO, [1:0:0]) AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:5:0]) AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0]) AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0]) +AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0]) AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1]) # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour @@ -413,11 +415,11 @@ 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 +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) avahilocaledir='${prefix}/${DATADIRNAME}/locale' AC_SUBST(avahilocaledir) @@ -476,16 +478,35 @@ AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes") GOBJECT_INTROSPECTION_CHECK([0.9.5]) # +# Check for libevent 2.0.21 +# +AC_ARG_ENABLE(libevent, + AS_HELP_STRING([--disable-libevent],[Disable use of libevent]), + [case "${enableval}" in + yes) HAVE_LIBEVENT=yes ;; + no) HAVE_LIBEVENT=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-libevent) ;; + esac], + [HAVE_LIBEVENT=yes]) + +if test "x$HAVE_LIBEVENT" = "xyes" ; then + PKG_CHECK_MODULES(LIBEVENT, [ libevent >= 2.0.21 ]) + AC_SUBST(LIBEVENT_CFLAGS) + AC_SUBST(LIBEVENT_LIBS) +fi +AM_CONDITIONAL(HAVE_LIBEVENT, test "x$HAVE_LIBEVENT" = "xyes") + +# # Check for Qt 3 # AC_ARG_ENABLE(qt3, - AS_HELP_STRING([--disable-qt3],[Disable building of Qt3 mainloop integration]), + AS_HELP_STRING([--enable-qt3],[Enable building of Qt3 mainloop integration]), [case "${enableval}" in yes) HAVE_QT3=yes ;; no) HAVE_QT3=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt3) ;; esac], - [HAVE_QT3=yes]) + [HAVE_QT3=no]) if test "x$HAVE_QT3" = "xyes" ; then PKG_CHECK_MODULES( QT3, [ qt-mt >= 3.0.0 ]) @@ -510,7 +531,7 @@ AC_ARG_ENABLE(qt4, no) HAVE_QT4=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt4) ;; esac], - [HAVE_QT4=yes]) + [HAVE_QT4=no]) if test "x$HAVE_QT4" = "xyes" ; then PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ]) @@ -526,6 +547,32 @@ fi AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes") # +# Check for Qt 5 +# +AC_ARG_ENABLE(qt5, + AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]), + [case "${enableval}" in + yes) HAVE_QT5=yes ;; + no) HAVE_QT5=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;; + esac], + [HAVE_QT5=yes]) + +if test "x$HAVE_QT5" = "xyes" ; then + PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ]) + AC_AVAHI_QT_ADD_PIC_IF_NEEDED + AC_SUBST(QT5_CFLAGS) + AC_SUBST(QT5_LIBS) + QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`" + AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX]) + if test "$MOC_QT5" = no; then + AC_MSG_ERROR([Could not find QT5 moc]) + fi + AC_SUBST(MOC_QT5) +fi +AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes") + +# # Check for GTK+ 2.0 # AC_ARG_ENABLE(gtk, @@ -535,7 +582,7 @@ AC_ARG_ENABLE(gtk, no) HAVE_GTK=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;; esac], - [HAVE_GTK=yes]) + [HAVE_GTK=no]) if test "x$HAVE_GTK" = "xyes" ; then # Check for GTK 2.0 @@ -824,11 +871,10 @@ if test "x$HAVE_PYTHON" = "xyes" ; then fi AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) - if test "x$HAVE_GDBM" = "xyes"; then - AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) - fi - if test "x$HAVE_DBM" = "xyes"; then - AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) + if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then + AM_CHECK_PYMOD(anydbm,,,[ + AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) + ]) fi fi fi @@ -1126,6 +1172,7 @@ avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile avahi-autoipd/Makefile avahi-ui/Makefile +avahi-libevent/Makefile po/Makefile.in ]) AC_OUTPUT @@ -1158,6 +1205,7 @@ echo " Enable python-dbus: ${HAVE_PYTHON_DBUS} Enable QT3: ${HAVE_QT3} Enable QT4: ${HAVE_QT4} + Enable QT5: ${HAVE_QT5} Enable Mono: ${HAVE_MONO} Enable Monodoc: ${HAVE_MONODOC} Distribution/OS: ${with_distro} @@ -1227,6 +1275,7 @@ echo "\ Building avahi-discover-standalone: ${HAVE_GTK2OR3} Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4} + Building libavahi-qt5: ${HAVE_QT5} Building avahi-sharp: ${HAVE_MONO} Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} @@ -1234,4 +1283,5 @@ echo "\ Building avahi-core documentation: ${ENABLE_CORE_DOCS} Building avahi-autoipd: ${ENABLE_AUTOIPD} Building libavahi-ui: ${BUILD_UI} + Building libavahi-libevent: ${HAVE_LIBEVENT} " diff --git a/depcomp b/depcomp index fc98710..b39f98f 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/docs/NEWS b/docs/NEWS index 01ddd5b..f9b38a9 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,3 +1,95 @@ +Avahi 0.8, the 'Dobro Jutro' release +==================================== + +The Avahi 0.8 release brings a number of new features and bug fix changes +including a backward-compatible addition to the D-Bus API and the avahi-core +API. + +The existing API is still fully supported however clients using the new +API will not work with older Avahi releases. The avahi-client library is not +affected. See the "API Changes" section for further details. + +New Features: +- New options for filtering reflected queries between networks (reflect-filter) +- New mainloop integration for Qt5 and libevent +- docs/THREADS: Information for multi-threaded avahi-client apps +- Listen on loopback interfaces by default, allowing local-only services to be + consumed by the local machine +- New D-Bus V2 API and additions to the avahi-core API for splitting "New" + calls into "Prepare" and "Start". See "API Changes" for more details. + +Notable Changes: +- avahi-autoipd: Initial IP selection based on MAC previously ignored first + octet - this will cause all hosts to select a different link-local IP than + previous versions based on the same MAC address +- avahi-daemon: Delay sending results on an object for 10ms in an attempt to + give clients enough time to subscribe to signals from the new object after + receiving it's path in response so the New call. See "API Changes" for more + info + +Bug Fixes: +- avahi-python: Various Python 3 enhancements including encoding unicode + strings as UTF-8 +- avahi-common: avahi_string_list_to_string will now escape embedded quotes, + backslashes and control characters. +- avahi-daemon: Fix a crash when txt records have an empty value in .xml + service files +- avahi-daemon: reflector: do not incorrectly cache responses on outgoing + interfaces. Previously we would incorrectly cache responses reflected from + one interface on the outgoing interface. These responses were later sent to + clients on that network even if the original client had disappeared and could + cause those clients to have a hostname conflict with themselves on restart. + We no longer incorrectly cache such traffic. + +Security Fixes: +- Drop legacy unicast queries from address not on local link which can lead to + UDP traffic amplification attacks (CVE-2017-6519) + +API Changes: The avahi-core API and D-Bus API have implemented a new API where +a call to the "New" method can now be split into a "Prepare" and then "Start" +method for some objects. The previous "New" API is still fully supported and +there is no intention to deprecate it. + +This change affects the the following objects: AsyncAddressResolver, +AsyncHostNameResolver, AsyncServiceResolver, DomainBrowser, RecordBrowser, +ServiceBrowser, ServiceTypeBrowser + +This is because the D-Bus implementation in some languages would only bind to +signals of an object after it was created and had received the new object's +path. This led to such languages missing the initial results sent between the +time the object was created and it had setup a filter to receive it's signals. +This primarily occured in languages that create dynamic bindings for D-Bus +objects using introspection such as Python. The avahi-client C api was not +affected as it globally binds to all avahi signals without specifying +individual object paths and still makes use of the V1 API. + +The v2 Prepare/Start API is available under the new +org.freedesktop.Avahi.Server2 D-Bus interface and also has corresponding +avahi_s_* calls for users of the embedded avahi-core library. + +The old org.freedesktop.Avahi.Server interface is still supported and there is +no intention to remove this API. Additionally this problem has also been solved +for old clients by adding a very small 10ms delay before we start sending +results to give the client time to bind to the signals which should silently +fix the issue in most cases without introducing a noticable or impactful delay. + +Clients implementing the new org.freedesktop.Avahi.Server2 D-Bus interface will +not work with older Avahi daemons. It is suggested that clients may wish to +either check for and fallback to the older API version, or continue to use the +OLD API and rely on the 10ms timer to resolve the issue. + + +Big thank-you to everyone contributing to the project through issues & pull +requests, including the the following people who contributed changes to this +release: Daniel S, David Kerr, Eric Bischoff, James Rudd, Jan Alexander +Steffens (heftig), Karl Cronburg, Krzesimir Nowak, Mario Blättermann, Martin +Blanchard, Michal Sekletar, msk-nightingale, Philip Prindeville, Piotr Drąg, +Rafael Fontenelle, scootergrisen, Simon Lauser, Simon McVittie, Thomas Jollans, +Tony Garnock-Jones, Trent Lloyd, wisd0me, Yclept Nemo, Zlopez, Дамјан +Георгиевски. + +This release is backwards compatible with Avahi 0.6.x and 0.7. + Avahi 0.7, the 'Adieu' release ============================== diff --git a/examples/Makefile.in b/examples/Makefile.in index 3359cf6..3357c9a 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -120,14 +120,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -266,7 +271,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -279,8 +283,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -291,7 +293,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -332,11 +333,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -350,16 +352,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -378,16 +371,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -395,15 +396,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -422,10 +423,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -440,6 +438,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -450,6 +450,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -493,8 +495,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/Makefile.in b/initscript/Makefile.in index 1365e47..599cb4b 100644 --- a/initscript/Makefile.in +++ b/initscript/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -118,14 +118,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -219,7 +224,6 @@ am__relativize = \ done; \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -232,8 +236,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -244,7 +246,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -285,11 +286,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -303,16 +305,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -331,16 +324,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -348,15 +349,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -375,10 +376,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -393,6 +391,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -403,6 +403,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -446,8 +448,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/darwin/Makefile.in b/initscript/darwin/Makefile.in index e3ce6fb..b8f97a8 100644 --- a/initscript/darwin/Makefile.in +++ b/initscript/darwin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/debian/Makefile.in b/initscript/debian/Makefile.in index b412ac9..6bd1e20 100644 --- a/initscript/debian/Makefile.in +++ b/initscript/debian/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/fedora/Makefile.in b/initscript/fedora/Makefile.in index 590e636..1c74024 100644 --- a/initscript/fedora/Makefile.in +++ b/initscript/fedora/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/freebsd/Makefile.in b/initscript/freebsd/Makefile.in index 19078d8..fbcd287 100644 --- a/initscript/freebsd/Makefile.in +++ b/initscript/freebsd/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/gentoo/Makefile.in b/initscript/gentoo/Makefile.in index f2fbb94..ff1d7b1 100644 --- a/initscript/gentoo/Makefile.in +++ b/initscript/gentoo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/lfs/Makefile.in b/initscript/lfs/Makefile.in index 0782702..fc58c1d 100644 --- a/initscript/lfs/Makefile.in +++ b/initscript/lfs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/mandriva/Makefile.in b/initscript/mandriva/Makefile.in index 3b45d2f..4b56aaf 100644 --- a/initscript/mandriva/Makefile.in +++ b/initscript/mandriva/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/slackware/Makefile.in b/initscript/slackware/Makefile.in index 2cb2c85..501a68d 100644 --- a/initscript/slackware/Makefile.in +++ b/initscript/slackware/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/initscript/suse/Makefile.in b/initscript/suse/Makefile.in index 9cbea9f..4a6902d 100644 --- a/initscript/suse/Makefile.in +++ b/initscript/suse/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,14 +110,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,7 +184,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -192,8 +196,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -204,7 +206,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -245,11 +246,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -263,16 +265,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -291,16 +284,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -308,15 +309,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -335,10 +336,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -353,6 +351,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -363,6 +363,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -406,8 +408,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/man/Makefile.in b/man/Makefile.in index 4e0627a..3fce6a1 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -131,14 +131,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -206,7 +211,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -219,8 +223,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -231,7 +233,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -272,11 +273,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -290,16 +292,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -318,16 +311,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -335,15 +336,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -362,10 +363,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -380,6 +378,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -390,6 +390,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -433,8 +435,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8 index 4521116..862d25f 100644 --- a/man/avahi-autoipd.8 +++ b/man/avahi-autoipd.8 @@ -68,7 +68,7 @@ Show help. \fB-v | --version\f1 Show version information. .SH FILES -\fI/usr/local/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost. +\fI/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost. .SH SIGNALS \fISIGINT, SIGTERM\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1) diff --git a/man/avahi-autoipd.action.8 b/man/avahi-autoipd.action.8 index 6f21242..62b14a4 100644 --- a/man/avahi-autoipd.action.8 +++ b/man/avahi-autoipd.action.8 @@ -2,7 +2,7 @@ .SH NAME avahi-autoipd.action \- avahi-autoipd action script .SH SYNOPSIS -\fB/usr/local/etc/avahi/avahi-autoipd.action +\fB/etc/avahi/avahi-autoipd.action \f1 .SH DESCRIPTION \fIavahi-autoipd.action\f1 is the action script that is called whenever an IP address has been acquired by avahi-autoipd or when it detected an IP address conflict. The script should add or remove the specified address from the specified network interface. diff --git a/man/avahi-browse.1 b/man/avahi-browse.1 index b22840a..11d17cb 100644 --- a/man/avahi-browse.1 +++ b/man/avahi-browse.1 @@ -24,7 +24,7 @@ Browse for all service types registered on the LAN, not just the one specified o Browse for browsing domains instead for services. avahi-browse-domains is equivalent to avahi-browse --browse-domains .TP \fB-d | --domain=\f1 \fIDOMAIN\f1 -Browse in the specified domain. If omitted avahi-browse will browse in the default browsing domain (usually .local) +Browse in the specified domain. If omitted avahi-browse will browse in the default browsing domain (usually: local) .TP \fB-v | --verbose\f1 Enable verbose mode. diff --git a/man/avahi-browse.1.xml.in b/man/avahi-browse.1.xml.in index b13d4fc..47067da 100644 --- a/man/avahi-browse.1.xml.in +++ b/man/avahi-browse.1.xml.in @@ -56,7 +56,7 @@

    -d | --domain= DOMAIN

    Browse in the specified domain. If omitted avahi-browse will browse in the default browsing domain - (usually .local)

     + (usually: local)

    + +
    diff --git a/man/avahi-discover.1 b/man/avahi-discover.1 deleted file mode 100644 index 085ff13..0000000 --- a/man/avahi-discover.1 +++ /dev/null @@ -1,16 +0,0 @@ -.TH avahi-discover 1 User Manuals -.SH NAME -avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon -.SH SYNOPSIS -\fBavahi-discover -\f1 -.SH DESCRIPTION -Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. -.SH OPTIONS -avahi-discover takes no command line arguments at the moment. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/man/avahi-dnsconfd.8 b/man/avahi-dnsconfd.8 index 3aeea0d..9415475 100644 --- a/man/avahi-dnsconfd.8 +++ b/man/avahi-dnsconfd.8 @@ -11,7 +11,7 @@ avahi-dnsconfd --refresh\fB avahi-dnsconfd --check\fB \f1 .SH DESCRIPTION -avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/usr/local/etc/avahi/avahi-dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS. +avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/avahi-dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS. .SH OPTIONS .TP \fB-D | --daemonize\f1 @@ -35,7 +35,7 @@ Show help \fB-v | --version\f1 Show version information .SH FILES -\fI/usr/local/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed. +\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed. .SH SIGNALS \fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon. diff --git a/man/avahi-dnsconfd.action.8 b/man/avahi-dnsconfd.action.8 index 9feefd8..3f2f16a 100644 --- a/man/avahi-dnsconfd.action.8 +++ b/man/avahi-dnsconfd.action.8 @@ -2,7 +2,7 @@ .SH NAME avahi-dnsconfd.action \- avahi-dnsconfd action script .SH SYNOPSIS -\fB/usr/local/etc/avahi/avahi-dnsconfd.action +\fB/etc/avahi/avahi-dnsconfd.action \f1 .SH DESCRIPTION \fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration. diff --git a/man/avahi.hosts.5 b/man/avahi.hosts.5 index 832b484..dc4f73f 100644 --- a/man/avahi.hosts.5 +++ b/man/avahi.hosts.5 @@ -2,10 +2,10 @@ .SH NAME avahi.hosts \- avahi-daemon static host name file .SH SYNOPSIS -\fB/usr/local/etc/avahi/hosts +\fB/etc/avahi/hosts \f1 .SH DESCRIPTION -\fI/usr/local/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information. +\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information. The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix. .SH AUTHORS diff --git a/man/avahi.service.5 b/man/avahi.service.5 index c88f82f..2e1f39f 100644 --- a/man/avahi.service.5 +++ b/man/avahi.service.5 @@ -2,10 +2,10 @@ .SH NAME avahi.service \- avahi-daemon static service file .SH SYNOPSIS -\fB/usr/local/etc/avahi/services/*.service +\fB/etc/avahi/services/*.service \f1 .SH DESCRIPTION -\fI/usr/local/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp) +\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp) .SH XML TAGS .TP \fB\f1 The document tag of avahi service files. Should contain one \fB\f1 and one or more \fB\f1 elements. diff --git a/man/bssh.1 b/man/bssh.1 deleted file mode 100644 index 913554e..0000000 --- a/man/bssh.1 +++ /dev/null @@ -1,36 +0,0 @@ -.TH bssh/bvnc/bshell 1 User Manuals -.SH NAME -bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network -.SH SYNOPSIS -\fBbssh - -bvnc - -bshell -\f1 -.SH DESCRIPTION -bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made. - -If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown. -.SH OPTIONS -.TP -\fB-s | --ssh\f1 -Browse for SSH servers (and only SSH servers) regardless under which name the binary is called. -.TP -\fB-v | --vnc\f1 -Browse for VNC servers (and only VNC servers) regardless under which name the binary is called. -.TP -\fB-S | --shell\f1 -Browse for both VNC and SSH servers regardless under which name the binary is called. -.TP -\fB-d | --domain=\f1 \fIDOMAIN\f1 -Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local) -.TP -\fB-h | --help\f1 -Show help. -.SH AUTHORS -The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1 -.SH SEE ALSO -\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1 -.SH COMMENTS -This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/po/ChangeLog b/po/ChangeLog index 73bf5af..ec2b7d4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,4 +1,4 @@ -2017-07-10 gettextize +2020-02-18 gettextize * Makefile.in.in: New file, from gettext-0.19.8.1. * Rules-quot: New file, from gettext-0.19.8.1. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index fcd2c3b..38c293d 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,220 +1,482 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# Copyright (C) 2004-2008 Rodney Dawes +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. # -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE +# Origin: gettext-0.19.8 +GETTEXT_MACRO_VERSION = 0.19 -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -SHELL = @SHELL@ +SED = @SED@ +SHELL = /bin/sh +@SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = @datadir@ datarootdir = @datarootdir@ -libdir = @libdir@ +datadir = @datadir@ localedir = @localedir@ -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. +mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ +mkdir_p = @mkdir_p@ + +# When building gettext-tools, we prefer to use the built programs +# rather than installed programs. However, we can't do that when we +# are cross compiling. +CROSS_COMPILING = @CROSS_COMPILING@ + +GMSGFMT_ = @GMSGFMT@ +GMSGFMT_no = @GMSGFMT@ +GMSGFMT_yes = @GMSGFMT_015@ +GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = @MSGFMT@ +MSGFMT_no = @MSGFMT@ +MSGFMT_yes = @MSGFMT_015@ +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) +XGETTEXT_ = @XGETTEXT@ +XGETTEXT_no = @XGETTEXT@ +XGETTEXT_yes = @XGETTEXT_015@ +XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) +MSGMERGE = msgmerge +MSGMERGE_UPDATE = @MSGMERGE@ --update +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter + +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +POTFILES = \ -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +CATALOGS = @CATALOGS@ -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) -POTFILES = \ -# This comment gets stripped out +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) +# Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) -INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update .po.mo: - $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: - $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ all: all-@USE_NLS@ -all-yes: $(CATALOGS) +all-yes: stamp-po all-no: -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) +# Ensure that the gettext macros and this Makefile.in.in are in sync. +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } + +# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no +# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because +# we don't want to bother translators with empty POT files). We assume that +# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. +# In this case, stamp-po is a nop (i.e. a phony target). + +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ + } + +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +# This target rebuilds $(DOMAIN).pot; it is an expensive operation. +# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ + else \ + package_prefix=''; \ + fi; \ + if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ + msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ + else \ + msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ + fi; \ + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_prefix}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac + test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot-header; then \ + sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ + cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \ + rm -f $(DOMAIN).1po; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ + sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ + if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ + else \ + rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + } + +# This rule has no dependencies: we don't need to update $(DOMAIN).pot at +# every "make" invocation, only create it when it is missing. +# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +# This target rebuilds a PO file if $(DOMAIN).pot has changed. +# Note that a PO file is not touched if it doesn't need to be changed. +$(POFILES): $(POFILESDEPS) + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi + -install: install-data +install: install-exec install-data +install-exec: install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + for file in Makevars; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi install-data-no: all install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ fi; \ - fi; \ + done; \ done -# Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: +install-strip: install -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +installdirs-data-no: +installdirs-data-yes: + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ done -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ +# Define this as empty until I found a useful application. +installcheck: + +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ + for file in $(DISTFILES.common) Makevars.template; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ fi +uninstall-data-no: +uninstall-data-yes: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ + done + +check: all + +info dvi ps pdf html tags TAGS ctags CTAGS ID: mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache + rm -f remove-potcdate.sed + rm -f stamp-poT + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po + rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) + rm -f stamp-po $(GMOFILES) + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: stamp-po $(DISTFILES) dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + if test "$(PACKAGE)" = "gettext-tools"; then \ + dists="$$dists Makevars.template"; \ + fi; \ + if test -f $(srcdir)/$(DOMAIN).pot; then \ + dists="$$dists $(DOMAIN).pot stamp-po"; \ + fi; \ + if test -f $(srcdir)/ChangeLog; then \ + dists="$$dists ChangeLog"; \ + fi; \ + for i in 0 1 2 3 4 5 6 7 8 9; do \ + if test -f $(srcdir)/ChangeLog.$$i; then \ + dists="$$dists ChangeLog.$$i"; \ + fi; \ done; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ + if test -f $$file; then \ + cp -p $$file $(distdir) || exit 1; \ + else \ + cp -p $(srcdir)/$$file $(distdir) || exit 1; \ + fi; \ done update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot + $(MAKE) $(DOMAIN).pot-update + test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for creating PO files. + +.nop.po-create: + @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ + echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ + exit 1 + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ + else \ + echo "msgmerge for $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ fi -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in +$(DUMMYPOFILES): + +update-gmo: Makefile $(GMOFILES) + @: + +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. +Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status + && @SHELL@ ./config.status $(subdir)/$@.in po-directories + +force: # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..03f5643 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,78 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --add-comments + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = The Avahi developers. + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = https://github.com/lathiat/avahi/issues + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = yes + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = no + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = no diff --git a/po/POTFILES.in b/po/POTFILES.in index ea5f64d..cb46900 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files which contain translatable strings. avahi-common/error.c -[type: gettext/glade]avahi-discover-standalone/avahi-discover.ui +avahi-discover-standalone/avahi-discover.ui avahi-python/avahi-discover/avahi-discover.desktop.in.in avahi-python/avahi-discover/avahi-discover.py avahi-ui/avahi-ui.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip deleted file mode 100644 index 7ee0ef4..0000000 --- a/po/POTFILES.skip +++ /dev/null @@ -1,4 +0,0 @@ -avahi-ui/bssh.desktop.in -avahi-ui/bvnc.desktop.in -tests/c-plus-plus-test-gen.py -avahi-python/avahi-discover/avahi-discover.desktop.in diff --git a/po/Rules-quot b/po/Rules-quot new file mode 100644 index 0000000..baf6528 --- /dev/null +++ b/po/Rules-quot @@ -0,0 +1,58 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. +# Special Makefile rules for English message catalogs with quotation marks. + +DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot + +.SUFFIXES: .insert-header .po-update-en + +en@quot.po-create: + $(MAKE) en@quot.po-update +en@boldquot.po-create: + $(MAKE) en@boldquot.po-update + +en@quot.po-update: en@quot.po-update-en +en@boldquot.po-update: en@boldquot.po-update-en + +.insert-header.po-update-en: + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ + if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + ll=`echo $$lang | sed -e 's/@.*//'`; \ + LC_ALL=C; export LC_ALL; \ + cd $(srcdir); \ + if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "creation of $$lang.po failed!" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi + +en@quot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header + +en@boldquot.insert-header: insert-header.sin + sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header + +mostlyclean: mostlyclean-quot +mostlyclean-quot: + rm -f *.insert-header diff --git a/po/ach.gmo b/po/ach.gmo new file mode 100644 index 0000000000000000000000000000000000000000..1f96cd0907bb7130833a39ab8a94d2dc0d1785bb GIT binary patch literal 412 zcmYL^-%i3X6vi=nwM(zPI2T?(v~-&{P=q*TBqW;>7~Yprwwlo{ZTaJa_tQF;1gt@)V87^LVisp;Z+-UI>y2zQy&qt|YWe=W0gj;c)1>W{lj3V>j1Z zS_!4Nag;YPY4zVsd0x`aX%+*ly>yz!=YIuV-+R%@35Cf%YmDy1(b2l%QVk$4xv|0x zm)V5$&c0^#Mi>&ST(6}n81z=sd9!L~cts}KY%K#-|CV+b4&d)PY%3T+&>48GA4p4f A-T(jq literal 0 HcmV?d00001 diff --git a/po/ar.gmo b/po/ar.gmo new file mode 100644 index 0000000000000000000000000000000000000000..bbe276357061642d60700abf464f4959b2dcbba0 GIT binary patch literal 6907 zcmai$dyE}b9mfw3d8~knilV3ousq#YOQF4V3w_#3U$k35B;fSk+1;`C&MY%?`yeE` z?QXlYF;Np^h(?84T9$6xrKPw8^^YcCjEO<{V=fX=Oc2tT82Q6L${&8dGjnHm?-rfi zb3f;Oe&_d^`OB3T{?PC|M7f6Y!TH8~8@~Awet43Ljky9g;Fa)QI0v4Em&0o>F@~z? zgqn8;r!PlYodkcON{u6!%p2y|~`8d3m_K%>2lTiD;0r@xo=12GV0DcT!hY*ruEhtJqkY!pM;Y47?k{{;V0m0Q0xDmx6eZ9=W;Hs`PaZN!Y-)(^-$+L45g<>q1Nxo z+dqY<#GJ_6FX!#opyYW2UI@>?tKh%j4e(-=qx*J1$+sZqN{FdVFVw#GL+$fTsC^!V z(!(}*HQWR5gg=Lp`%TEdIm?gsy@VgNuYzh{&(8(08*2agP;xBJ+pFO9wC{zoLmkRr zehhDezlJx#_j6u@k|fUxDE)1QlGn@mSkC=W^8X}nKLt^}c^=B8e+4DiX?XfPV_t>Q z*M2sW|33|Hguj70=O0k(&qC?pB8*GbSokH_4Q20p`S~&|!yY&aF@bpnN-uwevgcb+ z=lutM9$tabExZNl{Cl9z9e`T*IFz3~0cFphL7npoyaS$rx4`RJBze|Bt@rs^2zNnL zXkLbr`*%=s{2AT_--n8mc{rWoXLHU$Xld_<+V=>Qe7}dX+k5b4csatU{|+d>=!LRp z1n0viq3-*Ky#F1j^_S7v4!fY{KMdt3!%%krF4X-`!7sqmQ1SjZD0$w6lK&Deqx`T6 zqEh4JjG*i`0wve?AphnVKicrVYRm{kWbYZ{_p4pPp3|s|t^NL4F|HDn1{eET!mfiz#y{D=D(M z?s*SI@uj=oLLm&y-IUuXdLGJ7*0MOvt0^|}E1S!{(;wMa?=Jbjd`oteudk;pp~%nl$baNp%?DREU3r7B zE1qxUwXeW+lnW{6Qxun`WS3N{wl4^+A8c=QrnLJF#n)hQap8wVQGYdUp=GQL|HmKj?-*Iq>_M zGDgr#oe;YH9wyKGR|Qd=%4X7;(V9mULG&~4d$&?#?qr$m^h z+G5dQ7{oYd)kgTb*XNaI$``ujAgmO#v!>nZ?ku{RaW_N6W@l925)%!xCTE?5RBbTc zY1RZ~r<&doHCL-%Bn_!ERn=Pj7ndml-mH_di1>0)t2sVFm`R?-i4sBGi__4`L&_Fc zETWFpF)5|)SJE1Kt9db*B5g(WK`DyX`g_d!O*S>QS>IG{Gki8M$82mu?igkJepfbXz#GZt3N*xy3D$@FheAyE#ObBy2jGyss%h zt9oZll;?f;M6c!sb@HLBcTC0f27$%JcG_k%lSYcZa@8Zgqp1$1Hjm6-%*ZZHhqQm6 z8_KV3&5JN~dB8l9rB@~TEDZck$7~1#DXM*Sr9EH3`)`{w;I(aZ<(2JgqkgZ#>!?3! z?+r?}ZNvKZjqbKIWZE&MTe5Szy63fbcel^&vRw;H^B3IO#nZONiQ@L&(D9?H69=Tw zS}@=cKcw>N0M~PTyQrpWt^4kQAm%kw?I6Gwv(WFaJN<5Zuj|whCUmxVWqZ>=91oT{ zJGXD&-Vtk8ug~3~1)Wvb_nk2AB-jSL&T788(+N9oF7_&+(6+U!*RGhlWOqkb8?Ue! zCALdnB^$dt;?BXUx_s5?27oJhtRdm2N@v1E*9 zW4N)K&Xegk42==n*vEtsn~Wvn$uSzoY;u&!Nb+p<6_ZS`_*AxZGw6tlplMFK17}3rrIC-4aG8ZzBC5O`mTQ zb~R-kN&WKpjH#KpY`~fm?9Q5OeEKCvl2Z%}VIplc-A+@A$md`P#6?fi;K9`V`Z8nX z-bU(UsokYH+?n(Ca+8wDzsj0En%OiNPyLZg>+W1cH-FwXRZedfV3=(bHK38q!<(z+ zY%F4l6oi@-3@vk}Mb@k#c2!)w*gBwnQ-zTOM$yZjb52M#BZFyf>kJ)>&oO*Xsi*l@ zq1KsqGc5fDUXjPjlrCHDCs|Xk<|5}l3OUA;=RZu6Nfb+hlD+UAIFuZpb(z#KhtfPy z*yJ#(AI0jUsghnk^2o$xAr2BAn{s%)3%~=)h4^$+G~|HM5KG5>WDH8aLAG;ds+~k2A8H zjWku4GSan0%GS5U0gN<3qLk+_j(U&CHnTLHXIip_EXIL{F+FSZtUPmnq$8U=$7T~I zS29x(gC629Qz<=@5+^x^-!Xt2C^2Ud#Ua0>C(DN%a#D*L!+Abz-m-AQrb1F3w7g45 zTGM)H*-RxsO3AX2<-L`T6xMAz9W!{PW~pF|1-n@N42ncsyGTpgjWrXv9T~JK2N%yh zoQh@>^Slsr9#%?qCQXh?N7>t`)$!PAwlnfRP}-mAQ0MB?ds?^Kle|!TqZ_0}?9_bu zM+C$9Owt%%2&j1PjO0~Bf$o?pGLx!M+fy$Qf$&@>HDZNh8z!i_9NQ{m4OH&ChyD}p1p52`qU;=Mv+EMn9oU@jv`e*0`eO9&Z oo!`PF2N~xqrRpM@__E=IUFH!?oPOo#t=P;h61bQtos66R0!XV)8vp, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: avahi 0.8\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2020-02-18 07:03+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: avahi-common/error.c:30 +msgid "OK" +msgstr "" + +#: avahi-common/error.c:31 +msgid "Operation failed" +msgstr "" + +#: avahi-common/error.c:32 +msgid "Bad state" +msgstr "" + +#: avahi-common/error.c:33 +msgid "Invalid host name" +msgstr "" + +#: avahi-common/error.c:34 +msgid "Invalid domain name" +msgstr "" + +#: avahi-common/error.c:35 +msgid "No suitable network protocol available" +msgstr "" + +#: avahi-common/error.c:36 +msgid "Invalid DNS TTL" +msgstr "" + +#: avahi-common/error.c:37 +msgid "Resource record key is pattern" +msgstr "" + +#: avahi-common/error.c:38 +msgid "Local name collision" +msgstr "" + +#: avahi-common/error.c:39 +msgid "Invalid record" +msgstr "" + +#: avahi-common/error.c:41 +msgid "Invalid service name" +msgstr "" + +#: avahi-common/error.c:42 +msgid "Invalid service type" +msgstr "" + +#: avahi-common/error.c:43 +msgid "Invalid port number" +msgstr "" + +#: avahi-common/error.c:44 +msgid "Invalid record key" +msgstr "" + +#: avahi-common/error.c:45 +msgid "Invalid address" +msgstr "" + +#: avahi-common/error.c:46 +msgid "Timeout reached" +msgstr "" + +#: avahi-common/error.c:47 +msgid "Too many clients" +msgstr "" + +#: avahi-common/error.c:48 +msgid "Too many objects" +msgstr "" + +#: avahi-common/error.c:49 +msgid "Too many entries" +msgstr "" + +#: avahi-common/error.c:50 +msgid "OS Error" +msgstr "" + +#: avahi-common/error.c:52 +msgid "Access denied" +msgstr "" + +#: avahi-common/error.c:53 +msgid "Invalid operation" +msgstr "" + +#: avahi-common/error.c:54 +msgid "An unexpected D-Bus error occurred" +msgstr "" + +#: avahi-common/error.c:55 +msgid "Daemon connection failed" +msgstr "" + +#: avahi-common/error.c:56 +msgid "Memory exhausted" +msgstr "" + +#: avahi-common/error.c:57 +msgid "The object passed in was not valid" +msgstr "" + +#: avahi-common/error.c:58 +msgid "Daemon not running" +msgstr "" + +#: avahi-common/error.c:59 +msgid "Invalid interface index" +msgstr "" + +#: avahi-common/error.c:60 +msgid "Invalid protocol specification" +msgstr "" + +#: avahi-common/error.c:61 +msgid "Invalid flags" +msgstr "" + +#: avahi-common/error.c:63 +msgid "Not found" +msgstr "" + +#: avahi-common/error.c:64 +msgid "Invalid configuration" +msgstr "" + +#: avahi-common/error.c:65 +msgid "Version mismatch" +msgstr "" + +#: avahi-common/error.c:66 +msgid "Invalid service subtype" +msgstr "" + +#: avahi-common/error.c:67 +msgid "Invalid packet" +msgstr "" + +#: avahi-common/error.c:68 +msgid "Invalid DNS return code" +msgstr "" + +#: avahi-common/error.c:69 +msgid "DNS failure: FORMERR" +msgstr "" + +#: avahi-common/error.c:70 +msgid "DNS failure: SERVFAIL" +msgstr "" + +#: avahi-common/error.c:71 +msgid "DNS failure: NXDOMAIN" +msgstr "" + +#: avahi-common/error.c:72 +msgid "DNS failure: NOTIMP" +msgstr "" + +#: avahi-common/error.c:74 +msgid "DNS failure: REFUSED" +msgstr "" + +#: avahi-common/error.c:75 +msgid "DNS failure: YXDOMAIN" +msgstr "" + +#: avahi-common/error.c:76 +msgid "DNS failure: YXRRSET" +msgstr "" + +#: avahi-common/error.c:77 +msgid "DNS failure: NXRRSET" +msgstr "" + +#: avahi-common/error.c:78 +msgid "DNS failure: NOTAUTH" +msgstr "" + +#: avahi-common/error.c:79 +msgid "DNS failure: NOTZONE" +msgstr "" + +#: avahi-common/error.c:80 +msgid "Invalid RDATA" +msgstr "" + +#: avahi-common/error.c:81 +msgid "Invalid DNS type" +msgstr "" + +#: avahi-common/error.c:82 +msgid "Invalid DNS class" +msgstr "" + +#: avahi-common/error.c:83 +msgid "Not supported" +msgstr "" + +#: avahi-common/error.c:85 +msgid "Not permitted" +msgstr "" + +#: avahi-common/error.c:86 +msgid "Invalid argument" +msgstr "" + +#: avahi-common/error.c:87 +msgid "Is empty" +msgstr "" + +#: avahi-common/error.c:88 +msgid "The requested operation is invalid because redundant" +msgstr "" + +#: avahi-common/error.c:94 +msgid "Invalid Error Code" +msgstr "" + +#: avahi-discover-standalone/avahi-discover.ui:6 +msgid "Avahi Discovery" +msgstr "" + +#: avahi-discover-standalone/avahi-discover.ui:60 +#: avahi-python/avahi-discover/avahi-discover.py:83 +msgid "No service currently selected." +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:4 +msgid "Avahi Zeroconf Browser" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:5 +msgid "Browse for Zeroconf services available on your network" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:9 +#: avahi-ui/bssh.desktop.in.in:9 avahi-ui/bvnc.desktop.in.in:9 +msgid "network-wired" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:238 +msgid "TXT" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:240 +msgid "TXT Data:" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:240 +msgid "empty" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:242 +msgid "Service Type:" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:243 +msgid "Service Name:" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:244 +msgid "Domain Name:" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:245 +msgid "Interface:" +msgstr "" + +#: avahi-python/avahi-discover/avahi-discover.py:246 +msgid "Address:" +msgstr "" + +#: avahi-ui/avahi-ui.c:185 +msgid "Browse Service Types" +msgstr "" + +#: avahi-ui/avahi-ui.c:185 +msgid "A NULL terminated list of service types to browse for" +msgstr "" + +#: avahi-ui/avahi-ui.c:190 +msgid "Domain" +msgstr "" + +#: avahi-ui/avahi-ui.c:190 +msgid "The domain to browse in, or NULL for the default domain" +msgstr "" + +#: avahi-ui/avahi-ui.c:196 +msgid "Service Type" +msgstr "" + +#: avahi-ui/avahi-ui.c:196 +msgid "The service type of the selected service" +msgstr "" + +#: avahi-ui/avahi-ui.c:202 avahi-ui/avahi-ui.c:1035 +msgid "Service Name" +msgstr "" + +#: avahi-ui/avahi-ui.c:202 +msgid "The service name of the selected service" +msgstr "" + +#: avahi-ui/avahi-ui.c:208 +msgid "Address" +msgstr "" + +#: avahi-ui/avahi-ui.c:208 +msgid "The address of the resolved service" +msgstr "" + +#: avahi-ui/avahi-ui.c:213 +msgid "Port" +msgstr "" + +#: avahi-ui/avahi-ui.c:213 +msgid "The IP port number of the resolved service" +msgstr "" + +#: avahi-ui/avahi-ui.c:219 +msgid "Host Name" +msgstr "" + +#: avahi-ui/avahi-ui.c:219 +msgid "The host name of the resolved service" +msgstr "" + +#: avahi-ui/avahi-ui.c:225 +msgid "TXT Data" +msgstr "" + +#: avahi-ui/avahi-ui.c:225 +msgid "The TXT data of the resolved service" +msgstr "" + +#: avahi-ui/avahi-ui.c:230 +msgid "Resolve Service" +msgstr "" + +#: avahi-ui/avahi-ui.c:230 +msgid "Resolve the selected service automatically before returning" +msgstr "" + +#: avahi-ui/avahi-ui.c:236 +msgid "Resolve Service Host Name" +msgstr "" + +#: avahi-ui/avahi-ui.c:236 +msgid "" +"Resolve the host name of the selected service automatically before returning" +msgstr "" + +#: avahi-ui/avahi-ui.c:242 +msgid "Address family" +msgstr "" + +#: avahi-ui/avahi-ui.c:242 +msgid "The address family for host name resolution" +msgstr "" + +#: avahi-ui/avahi-ui.c:326 +#, c-format +msgid "Avahi client failure: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:388 +#, c-format +msgid "Avahi resolver failure: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:518 +#, c-format +msgid "Browsing for service type %s in domain %s failed: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:519 avahi-utils/avahi-browse.c:168 +#: avahi-utils/avahi-browse.c:169 avahi-utils/avahi-browse.c:178 +#: avahi-utils/avahi-browse.c:179 +msgid "n/a" +msgstr "" + +#: avahi-ui/avahi-ui.c:649 +#, c-format +msgid "Avahi domain browser failure: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:684 +#, c-format +msgid "Failed to read Avahi domain: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:706 +msgid "Browse service type list is empty!" +msgstr "" + +#: avahi-ui/avahi-ui.c:717 +#, c-format +msgid "Failed to connect to Avahi server: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:735 +msgid "Browsing for services on local network:" +msgstr "" + +#: avahi-ui/avahi-ui.c:737 +#, c-format +msgid "Browsing for services in domain %s:" +msgstr "" + +#: avahi-ui/avahi-ui.c:773 +#, c-format +msgid "Failed to create browser for %s: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:907 +#, c-format +msgid "Failed to create resolver for %s of type %s in domain %s: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:982 +#, c-format +msgid "Failed to create domain browser: %s" +msgstr "" + +#: avahi-ui/avahi-ui.c:993 +msgid "Change domain" +msgstr "" + +#: avahi-ui/avahi-ui.c:1043 avahi-ui/avahi-ui.c:1180 +msgid "Browsing..." +msgstr "" + +#: avahi-ui/avahi-ui.c:1047 avahi-ui/bssh.c:149 avahi-ui/bssh.c:156 +#: avahi-ui/bssh.c:161 +msgid "_Cancel" +msgstr "" + +#: avahi-ui/avahi-ui.c:1048 +msgid "_OK" +msgstr "" + +#: avahi-ui/avahi-ui.c:1134 +msgid "Initializing..." +msgstr "" + +#: avahi-ui/avahi-ui.c:1162 +msgid "Location" +msgstr "" + +#: avahi-ui/avahi-ui.c:1167 avahi-utils/avahi-browse.c:553 +msgid "Name" +msgstr "" + +#: avahi-ui/avahi-ui.c:1172 avahi-utils/avahi-browse.c:553 +msgid "Type" +msgstr "" + +#: avahi-ui/avahi-ui.c:1184 +msgid "_Domain..." +msgstr "" + +#: avahi-ui/bssh.c:55 +#, c-format +msgid "" +"%s [options]\n" +"\n" +" -h --help Show this help\n" +" -s --ssh Browse SSH servers\n" +" -v --vnc Browse VNC servers\n" +" -S --shell Browse both SSH and VNC\n" +" -d --domain=DOMAIN The domain to browse in\n" +msgstr "" + +#: avahi-ui/bssh.c:101 avahi-utils/avahi-browse.c:775 +#, c-format +msgid "Too many arguments\n" +msgstr "" + +#: avahi-ui/bssh.c:149 +msgid "Choose Shell Server" +msgstr "" + +#: avahi-ui/bssh.c:149 avahi-ui/bssh.c:156 avahi-ui/bssh.c:161 +msgid "C_onnect" +msgstr "" + +#: avahi-ui/bssh.c:151 +msgid "Desktop" +msgstr "" + +#: avahi-ui/bssh.c:152 +msgid "Terminal" +msgstr "" + +#: avahi-ui/bssh.c:156 +msgid "Choose VNC server" +msgstr "" + +#: avahi-ui/bssh.c:161 +msgid "Choose SSH server" +msgstr "" + +#: avahi-ui/bssh.c:185 +#, c-format +msgid "Connecting to '%s' ...\n" +msgstr "" + +#: avahi-ui/bssh.c:240 +#, c-format +msgid "execlp() failed: %s\n" +msgstr "" + +#: avahi-ui/bssh.c:250 +msgid "Canceled.\n" +msgstr "" + +#: avahi-ui/bssh.desktop.in.in:4 +msgid "Avahi SSH Server Browser" +msgstr "" + +#: avahi-ui/bssh.desktop.in.in:5 +msgid "Browse for Zeroconf-enabled SSH Servers" +msgstr "" + +#: avahi-ui/bvnc.desktop.in.in:4 +msgid "Avahi VNC Server Browser" +msgstr "" + +#: avahi-ui/bvnc.desktop.in.in:5 +msgid "Browse for Zeroconf-enabled VNC Servers" +msgstr "" + +#: avahi-utils/avahi-browse.c:107 +#, c-format +msgid ": All for now\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:118 +#, c-format +msgid ": Cache exhausted\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:239 avahi-utils/avahi-browse.c:261 +#, c-format +msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:340 +#, c-format +msgid "service_browser failed: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:378 +#, c-format +msgid "avahi_service_browser_new() failed: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:414 +#, c-format +msgid "service_type_browser failed: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:444 +#, c-format +msgid "avahi_service_type_browser_new() failed: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:519 +#, c-format +msgid "avahi_domain_browser_new() failed: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:535 avahi-utils/avahi-publish.c:394 +#: avahi-utils/avahi-resolve.c:280 avahi-utils/avahi-set-host-name.c:168 +#, c-format +msgid "Failed to query version string: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:540 avahi-utils/avahi-publish.c:399 +#: avahi-utils/avahi-resolve.c:285 avahi-utils/avahi-set-host-name.c:173 +#: avahi-utils/avahi-set-host-name.c:189 +#, c-format +msgid "Failed to query host name: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:544 avahi-utils/avahi-publish.c:403 +#: avahi-utils/avahi-resolve.c:289 avahi-utils/avahi-set-host-name.c:177 +#, c-format +msgid "Server version: %s; Host name: %s\n" +msgstr "" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: avahi-utils/avahi-browse.c:549 +#, c-format +msgid "E Ifce Prot Domain\n" +msgstr "" + +#. Translators: This is a column heading with abbreviations for +#. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain +#: avahi-utils/avahi-browse.c:553 +#, c-format +msgid "E Ifce Prot %-*s %-20s Domain\n" +msgstr "" + +#. We have been disconnected, so let reconnect +#: avahi-utils/avahi-browse.c:585 avahi-utils/avahi-publish.c:163 +#, c-format +msgid "Disconnected, reconnecting ...\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:599 avahi-utils/avahi-browse.c:829 +#: avahi-utils/avahi-publish.c:170 avahi-utils/avahi-publish.c:386 +#: avahi-utils/avahi-resolve.c:272 avahi-utils/avahi-set-host-name.c:160 +#, c-format +msgid "Failed to create client object: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:604 avahi-utils/avahi-publish.c:175 +#: avahi-utils/avahi-resolve.c:143 avahi-utils/avahi-set-host-name.c:59 +#, c-format +msgid "Client failure, exiting: %s\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:623 avahi-utils/avahi-publish.c:206 +#, c-format +msgid "Waiting for daemon ...\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:647 +msgid "" +" -h --help Show this help\n" +" -V --version Show version\n" +" -D --browse-domains Browse for browsing domains instead of services\n" +" -a --all Show all services, regardless of the type\n" +" -d --domain=DOMAIN The domain to browse in\n" +" -v --verbose Enable verbose mode\n" +" -t --terminate Terminate after dumping a more or less complete " +"list\n" +" -c --cache Terminate after dumping all entries from the cache\n" +" -l --ignore-local Ignore local services\n" +" -r --resolve Resolve services found\n" +" -f --no-fail Don't fail if the daemon is not available\n" +" -p --parsable Output in parsable format\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:660 +msgid "" +" -k --no-db-lookup Don't lookup service types\n" +" -b --dump-db Dump service type database\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:766 avahi-utils/avahi-resolve.c:219 +#, c-format +msgid "Too few arguments\n" +msgstr "" + +#: avahi-utils/avahi-browse.c:821 avahi-utils/avahi-publish.c:378 +#: avahi-utils/avahi-resolve.c:264 avahi-utils/avahi-set-host-name.c:152 +#, c-format +msgid "Failed to create simple poll object.\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:76 +#, c-format +msgid "Established under name '%s'\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:81 +#, c-format +msgid "Failed to register: %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:94 +#, c-format +msgid "Name collision, picking new name '%s'.\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:114 +#, c-format +msgid "Failed to create entry group: %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:124 +#, c-format +msgid "Failed to add address: %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:134 +#, c-format +msgid "Failed to add service: %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:140 +#, c-format +msgid "Failed to add subtype '%s': %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:191 +#, c-format +msgid "Host name conflict\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:216 +#, c-format +msgid "" +"%s [options] %s []\n" +"%s [options] %s
    \n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -s --service Publish service\n" +" -a --address Publish address\n" +" -v --verbose Enable verbose mode\n" +" -d --domain=DOMAIN Domain to publish service in\n" +" -H --host=DOMAIN Host where service resides\n" +" --subtype=SUBTYPE An additional subtype to register this service " +"with\n" +" -R --no-reverse Do not publish reverse entry with address\n" +" -f --no-fail Don't fail if the daemon is not available\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:303 avahi-utils/avahi-publish.c:318 +#, c-format +msgid "Bad number of arguments\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:329 +#, c-format +msgid "Failed to parse port number: %s\n" +msgstr "" + +#: avahi-utils/avahi-publish.c:361 avahi-utils/avahi-resolve.c:246 +#, c-format +msgid "No command specified.\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:89 +#, c-format +msgid "Failed to resolve host name '%s': %s\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:126 +#, c-format +msgid "Failed to resolve address '%s': %s\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:157 +#, c-format +msgid "" +"%s [options] %s \n" +"%s [options] %s
    \n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -n --name Resolve host name\n" +" -a --address Resolve address\n" +" -v --verbose Enable verbose mode\n" +" -6 Lookup IPv6 address\n" +" -4 Lookup IPv4 address\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:299 avahi-utils/avahi-set-host-name.c:181 +#, c-format +msgid "Failed to create host name resolver: %s\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:309 +#, c-format +msgid "Failed to parse address '%s'\n" +msgstr "" + +#: avahi-utils/avahi-resolve.c:314 +#, c-format +msgid "Failed to create address resolver: %s\n" +msgstr "" + +#: avahi-utils/avahi-set-host-name.c:73 +#, c-format +msgid "" +"%s [options] \n" +"\n" +" -h --help Show this help\n" +" -V --version Show version\n" +" -v --verbose Enable verbose mode\n" +msgstr "" + +#: avahi-utils/avahi-set-host-name.c:114 +#, c-format +msgid "Invalid number of arguments, expecting exactly one.\n" +msgstr "" + +#: avahi-utils/avahi-set-host-name.c:193 +#, c-format +msgid "Host name successfully changed to %s\n" +msgstr "" diff --git a/po/bg.gmo b/po/bg.gmo new file mode 100644 index 0000000000000000000000000000000000000000..3669d2021d67f90ff286745586b4549ab548c169 GIT binary patch literal 21435 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 ZZ!2q3U~5\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2019-02-10 15:24+0000\n" +"PO-Revision-Date: 2019-02-11 02:31+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/lennart/avahi/language/da/)\n" "Language: da\n" "MIME-Version: 1.0\n" @@ -19,7 +18,7 @@ msgstr "" #: ../avahi-common/error.c:30 msgid "OK" -msgstr "O.k." +msgstr "OK" #: ../avahi-common/error.c:31 msgid "Operation failed" @@ -95,7 +94,7 @@ msgstr "For mange punkter" #: ../avahi-common/error.c:50 msgid "OS Error" -msgstr "OS-fejl" +msgstr "Fejl ved OS" #: ../avahi-common/error.c:52 msgid "Access denied" @@ -107,11 +106,11 @@ msgstr "Ugyldig handling" #: ../avahi-common/error.c:54 msgid "An unexpected D-Bus error occurred" -msgstr "Der opstod en uventet D-Bus-fejl" +msgstr "Der opstod en uventet fejl ved D-Bus" #: ../avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "Dæmonforbindelse mislykkedes" +msgstr "Forbindelse til dæmon mislykkedes" #: ../avahi-common/error.c:56 msgid "Memory exhausted" @@ -163,47 +162,47 @@ msgstr "Ugyldig DNS-returkode" #: ../avahi-common/error.c:69 msgid "DNS failure: FORMERR" -msgstr "DNS-fejl: FORMERR" +msgstr "Fejl ved DNS: FORMERR" #: ../avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" -msgstr "DNS-fejl: SERVFAIL" +msgstr "Fejl ved DNS: SERVFAIL" #: ../avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" -msgstr "DNS-fejl: NXDOMAIN" +msgstr "Fejl ved DNS: NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" -msgstr "DNS-fejl: NOTIMP" +msgstr "Fejl ved DNS: NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" -msgstr "DNS-fejl: REFUSED" +msgstr "Fejl ved DNS: REFUSED" #: ../avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" -msgstr "DNS-fejl: YXDOMAIN" +msgstr "Fejl ved DNS: YXDOMAIN" #: ../avahi-common/error.c:76 msgid "DNS failure: YXRRSET" -msgstr "DNS-fejl: YXRRSET" +msgstr "Fejl ved DNS: YXRRSET" #: ../avahi-common/error.c:77 msgid "DNS failure: NXRRSET" -msgstr "DNS-fejl: NXRRSET" +msgstr "Fejl ved DNS: NXRRSET" #: ../avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" -msgstr "DNS-fejl: NOTAUTH" +msgstr "Fejl ved DNS: NOTAUTH" #: ../avahi-common/error.c:79 msgid "DNS failure: NOTZONE" -msgstr "DNS-fejl: NOTZONE" +msgstr "Fejl ved DNS: NOTZONE" #: ../avahi-common/error.c:80 msgid "Invalid RDATA" -msgstr "Ugyldige RDATA" +msgstr "Ugyldig RDATA" #: ../avahi-common/error.c:81 msgid "Invalid DNS type" @@ -239,10 +238,10 @@ msgstr "Ugyldig fejlkode" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 msgid "Avahi Discovery" -msgstr "Avahi Discovery" +msgstr "Avahi Opdagelse" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 -#: ../avahi-python/avahi-discover/avahi-discover.py:76 +#: ../avahi-python/avahi-discover/avahi-discover.py:82 msgid "No service currently selected." msgstr "Ingen tjeneste valgt i øjeblikket." @@ -252,47 +251,47 @@ msgstr "Avahi Zeroconf-browser" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 msgid "Browse for Zeroconf services available on your network" -msgstr "Kig efter tilgængelige Zeroconftjenester på dit netværk" +msgstr "Find Zeroconf-tjenester på dit netværk" -#: ../avahi-python/avahi-discover/avahi-discover.py:224 +#: ../avahi-python/avahi-discover/avahi-discover.py:237 msgid "TXT" msgstr "TXT" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "TXT Data:" msgstr "TXT-data:" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "empty" msgstr "tom" -#: ../avahi-python/avahi-discover/avahi-discover.py:228 +#: ../avahi-python/avahi-discover/avahi-discover.py:241 msgid "Service Type:" msgstr "Tjenestetype:" -#: ../avahi-python/avahi-discover/avahi-discover.py:229 +#: ../avahi-python/avahi-discover/avahi-discover.py:242 msgid "Service Name:" msgstr "Tjenestenavn:" -#: ../avahi-python/avahi-discover/avahi-discover.py:230 +#: ../avahi-python/avahi-discover/avahi-discover.py:243 msgid "Domain Name:" msgstr "Domænenavn:" -#: ../avahi-python/avahi-discover/avahi-discover.py:231 +#: ../avahi-python/avahi-discover/avahi-discover.py:244 msgid "Interface:" msgstr "Grænseflade:" -#: ../avahi-python/avahi-discover/avahi-discover.py:232 +#: ../avahi-python/avahi-discover/avahi-discover.py:245 msgid "Address:" msgstr "Adresse:" #: ../avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" -msgstr "Kig efter tjenestetyper" +msgstr "Find tjenestetyper" #: ../avahi-ui/avahi-ui.c:185 msgid "A NULL terminated list of service types to browse for" -msgstr "En NULL-afgrænset liste af tjenestetyper at kigge efter" +msgstr "En NULL-afsluttet liste over tjenestetyper som der skal søges efter" #: ../avahi-ui/avahi-ui.c:190 msgid "Domain" @@ -300,7 +299,7 @@ msgstr "Domæne" #: ../avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" -msgstr "Domænet som der skal kigges i, eller NULL for standarddomænet" +msgstr "Domænet som der skal søges i, eller NULL for standarddomænet" #: ../avahi-ui/avahi-ui.c:196 msgid "Service Type" @@ -360,7 +359,7 @@ msgstr "Opløs den valgte tjeneste automatisk før returnering" #: ../avahi-ui/avahi-ui.c:236 msgid "Resolve Service Host Name" -msgstr "Opløs tjenesteværtsnavn" +msgstr "Opløs tjenestens værtsnavn" #: ../avahi-ui/avahi-ui.c:236 msgid "" @@ -378,17 +377,17 @@ msgstr "Adressefamilien for værtsnavnsopløsning" #: ../avahi-ui/avahi-ui.c:326 #, c-format msgid "Avahi client failure: %s" -msgstr "Klientfejl for Avahi: %s" +msgstr "Fejl ved Avahi-klient: %s" #: ../avahi-ui/avahi-ui.c:388 #, c-format msgid "Avahi resolver failure: %s" -msgstr "Opløserfejl for Avahi: %s" +msgstr "Fejl ved Avahi-opløser: %s" #: ../avahi-ui/avahi-ui.c:518 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" -msgstr "Kunne ikke gennemse domæne $%2s for tjenestetype $%1s: $%3s" +msgstr "Forsøg på at finde tjenestetypen %s i domænet %s mislykkedes: %s" #: ../avahi-ui/avahi-ui.c:519 ../avahi-utils/avahi-browse.c:168 #: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 @@ -399,30 +398,30 @@ msgstr "-" #: ../avahi-ui/avahi-ui.c:649 #, c-format msgid "Avahi domain browser failure: %s" -msgstr "Domænebrowserfejl for Avahi: %s" +msgstr "Fejl ved Avahi-domænebrowser: %s" #: ../avahi-ui/avahi-ui.c:684 #, c-format msgid "Failed to read Avahi domain: %s" -msgstr "Kunne ikke læse Avahidomæne: %s" +msgstr "Kunne ikke læse Avahi-domæne: %s" #: ../avahi-ui/avahi-ui.c:706 msgid "Browse service type list is empty!" -msgstr "Listen over typer af gennemsynstjenester er tom!" +msgstr "Listen over typer af tjenester der skal findes er tom!" #: ../avahi-ui/avahi-ui.c:717 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "Kunne ikke forbinde til Avahiserver: %s" +msgstr "Kunne ikke oprette forbindelse til Avahi-server: %s" #: ../avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" -msgstr "Gennemser for tjenester på lokalnetværk:" +msgstr "Finder tjenester på lokalt netværk:" #: ../avahi-ui/avahi-ui.c:737 #, c-format msgid "Browsing for services in domain %s:" -msgstr "Gennemser efter tjenester i domæne %s:" +msgstr "Finder tjenester i domænet %s:" #: ../avahi-ui/avahi-ui.c:773 #, c-format @@ -432,7 +431,7 @@ msgstr "Kunne ikke oprette browser for %s: %s" #: ../avahi-ui/avahi-ui.c:907 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "Kunne ikke oprette opløser for %s af typen %s i domæne %s: %s" +msgstr "Kunne ikke oprette opløser for %s af typen %s i domænet %s: %s" #: ../avahi-ui/avahi-ui.c:982 #, c-format @@ -441,26 +440,24 @@ msgstr "Kunne ikke oprette domænebrowser: %s" #: ../avahi-ui/avahi-ui.c:993 msgid "Change domain" -msgstr "Ændr domæne" +msgstr "Skift domæne" #: ../avahi-ui/avahi-ui.c:1043 ../avahi-ui/avahi-ui.c:1180 msgid "Browsing..." -msgstr "Gennemser..." +msgstr "Finder ..." #: ../avahi-ui/avahi-ui.c:1047 ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 #: ../avahi-ui/bssh.c:161 -#, fuzzy msgid "_Cancel" -msgstr "Afbrudt.\n" +msgstr "_Annuller" #: ../avahi-ui/avahi-ui.c:1048 -#, fuzzy msgid "_OK" -msgstr "O.k." +msgstr "_OK" #: ../avahi-ui/avahi-ui.c:1134 msgid "Initializing..." -msgstr "Initialiserer..." +msgstr "Initialiserer ..." #: ../avahi-ui/avahi-ui.c:1162 msgid "Location" @@ -476,7 +473,7 @@ msgstr "Type" #: ../avahi-ui/avahi-ui.c:1184 msgid "_Domain..." -msgstr "_Domæne..." +msgstr "_Domæne ..." #: ../avahi-ui/bssh.c:55 #, c-format @@ -492,10 +489,10 @@ msgstr "" "%s [tilvalg]\n" "\n" " -h --help Vis denne hjælp\n" -" -s --ssh Gennemse SSH-servere\n" -" -v --vnc Gennemse VNC-servere\n" -" -S --shell Gennemse både SSH og VNC\n" -" -d --domain=DOMÆNE Domænet der skal gennemses\n" +" -s --ssh Find SSH-servere\n" +" -v --vnc Find VNC-servere\n" +" -S --shell Find både SSH og VNC\n" +" -d --domain=DOMÆNE Domænet som der skal søges i\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -504,11 +501,11 @@ msgstr "For mange argumenter\n" #: ../avahi-ui/bssh.c:149 msgid "Choose Shell Server" -msgstr "Vælg skalserver" +msgstr "Vælg skal-server" #: ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 ../avahi-ui/bssh.c:161 msgid "C_onnect" -msgstr "" +msgstr "Opret _forbindelse" #: ../avahi-ui/bssh.c:151 msgid "Desktop" @@ -529,7 +526,7 @@ msgstr "Vælg SSH-server" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "Forbinder til '%s' ...\n" +msgstr "Opretter forbindelse til '%s' ...\n" #: ../avahi-ui/bssh.c:240 #, c-format @@ -539,23 +536,23 @@ msgstr "execlp() mislykkedes: %s\n" #: ../avahi-ui/bssh.c:250 #, c-format msgid "Canceled.\n" -msgstr "Afbrudt.\n" +msgstr "Annulleret.\n" #: ../avahi-ui/bssh.desktop.in.in.h:1 msgid "Avahi SSH Server Browser" -msgstr "Avahibrowser for SSH-server" +msgstr "Browser til Avahi SSH-server" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Gennemse for Zeroconf-aktiverede SSH-servere" +msgstr "Find Zeroconf-aktiverede SSH-servere" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" -msgstr "Avahibrowser for VNC-server" +msgstr "Browser til Avahi VNC-server" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Gennemse for Zeroconf-aktiverede VNC-servere" +msgstr "Find Zeroconf-aktiverede VNC-servere" #: ../avahi-utils/avahi-browse.c:107 #, c-format @@ -570,7 +567,7 @@ msgstr ": Mellemlager opbrugt\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "Kunne ikke løse tjeneste '%s' af typen '%s' i domæne '%s': %s\n" +msgstr "Kunne ikke løse tjenesten '%s' af typen '%s' i domænet '%s': %s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format @@ -628,13 +625,13 @@ msgstr "E Ifce Prot-domæne\n" #: ../avahi-utils/avahi-browse.c:553 #, c-format msgid "E Ifce Prot %-*s %-20s Domain\n" -msgstr "E Ifce Prot %-*s %-20s domæne\n" +msgstr "E Ifce Prot %-*s %-20s-domæne\n" #. We have been disconnected, so let reconnect #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "Afbrudt, forbinder igen ...\n" +msgstr "Afbrudt, opretter forbindelse igen ...\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 @@ -647,7 +644,7 @@ msgstr "Kunne ikke oprette klientobjekt: %s\n" #: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "Klientfejl, afslutter: %s\n" +msgstr "Fejl ved klient, afslutter: %s\n" #: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 #, c-format @@ -672,11 +669,10 @@ msgid "" msgstr "" " -h --help Vis denne hjælp\n" " -V --version Vis version\n" -" -D --browse-domains Gennemse efter browsingdomæner i steden for " -"tjenester\n" +" -D --browse-domains Find browsingdomæner i stedet for tjenester\n" " -a --all Vis alle tjenester, uanset typen\n" -" -d --domain=DOMÆNE Domænet der skal gennemses i\n" -" -v --verbose Aktiver uddybende tilstand\n" +" -d --domain=DOMÆNE Domænet som der skal søges i\n" +" -v --verbose Aktivér uddybende tilstand\n" " -t --terminate Afslut efter dumpning af en mere eller mindre " "fuldstændig liste\n" " -c --cache Afslut efter dumpning af alle punkter i " @@ -692,7 +688,7 @@ msgid "" " -b --dump-db Dump service type database\n" msgstr "" " -k --no-db-lookup Slå ikke tjenestetyper op\n" -" -b --dump-db Dump tjenestetypedatabase\n" +" -b --dump-db Dump database med tjenestetyper\n" #: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 #, c-format @@ -718,7 +714,7 @@ msgstr "Kunne ikke registrere: %s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "Navnesammenstød, vælger nyt navn '%s'.\n" +msgstr "Navnesammenstød, vælger det nye navn '%s'.\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format @@ -738,12 +734,12 @@ msgstr "Kunne ikke tilføje tjeneste: %s\n" #: ../avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "Kunne ikke tilføje undertype '%s': %s\n" +msgstr "Kunne ikke tilføje undertypen '%s': %s\n" #: ../avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" -msgstr "Værtsnavnskonflikt\n" +msgstr "Konflikt ved værtsnavn\n" #: ../avahi-utils/avahi-publish.c:216 #, c-format @@ -770,11 +766,11 @@ msgstr "" " -V --version Vis version\n" " -s --service Udgiv tjeneste\n" " -a --address Udgiv adresse\n" -" -v --verbose Aktiver uddybende tilstand\n" +" -v --verbose Aktivér uddybende tilstand\n" " -d --domain=DOMÆNE Domæne hvor tjeneste skal udgives i\n" -" -H --host=DOMÆNE Vært hvor tjeneste residerer\n" -" --subtype=UNDERTYPE En ekstra undertype til at registrere denne\n" -" tjeneste med\n" +" -H --host=DOMÆNE Vært hvor tjeneste hører til\n" +" --subtype=UNDERTYPE En ekstra undertype som tjenesten skal " +"registreres med\n" " -R --no-reverse Udgiv ikke modsat punkt med adresse\n" " -f --no-fail Fejl ikke hvis dæmonen ikke er tilgængelig\n" @@ -796,12 +792,12 @@ msgstr "Ingen kommando angivet.\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "Kunne ikke løse værtsnavn '%s': %s\n" +msgstr "Kunne ikke løse værtsnavnet '%s': %s\n" #: ../avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "Kunne ikke løse adresse '%s': %s\n" +msgstr "Kunne ikke løse adressen '%s': %s\n" #: ../avahi-utils/avahi-resolve.c:157 #, c-format @@ -836,7 +832,7 @@ msgstr "Kunne ikke oprette værtsnavnsopløser: %s\n" #: ../avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "Kunne ikke fortolke adresse '%s'\n" +msgstr "Kunne ikke fortolke adressen '%s'\n" #: ../avahi-utils/avahi-resolve.c:314 #, c-format @@ -856,12 +852,12 @@ msgstr "" "\n" " -h --help Vis denne hjælp\n" " -V --version Vis version\n" -" -v --verbose Aktiver uddybende tilstand\n" +" -v --verbose Aktivér uddybende tilstand\n" #: ../avahi-utils/avahi-set-host-name.c:114 #, c-format msgid "Invalid number of arguments, expecting exactly one.\n" -msgstr "Ugyldigt antal argumenter, forventede præcist et.\n" +msgstr "Ugyldigt antal argumenter, ventede præcist ét.\n" #: ../avahi-utils/avahi-set-host-name.c:193 #, c-format diff --git a/po/de.gmo b/po/de.gmo new file mode 100644 index 0000000000000000000000000000000000000000..d72db73d496f6deede5283af37566a0c2f22b941 GIT binary patch literal 17399 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 LMq2K<(#88<;wWP* literal 0 HcmV?d00001 diff --git a/po/de.po b/po/de.po index 82d3229..81b1b7e 100644 --- a/po/de.po +++ b/po/de.po @@ -1,16 +1,16 @@ -# SOME DESCRIPTIVE TITLE. +# German translation of Avahi. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the avahi package. # # Translators: -# Fabian Affolter , 2011 -# Mario Blättermann , 2011 +# Fabian Affolter , 2011. +# Mario Blättermann , 2011, 2018. msgid "" msgstr "" "Project-Id-Version: Avahi\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-10 13:24+0200\n" -"PO-Revision-Date: 2013-11-20 09:58+0000\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2017-05-20 13:03+0000\n" +"PO-Revision-Date: 2018-08-18 23:50+0200\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German (http://www.transifex.com/lennart/avahi/language/de/)\n" "Language: de\n" @@ -18,6 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.1.1\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -244,7 +245,7 @@ msgid "Avahi Discovery" msgstr "Avahi Discovery" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 -#: ../avahi-python/avahi-discover/avahi-discover.py:76 +#: ../avahi-python/avahi-discover/avahi-discover.py:82 msgid "No service currently selected." msgstr "Momentan ist kein Dienst ausgewählt." @@ -256,35 +257,35 @@ msgstr "Avahi Zeroconf Browser" msgid "Browse for Zeroconf services available on your network" msgstr "Durchsuchen nach Zeroconf-aktivierten Diensten in Ihrem Netzwerk" -#: ../avahi-python/avahi-discover/avahi-discover.py:224 +#: ../avahi-python/avahi-discover/avahi-discover.py:237 msgid "TXT" msgstr "TXT" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "TXT Data:" msgstr "TXT-Daten:" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "empty" msgstr "leer" -#: ../avahi-python/avahi-discover/avahi-discover.py:228 +#: ../avahi-python/avahi-discover/avahi-discover.py:241 msgid "Service Type:" msgstr "Diensttyp:" -#: ../avahi-python/avahi-discover/avahi-discover.py:229 +#: ../avahi-python/avahi-discover/avahi-discover.py:242 msgid "Service Name:" msgstr "Dienstname:" -#: ../avahi-python/avahi-discover/avahi-discover.py:230 +#: ../avahi-python/avahi-discover/avahi-discover.py:243 msgid "Domain Name:" msgstr "Domainname:" -#: ../avahi-python/avahi-discover/avahi-discover.py:231 +#: ../avahi-python/avahi-discover/avahi-discover.py:244 msgid "Interface:" msgstr "Schnittstelle:" -#: ../avahi-python/avahi-discover/avahi-discover.py:232 +#: ../avahi-python/avahi-discover/avahi-discover.py:245 msgid "Address:" msgstr "Adresse:" @@ -454,14 +455,12 @@ msgstr "Durchsuchen …" #: ../avahi-ui/avahi-ui.c:1047 ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 #: ../avahi-ui/bssh.c:161 -#, fuzzy msgid "_Cancel" -msgstr "Abgebrochen.\n" +msgstr "_Abbrechen" #: ../avahi-ui/avahi-ui.c:1048 -#, fuzzy msgid "_OK" -msgstr "OK" +msgstr "_OK" #: ../avahi-ui/avahi-ui.c:1134 msgid "Initializing..." @@ -513,7 +512,7 @@ msgstr "Shell-Server auswählen" #: ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 ../avahi-ui/bssh.c:161 msgid "C_onnect" -msgstr "" +msgstr "_Verbinden" #: ../avahi-ui/bssh.c:151 msgid "Desktop" diff --git a/po/el.gmo b/po/el.gmo new file mode 100644 index 0000000000000000000000000000000000000000..211c3c8e2456b3e39e27d08abcefeeca3aa69bbe GIT binary patch literal 21783 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 U_YmHUA?=UYVIlu-#2+^D2UtInwEzGB literal 0 HcmV?d00001 diff --git a/po/en_CA.gmo b/po/en_CA.gmo new file mode 100644 index 0000000000000000000000000000000000000000..083ae606cb850fa2085bf2f4b06c090261277f8f GIT binary patch literal 305 zcmYMvy-ve05C?FBU@;prgBK=na2k*zQxKx|AeXRl$ptUx20@F7Ql(UdEOL=w=*js>u9V{UCZTMi@u@c$q81HU zQA2Fq#`I!}U~k@>?F!61;5D!As)c-lIPTRV&lH~pkKk#?$3RCA-tlbcjq{hHeKj!w fUafH@%m2Rd)(WCr_%>MQJ1xo=hn#JH+CKFIuKi4O literal 0 HcmV?d00001 diff --git a/po/en_GB.gmo b/po/en_GB.gmo new file mode 100644 index 0000000000000000000000000000000000000000..2521a4fd4a5d8e0565f50e4db4490c1686c9d319 GIT binary patch literal 16272 zcmeI2dypK(ea9Q|^nz`k;$eduY#9OCJ4rkYC+Xm%J6Q+!;_k#lfaST}xx3|dXO^AW zJBgTJV+aPv#MluJKd>Dj$Korp-{%0D}$-+i`wdiwGE{rcBE(|YC9V-6UuXOQG2?> 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 literal 0 HcmV?d00001 diff --git a/po/en_NZ.gmo b/po/en_NZ.gmo new file mode 100644 index 0000000000000000000000000000000000000000..79624fbfb3d4f7da15dce6d40295bde71baa37f6 GIT binary patch literal 14220 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 literal 0 HcmV?d00001 diff --git a/po/eo.gmo b/po/eo.gmo new file mode 100644 index 0000000000000000000000000000000000000000..fa037215acfecf1055083576888060e1f5369f34 GIT binary patch literal 4046 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 literal 0 HcmV?d00001 diff --git a/po/et.gmo b/po/et.gmo new file mode 100644 index 0000000000000000000000000000000000000000..03d6cae14ffe076acfa1c45d62e464c71d1d7764 GIT binary patch literal 9657 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 literal 0 HcmV?d00001 diff --git a/po/fi.gmo b/po/fi.gmo new file mode 100644 index 0000000000000000000000000000000000000000..829e4d29e3d813e06029014545b7bf4218316a1b GIT binary patch literal 15951 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 Sj152HfSe(g9K%CSVEaEd(<27} literal 0 HcmV?d00001 diff --git a/po/fo.gmo b/po/fo.gmo new file mode 100644 index 0000000000000000000000000000000000000000..3c0464480e9e8be0d341b03a34d5cf1a4667c51b GIT binary patch literal 8623 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 Im>DAf3r?9y9smFU literal 0 HcmV?d00001 diff --git a/po/fr.gmo b/po/fr.gmo new file mode 100644 index 0000000000000000000000000000000000000000..9d30f490632b4abc9d503f1af7e8218e2e29c818 GIT binary patch literal 17409 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 literal 0 HcmV?d00001 diff --git a/po/gl.gmo b/po/gl.gmo new file mode 100644 index 0000000000000000000000000000000000000000..ca42ae46dddd7a7c3c783eec78cc71ba9ba3ab6d GIT binary patch literal 17992 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 z z`)#EhY4UrQF}n*r%d4~Ci8S?9R+OhFMV{6cPZViRn?C-92^Z5=Sc)rUiz#cK z5*t=Z%u*N|9dB13h1ELhVWsRj#WI^lxE$$(4aG$w7il`!^#xkiWpLYsw^&Z)yzF26XzTj8e0x;P3+9h}vb zcC9nt;>hIvHS4Z($ss=vb5}OlZtGFWU?PPXDu{~cPw}l{jB*`qXu@}*1AWz8pi9bQ zEL>4Lv;nmmy7Ixb(cHSU($(py`xG?A^Bcuo10`sew)m3y(IQX@2z+GN(ibT0M z&SFkVvA62A!tFF?VIPSbK$6Gh29qdCH<-f4>;{qKv9^IUF7h^jB#-V5ASq&f189oK z-$0tG(JXKPls0SGuyyKC%TDSJF~Rhyrx{(RbU4-^wJeerv|_F);?&w#C(wH8Lxo(qY(G$v^5{bM^n_M5d%A!2>xsBOlUvhPHE?Y=r%uQy`ftK6oeoM^Gean)S zt{#wLkQ#j1vSS7ExmYu^*3?~HHb`gvw6ux2g}HGW++jM8)VbyG8`dB`RP@6Tz3Fj= zaByFXt&TIt`QiVmd&^J9XqC5#YZo6D&*T<@z98p0<>AU^8L zC9s@8%(WbYQrMSJuZF3pZ^_ZyO~BXg@;&7tJ3(#rk$Svnml&Qv+Ol)9)$tumEzEgu zs;7Z8*qv9$_UedLs$oOJ<$~$Lq{%NWQI7dAaZmLztt1yLc5A*|MWqhgB@Bw4itKXnDt(i+$%iLSSRvoF*fG z=CvNlsVh%nk(-R=b*@Ezyf1>@IvIDl$H`VY%Z)5Bv)pv7B%rA>;@9o%12;EJv-gEu@t_ZjaXXo z2M4q{g*ro)^kPrh1gZY7KW)&C(BJQpea9{&^a)hDC4S+VEYt58*UdyHW z{X@x&AD4uB@&wjwo<2z@?4ZfEkX45gSBD}7^Y zkc<(`JoQq=d4z;?{LO(k5EU*I2B>gJ)))jmyW2s<#mdns!t@;%rni0-QCjfZnt$UF<$8 zhEd!omPb)mODOwoSBXJAlr{tgFYqd1f?XW$+KNTlsi6$T^$b7Y8s}0ilXY0L*gNN0 zL0Sr+6=hWSo+v?m)Ur@^w=dOF%s;oVT8|v=bcZJUXGPc_;n&r#e2NO!3RA2fJg*V? zU(=E6RLbRnE7JHO8F(R=^P_BlWc=*Eha_Bg<*aV{#S#7ajIG AA^-pY literal 0 HcmV?d00001 diff --git a/po/he.gmo b/po/he.gmo new file mode 100644 index 0000000000000000000000000000000000000000..402e58f371c3936467696051a57db3a6a20bf030 GIT binary patch literal 7843 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 literal 0 HcmV?d00001 diff --git a/po/id.gmo b/po/id.gmo new file mode 100644 index 0000000000000000000000000000000000000000..5dd233a01b0f718af77d16d6c04e700f1737ab81 GIT binary patch literal 16508 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 literal 0 HcmV?d00001 diff --git a/po/insert-header.sin b/po/insert-header.sin new file mode 100644 index 0000000..b26de01 --- /dev/null +++ b/po/insert-header.sin @@ -0,0 +1,23 @@ +# Sed script that inserts the file called HEADER before the header entry. +# +# At each occurrence of a line starting with "msgid ", we execute the following +# commands. At the first occurrence, insert the file. At the following +# occurrences, do nothing. The distinction between the first and the following +# occurrences is achieved by looking at the hold space. +/^msgid /{ +x +# Test if the hold space is empty. +s/m/m/ +ta +# Yes it was empty. First occurrence. Read the file. +r HEADER +# Output the file's contents by reading the next line. But don't lose the +# current line while doing this. +g +N +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/po/it.gmo b/po/it.gmo new file mode 100644 index 0000000000000000000000000000000000000000..14769b6e19d6228a2763f58f91343e15d25bee43 GIT binary patch literal 17366 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 literal 0 HcmV?d00001 diff --git a/po/ja.gmo b/po/ja.gmo new file mode 100644 index 0000000000000000000000000000000000000000..44d3b1c8db02f7d1000e2908174710eb56e47d31 GIT binary patch literal 19023 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

    uz-`CJVOfA)Yf-?usRLAIqzKQzBrN2i( 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 literal 0 HcmV?d00001 diff --git a/po/ms.gmo b/po/ms.gmo new file mode 100644 index 0000000000000000000000000000000000000000..d8bd84827fa55fe60e79ec92d70189c40975d50a GIT binary patch literal 2468 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 Pf!wYu-VXP)j^%#=Z=~wX literal 0 HcmV?d00001 diff --git a/po/oc.gmo b/po/oc.gmo new file mode 100644 index 0000000000000000000000000000000000000000..a36eefebcff90000064673f6e7d078d3af94f555 GIT binary patch literal 17491 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 KW7M?rv^( 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 kGkh8oKiOE*aH1Y|Fd@C6P&pk8&HQBj, 2007-2016. +# Polish translation for avahi. +# Copyright © 2007-2019 the avahi authors. +# This file is distributed under the same license as the avahi package. +# Piotr Drąg , 2007-2019. +# Aviary.pl , 2019. # msgid "" msgstr "" "Project-Id-Version: avahi\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-04 15:08+0200\n" -"PO-Revision-Date: 2016-06-04 15:09+0200\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2019-02-26 05:06+0000\n" +"PO-Revision-Date: 2019-02-26 18:00+0100\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,468 +19,473 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: ../avahi-common/error.c:30 +#: avahi-common/error.c:30 msgid "OK" msgstr "OK" -#: ../avahi-common/error.c:31 +#: avahi-common/error.c:31 msgid "Operation failed" msgstr "Działanie się nie powiodło" -#: ../avahi-common/error.c:32 +#: avahi-common/error.c:32 msgid "Bad state" msgstr "Błędny stan" -#: ../avahi-common/error.c:33 +#: avahi-common/error.c:33 msgid "Invalid host name" msgstr "Nieprawidłowa nazwa komputera" -#: ../avahi-common/error.c:34 +#: avahi-common/error.c:34 msgid "Invalid domain name" msgstr "Nieprawidłowa nazwa domeny" -#: ../avahi-common/error.c:35 +#: avahi-common/error.c:35 msgid "No suitable network protocol available" msgstr "Brak dostępnych odpowiednich protokołów sieciowych" -#: ../avahi-common/error.c:36 +#: avahi-common/error.c:36 msgid "Invalid DNS TTL" msgstr "Nieprawidłowe TTL serwera DNS" -#: ../avahi-common/error.c:37 +#: avahi-common/error.c:37 msgid "Resource record key is pattern" msgstr "Klucz wpisu zasobu jest wzorem" -#: ../avahi-common/error.c:38 +#: avahi-common/error.c:38 msgid "Local name collision" msgstr "Kolizja nazwy lokalnej" -#: ../avahi-common/error.c:39 +#: avahi-common/error.c:39 msgid "Invalid record" msgstr "Nieprawidłowy wpis" -#: ../avahi-common/error.c:41 +#: avahi-common/error.c:41 msgid "Invalid service name" msgstr "Nieprawidłowa nazwa usługi" -#: ../avahi-common/error.c:42 +#: avahi-common/error.c:42 msgid "Invalid service type" msgstr "Nieprawidłowy typ usługi" -#: ../avahi-common/error.c:43 +#: avahi-common/error.c:43 msgid "Invalid port number" msgstr "Nieprawidłowy numer portu" -#: ../avahi-common/error.c:44 +#: avahi-common/error.c:44 msgid "Invalid record key" msgstr "Nieprawidłowy klucz wpisu" -#: ../avahi-common/error.c:45 +#: avahi-common/error.c:45 msgid "Invalid address" msgstr "Nieprawidłowy adres" -#: ../avahi-common/error.c:46 +#: avahi-common/error.c:46 msgid "Timeout reached" msgstr "Przekroczono czas oczekiwania" -#: ../avahi-common/error.c:47 +#: avahi-common/error.c:47 msgid "Too many clients" msgstr "Za dużo klientów" -#: ../avahi-common/error.c:48 +#: avahi-common/error.c:48 msgid "Too many objects" msgstr "Za dużo obiektów" -#: ../avahi-common/error.c:49 +#: avahi-common/error.c:49 msgid "Too many entries" msgstr "Za dużo wpisów" -#: ../avahi-common/error.c:50 +#: avahi-common/error.c:50 msgid "OS Error" msgstr "Błąd systemu operacyjnego" -#: ../avahi-common/error.c:52 +#: avahi-common/error.c:52 msgid "Access denied" msgstr "Brak dostępu" -#: ../avahi-common/error.c:53 +#: avahi-common/error.c:53 msgid "Invalid operation" msgstr "Nieprawidłowe działanie" -#: ../avahi-common/error.c:54 +#: avahi-common/error.c:54 msgid "An unexpected D-Bus error occurred" msgstr "Wystąpił nieoczekiwany błąd usługi D-Bus" -#: ../avahi-common/error.c:55 +#: avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "Połączenie z usługą się nie powiodło" +msgstr "Połączenie z usługą się nie powiodło" -#: ../avahi-common/error.c:56 +#: avahi-common/error.c:56 msgid "Memory exhausted" msgstr "Wyczerpano pamięć" -#: ../avahi-common/error.c:57 +#: avahi-common/error.c:57 msgid "The object passed in was not valid" msgstr "Przepuszczony obiekt nie był prawidłowy" -#: ../avahi-common/error.c:58 +#: avahi-common/error.c:58 msgid "Daemon not running" msgstr "Usługa nie jest uruchomiona" -#: ../avahi-common/error.c:59 +#: avahi-common/error.c:59 msgid "Invalid interface index" msgstr "Nieprawidłowy indeks interfejsu" -#: ../avahi-common/error.c:60 +#: avahi-common/error.c:60 msgid "Invalid protocol specification" msgstr "Nieprawidłowa specyfikacja protokołu" -#: ../avahi-common/error.c:61 +#: avahi-common/error.c:61 msgid "Invalid flags" msgstr "Nieprawidłowe flagi" -#: ../avahi-common/error.c:63 +#: avahi-common/error.c:63 msgid "Not found" msgstr "Nie odnaleziono" -#: ../avahi-common/error.c:64 +#: avahi-common/error.c:64 msgid "Invalid configuration" msgstr "Nieprawidłowa konfiguracja" -#: ../avahi-common/error.c:65 +#: avahi-common/error.c:65 msgid "Version mismatch" msgstr "Wersje się nie zgadzają" -#: ../avahi-common/error.c:66 +#: avahi-common/error.c:66 msgid "Invalid service subtype" msgstr "Nieprawidłowy podtyp usługi" -#: ../avahi-common/error.c:67 +#: avahi-common/error.c:67 msgid "Invalid packet" msgstr "Nieprawidłowy pakiet" -#: ../avahi-common/error.c:68 +#: avahi-common/error.c:68 msgid "Invalid DNS return code" msgstr "Nieprawidłowy kod zwrotny DNS" -#: ../avahi-common/error.c:69 +#: avahi-common/error.c:69 msgid "DNS failure: FORMERR" msgstr "Niepowodzenie DNS: FORMERR" -#: ../avahi-common/error.c:70 +#: avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" msgstr "Niepowodzenie DNS: SERVFAIL" -#: ../avahi-common/error.c:71 +#: avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" msgstr "Niepowodzenie DNS: NXDOMAIN" -#: ../avahi-common/error.c:72 +#: avahi-common/error.c:72 msgid "DNS failure: NOTIMP" msgstr "Niepowodzenie DNS: NOTIMP" -#: ../avahi-common/error.c:74 +#: avahi-common/error.c:74 msgid "DNS failure: REFUSED" msgstr "Niepowodzenie DNS: REFUSED" -#: ../avahi-common/error.c:75 +#: avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" msgstr "Niepowodzenie DNS: YXDOMAIN" -#: ../avahi-common/error.c:76 +#: avahi-common/error.c:76 msgid "DNS failure: YXRRSET" msgstr "Niepowodzenie DNS: YXRRSET" -#: ../avahi-common/error.c:77 +#: avahi-common/error.c:77 msgid "DNS failure: NXRRSET" msgstr "Niepowodzenie DNS: NXRRSET" -#: ../avahi-common/error.c:78 +#: avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" msgstr "Niepowodzenie DNS: NOTAUTH" -#: ../avahi-common/error.c:79 +#: avahi-common/error.c:79 msgid "DNS failure: NOTZONE" msgstr "Niepowodzenie DNS: NOTZONE" -#: ../avahi-common/error.c:80 +#: avahi-common/error.c:80 msgid "Invalid RDATA" msgstr "Nieprawidłowe RDATA" -#: ../avahi-common/error.c:81 +#: avahi-common/error.c:81 msgid "Invalid DNS type" msgstr "Nieprawidłowy typ DNS" -#: ../avahi-common/error.c:82 +#: avahi-common/error.c:82 msgid "Invalid DNS class" msgstr "Nieprawidłowa klasa DNS" -#: ../avahi-common/error.c:83 +#: avahi-common/error.c:83 msgid "Not supported" msgstr "Nieobsługiwane" -#: ../avahi-common/error.c:85 +#: avahi-common/error.c:85 msgid "Not permitted" msgstr "Niedozwolone" -#: ../avahi-common/error.c:86 +#: avahi-common/error.c:86 msgid "Invalid argument" msgstr "Nieprawidłowy parametr" -#: ../avahi-common/error.c:87 +#: avahi-common/error.c:87 msgid "Is empty" msgstr "Jest puste" -#: ../avahi-common/error.c:88 +#: avahi-common/error.c:88 msgid "The requested operation is invalid because redundant" msgstr "Żądane działanie jest nieprawidłowe, ponieważ jest nadmiarowe" -#: ../avahi-common/error.c:94 +#: avahi-common/error.c:94 msgid "Invalid Error Code" msgstr "Nieprawidłowy kod błędu" -#: ../avahi-discover-standalone/avahi-discover.ui.h:1 +#: avahi-discover-standalone/avahi-discover.ui:6 msgid "Avahi Discovery" msgstr "Wykrywanie Avahi" -#: ../avahi-discover-standalone/avahi-discover.ui.h:2 -#: ../avahi-python/avahi-discover/avahi-discover.py:77 +#: avahi-discover-standalone/avahi-discover.ui:60 +#: avahi-python/avahi-discover/avahi-discover.py:82 msgid "No service currently selected." msgstr "Nie wybrano żadnej usługi." -#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:4 msgid "Avahi Zeroconf Browser" msgstr "Przeglądarka Zeroconf Avahi" -#: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:5 msgid "Browse for Zeroconf services available on your network" -msgstr "Przeglądanie usług Zeroconf dostępnych w sieci" +msgstr "Przeglądanie usług Zeroconf dostępnych w sieci" -#: ../avahi-python/avahi-discover/avahi-discover.py:225 +#: avahi-python/avahi-discover/avahi-discover.desktop.in.in:9 +#: avahi-ui/bssh.desktop.in.in:9 avahi-ui/bvnc.desktop.in.in:9 +msgid "network-wired" +msgstr "network-wired" + +#: avahi-python/avahi-discover/avahi-discover.py:237 msgid "TXT" msgstr "Tekst" -#: ../avahi-python/avahi-discover/avahi-discover.py:227 +#: avahi-python/avahi-discover/avahi-discover.py:239 msgid "TXT Data:" msgstr "Dane tekstowe:" -#: ../avahi-python/avahi-discover/avahi-discover.py:227 +#: avahi-python/avahi-discover/avahi-discover.py:239 msgid "empty" msgstr "puste" -#: ../avahi-python/avahi-discover/avahi-discover.py:229 +#: avahi-python/avahi-discover/avahi-discover.py:241 msgid "Service Type:" msgstr "Typ usługi:" -#: ../avahi-python/avahi-discover/avahi-discover.py:230 +#: avahi-python/avahi-discover/avahi-discover.py:242 msgid "Service Name:" msgstr "Nazwa usługi:" -#: ../avahi-python/avahi-discover/avahi-discover.py:231 +#: avahi-python/avahi-discover/avahi-discover.py:243 msgid "Domain Name:" msgstr "Nazwa domeny:" -#: ../avahi-python/avahi-discover/avahi-discover.py:232 +#: avahi-python/avahi-discover/avahi-discover.py:244 msgid "Interface:" msgstr "Interfejs:" -#: ../avahi-python/avahi-discover/avahi-discover.py:233 +#: avahi-python/avahi-discover/avahi-discover.py:245 msgid "Address:" msgstr "Adres:" -#: ../avahi-ui/avahi-ui.c:185 +#: avahi-ui/avahi-ui.c:185 msgid "Browse Service Types" msgstr "Przeglądanie typów usług" -#: ../avahi-ui/avahi-ui.c:185 +#: avahi-ui/avahi-ui.c:185 msgid "A NULL terminated list of service types to browse for" msgstr "Lista typów usług do przeglądania zakończona NULL" -#: ../avahi-ui/avahi-ui.c:190 +#: avahi-ui/avahi-ui.c:190 msgid "Domain" msgstr "Domena" -#: ../avahi-ui/avahi-ui.c:190 +#: avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" msgstr "Domena do przeglądania lub NULL dla domyślnej domeny" -#: ../avahi-ui/avahi-ui.c:196 +#: avahi-ui/avahi-ui.c:196 msgid "Service Type" msgstr "Typ usługi" -#: ../avahi-ui/avahi-ui.c:196 +#: avahi-ui/avahi-ui.c:196 msgid "The service type of the selected service" msgstr "Typ wybranej usługi" -#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1035 +#: avahi-ui/avahi-ui.c:202 avahi-ui/avahi-ui.c:1035 msgid "Service Name" msgstr "Nazwa usługi" -#: ../avahi-ui/avahi-ui.c:202 +#: avahi-ui/avahi-ui.c:202 msgid "The service name of the selected service" msgstr "Nazwa wybranej usługi" -#: ../avahi-ui/avahi-ui.c:208 +#: avahi-ui/avahi-ui.c:208 msgid "Address" msgstr "Adres" -#: ../avahi-ui/avahi-ui.c:208 +#: avahi-ui/avahi-ui.c:208 msgid "The address of the resolved service" msgstr "Adres rozwiązanej usługi" -#: ../avahi-ui/avahi-ui.c:213 +#: avahi-ui/avahi-ui.c:213 msgid "Port" msgstr "Port" -#: ../avahi-ui/avahi-ui.c:213 +#: avahi-ui/avahi-ui.c:213 msgid "The IP port number of the resolved service" msgstr "Numer portu IP rozwiązanej usługi" -#: ../avahi-ui/avahi-ui.c:219 +#: avahi-ui/avahi-ui.c:219 msgid "Host Name" msgstr "Nazwa komputera" -#: ../avahi-ui/avahi-ui.c:219 +#: avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" msgstr "Nazwa komputera rozwiązanej usługi" -#: ../avahi-ui/avahi-ui.c:225 +#: avahi-ui/avahi-ui.c:225 msgid "TXT Data" msgstr "Dane tekstowe" -#: ../avahi-ui/avahi-ui.c:225 +#: avahi-ui/avahi-ui.c:225 msgid "The TXT data of the resolved service" msgstr "Dane tekstowe rozwiązanej usługi" -#: ../avahi-ui/avahi-ui.c:230 +#: avahi-ui/avahi-ui.c:230 msgid "Resolve Service" msgstr "Rozwiązywanie usługi" -#: ../avahi-ui/avahi-ui.c:230 +#: avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" msgstr "Rozwiązywanie wybranej usługi automatycznie przed zwracaniem" -#: ../avahi-ui/avahi-ui.c:236 +#: avahi-ui/avahi-ui.c:236 msgid "Resolve Service Host Name" msgstr "Rozwiązywanie nazwy komputera usługi" -#: ../avahi-ui/avahi-ui.c:236 +#: avahi-ui/avahi-ui.c:236 msgid "" "Resolve the host name of the selected service automatically before returning" msgstr "" "Rozwiązywanie nazwy komputera wybranej usługi automatycznie przed zwracaniem" -#: ../avahi-ui/avahi-ui.c:242 +#: avahi-ui/avahi-ui.c:242 msgid "Address family" msgstr "Rodzina adresów" -#: ../avahi-ui/avahi-ui.c:242 +#: avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" msgstr "Rodzina adresów do rozwiązywania nazwy komputera" -#: ../avahi-ui/avahi-ui.c:326 +#: avahi-ui/avahi-ui.c:326 #, c-format msgid "Avahi client failure: %s" msgstr "Niepowodzenie klienta Avahi: %s" -#: ../avahi-ui/avahi-ui.c:388 +#: avahi-ui/avahi-ui.c:388 #, c-format msgid "Avahi resolver failure: %s" msgstr "Niepowodzenie rozwiązywania Avahi: %s" -#: ../avahi-ui/avahi-ui.c:518 +#: avahi-ui/avahi-ui.c:518 #, c-format msgid "Browsing for service type %s in domain %s failed: %s" -msgstr "Przeglądanie typu usług %s w domenie %s się nie powiodło: %s" +msgstr "Przeglądanie typu usług %s w domenie %s się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:519 ../avahi-utils/avahi-browse.c:168 -#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 -#: ../avahi-utils/avahi-browse.c:179 +#: avahi-ui/avahi-ui.c:519 avahi-utils/avahi-browse.c:168 +#: avahi-utils/avahi-browse.c:169 avahi-utils/avahi-browse.c:178 +#: avahi-utils/avahi-browse.c:179 msgid "n/a" msgstr "Nie dotyczy" -#: ../avahi-ui/avahi-ui.c:649 +#: avahi-ui/avahi-ui.c:649 #, c-format msgid "Avahi domain browser failure: %s" msgstr "Niepowodzenie przeglądarki domen Avahi: %s" -#: ../avahi-ui/avahi-ui.c:684 +#: avahi-ui/avahi-ui.c:684 #, c-format msgid "Failed to read Avahi domain: %s" msgstr "Odczytanie domeny Avahi się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:706 +#: avahi-ui/avahi-ui.c:706 msgid "Browse service type list is empty!" msgstr "Przeglądana lista typów usług jest pusta." -#: ../avahi-ui/avahi-ui.c:717 +#: avahi-ui/avahi-ui.c:717 #, c-format msgid "Failed to connect to Avahi server: %s" -msgstr "Połączenie z serwerem Avahi się nie powiodło: %s" +msgstr "Połączenie z serwerem Avahi się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:735 +#: avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" -msgstr "Przeglądanie usług w lokalnej sieci:" +msgstr "Przeglądanie usług w lokalnej sieci:" -#: ../avahi-ui/avahi-ui.c:737 +#: avahi-ui/avahi-ui.c:737 #, c-format msgid "Browsing for services in domain %s:" -msgstr "Przeglądanie usług w domenie %s:" +msgstr "Przeglądanie usług w domenie %s:" -#: ../avahi-ui/avahi-ui.c:773 +#: avahi-ui/avahi-ui.c:773 #, c-format msgid "Failed to create browser for %s: %s" msgstr "Utworzenie przeglądarki dla %s się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:907 +#: avahi-ui/avahi-ui.c:907 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" msgstr "" -"Utworzenie rozwiązania dla %s typu %s w domenie %s się nie powiodło: %s" +"Utworzenie rozwiązania dla %s typu %s w domenie %s się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:982 +#: avahi-ui/avahi-ui.c:982 #, c-format msgid "Failed to create domain browser: %s" msgstr "Utworzenie przeglądarki domen się nie powiodło: %s" -#: ../avahi-ui/avahi-ui.c:993 +#: avahi-ui/avahi-ui.c:993 msgid "Change domain" msgstr "Zmiana domeny" -#: ../avahi-ui/avahi-ui.c:1043 ../avahi-ui/avahi-ui.c:1180 +#: avahi-ui/avahi-ui.c:1043 avahi-ui/avahi-ui.c:1180 msgid "Browsing..." msgstr "Przeglądanie…" -#: ../avahi-ui/avahi-ui.c:1047 ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 -#: ../avahi-ui/bssh.c:161 +#: avahi-ui/avahi-ui.c:1047 avahi-ui/bssh.c:149 avahi-ui/bssh.c:156 +#: avahi-ui/bssh.c:161 msgid "_Cancel" msgstr "_Anuluj" -#: ../avahi-ui/avahi-ui.c:1048 +#: avahi-ui/avahi-ui.c:1048 msgid "_OK" msgstr "_OK" -#: ../avahi-ui/avahi-ui.c:1134 +#: avahi-ui/avahi-ui.c:1134 msgid "Initializing..." msgstr "Inicjowanie…" -#: ../avahi-ui/avahi-ui.c:1162 +#: avahi-ui/avahi-ui.c:1162 msgid "Location" msgstr "Położenie" -#: ../avahi-ui/avahi-ui.c:1167 ../avahi-utils/avahi-browse.c:553 +#: avahi-ui/avahi-ui.c:1167 avahi-utils/avahi-browse.c:553 msgid "Name" msgstr "Nazwa" -#: ../avahi-ui/avahi-ui.c:1172 ../avahi-utils/avahi-browse.c:553 +#: avahi-ui/avahi-ui.c:1172 avahi-utils/avahi-browse.c:553 msgid "Type" msgstr "Typ" -#: ../avahi-ui/avahi-ui.c:1184 +#: avahi-ui/avahi-ui.c:1184 msgid "_Domain..." msgstr "_Domena…" -#: ../avahi-ui/bssh.c:55 +#: avahi-ui/bssh.c:55 #, c-format msgid "" "%s [options]\n" @@ -493,168 +501,167 @@ msgstr "" " -h --help Wyświetla tę pomoc\n" " -s --ssh Przegląda serwery SSH\n" " -v --vnc Przegląda serwery VNC\n" -" -S --shell Przegląda SSH i VNC\n" +" -S --shell Przegląda SSH i VNC\n" " -d --domain=DOMENA Domena do przeglądania\n" -#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 +#: avahi-ui/bssh.c:101 avahi-utils/avahi-browse.c:775 #, c-format msgid "Too many arguments\n" msgstr "Za dużo parametrów\n" -#: ../avahi-ui/bssh.c:149 +#: avahi-ui/bssh.c:149 msgid "Choose Shell Server" msgstr "Wybór serwera powłoki" -#: ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 ../avahi-ui/bssh.c:161 +#: avahi-ui/bssh.c:149 avahi-ui/bssh.c:156 avahi-ui/bssh.c:161 msgid "C_onnect" msgstr "_Połącz" -#: ../avahi-ui/bssh.c:151 +#: avahi-ui/bssh.c:151 msgid "Desktop" msgstr "Pulpit" -#: ../avahi-ui/bssh.c:152 +#: avahi-ui/bssh.c:152 msgid "Terminal" msgstr "Terminal" -#: ../avahi-ui/bssh.c:156 +#: avahi-ui/bssh.c:156 msgid "Choose VNC server" msgstr "Wybór serwera VNC" -#: ../avahi-ui/bssh.c:161 +#: avahi-ui/bssh.c:161 msgid "Choose SSH server" msgstr "Wybór serwera SSH" -#: ../avahi-ui/bssh.c:185 +#: avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "Łączenie z „%s”…\n" +msgstr "Łączenie z „%s”…\n" -#: ../avahi-ui/bssh.c:240 +#: avahi-ui/bssh.c:240 #, c-format msgid "execlp() failed: %s\n" msgstr "„execlp()” się nie powiodło: %s\n" -#: ../avahi-ui/bssh.c:250 -#, c-format +#: avahi-ui/bssh.c:250 msgid "Canceled.\n" msgstr "Anulowano.\n" -#: ../avahi-ui/bssh.desktop.in.in.h:1 +#: avahi-ui/bssh.desktop.in.in:4 msgid "Avahi SSH Server Browser" msgstr "Przeglądarka serwerów SSH Avahi" -#: ../avahi-ui/bssh.desktop.in.in.h:2 +#: avahi-ui/bssh.desktop.in.in:5 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Przeglądanie serwerów SSH z włączonym Zeroconf" +msgstr "Przeglądanie serwerów SSH z włączonym Zeroconf" -#: ../avahi-ui/bvnc.desktop.in.in.h:1 +#: avahi-ui/bvnc.desktop.in.in:4 msgid "Avahi VNC Server Browser" msgstr "Przeglądarka serwerów VNC Avahi" -#: ../avahi-ui/bvnc.desktop.in.in.h:2 +#: avahi-ui/bvnc.desktop.in.in:5 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Przeglądanie serwerów VNC z włączonym Zeroconf" +msgstr "Przeglądanie serwerów VNC z włączonym Zeroconf" -#: ../avahi-utils/avahi-browse.c:107 +#: avahi-utils/avahi-browse.c:107 #, c-format msgid ": All for now\n" msgstr ": Wszystko\n" -#: ../avahi-utils/avahi-browse.c:118 +#: avahi-utils/avahi-browse.c:118 #, c-format msgid ": Cache exhausted\n" msgstr ": Wyczerpano pamięć podręczną\n" -#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 +#: avahi-utils/avahi-browse.c:239 avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" msgstr "" -"Rozwiązanie usługi „%s” typu „%s” w domenie „%s” się nie powiodło: %s\n" +"Rozwiązanie usługi „%s” typu „%s” w domenie „%s” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:340 +#: avahi-utils/avahi-browse.c:340 #, c-format msgid "service_browser failed: %s\n" msgstr "„service_browser” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:378 +#: avahi-utils/avahi-browse.c:378 #, c-format msgid "avahi_service_browser_new() failed: %s\n" msgstr "„avahi_service_browser_new()” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:414 +#: avahi-utils/avahi-browse.c:414 #, c-format msgid "service_type_browser failed: %s\n" msgstr "„service_type_browser” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:444 +#: avahi-utils/avahi-browse.c:444 #, c-format msgid "avahi_service_type_browser_new() failed: %s\n" msgstr "„avahi_service_type_browser_new()” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:519 +#: avahi-utils/avahi-browse.c:519 #, c-format msgid "avahi_domain_browser_new() failed: %s\n" msgstr "„avahi_domain_browser_new()” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394 -#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 +#: avahi-utils/avahi-browse.c:535 avahi-utils/avahi-publish.c:394 +#: avahi-utils/avahi-resolve.c:280 avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" msgstr "Odpytanie ciągu wersji się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 -#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 -#: ../avahi-utils/avahi-set-host-name.c:189 +#: avahi-utils/avahi-browse.c:540 avahi-utils/avahi-publish.c:399 +#: avahi-utils/avahi-resolve.c:285 avahi-utils/avahi-set-host-name.c:173 +#: avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" msgstr "Odpytanie nazwy komputera się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 -#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 +#: avahi-utils/avahi-browse.c:544 avahi-utils/avahi-publish.c:403 +#: avahi-utils/avahi-resolve.c:289 avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" msgstr "Wersja serwera: %s; nazwa komputera: %s\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain -#: ../avahi-utils/avahi-browse.c:549 +#: avahi-utils/avahi-browse.c:549 #, c-format msgid "E Ifce Prot Domain\n" msgstr "E Interfejs Protokół Domena\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain -#: ../avahi-utils/avahi-browse.c:553 +#: avahi-utils/avahi-browse.c:553 #, c-format msgid "E Ifce Prot %-*s %-20s Domain\n" msgstr "E Interfejs Protokół %-*s %-20s Domena\n" #. We have been disconnected, so let reconnect -#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 +#: avahi-utils/avahi-browse.c:585 avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" msgstr "Rozłączono, łączenie ponownie…\n" -#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 -#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 -#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160 +#: avahi-utils/avahi-browse.c:599 avahi-utils/avahi-browse.c:829 +#: avahi-utils/avahi-publish.c:170 avahi-utils/avahi-publish.c:386 +#: avahi-utils/avahi-resolve.c:272 avahi-utils/avahi-set-host-name.c:160 #, c-format msgid "Failed to create client object: %s\n" msgstr "Utworzenie obiektu klienta się nie powiodło: %s\n" -#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175 -#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 +#: avahi-utils/avahi-browse.c:604 avahi-utils/avahi-publish.c:175 +#: avahi-utils/avahi-resolve.c:143 avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" msgstr "Niepowodzenie klienta, kończenie działania: %s\n" -#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 +#: avahi-utils/avahi-browse.c:623 avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" msgstr "Oczekiwanie na usługę…\n" -#: ../avahi-utils/avahi-browse.c:647 +#: avahi-utils/avahi-browse.c:647 msgid "" " -h --help Show this help\n" " -V --version Show version\n" @@ -673,20 +680,20 @@ msgstr "" " -h --help Wyświetla tę pomoc\n" " -V --version Wyświetla wersję\n" " -D --browse-domains Przegląda domeny zamiast usług\n" -" -a --all Wyświetla wszystkie usługi, niezależnie od ich\n" -" typu\n" +" -a --all Wyświetla wszystkie usługi,\n" +" niezależnie od ich typu\n" " -d --domain=DOMENA Domena do przeglądania\n" " -v --verbose Wyświetla więcej informacji\n" -" -t --terminate Wyłącza po zrzuceniu bardziej lub mniej\n" -" pełnej listy\n" -" -c --cache Wyłącza po zrzuceniu wszystkich wpisów z pamięci\n" -" podręcznej\n" +" -t --terminate Wyłącza po zrzuceniu bardziej\n" +" lub mniej pełnej listy\n" +" -c --cache Wyłącza po zrzuceniu wszystkich wpisów\n" +" z pamięci podręcznej\n" " -l --ignore-local Ignoruje lokalne usługi\n" " -r --resolve Rozwiązuje odnalezione usługi\n" " -f --no-fail Nie wyłącza, jeśli usługa nie jest dostępna\n" -" -p --parsable Wyjście w formacie do przetwarzania\n" +" -p --parsable Wyjście w formacie do przetwarzania\n" -#: ../avahi-utils/avahi-browse.c:660 +#: avahi-utils/avahi-browse.c:660 msgid "" " -k --no-db-lookup Don't lookup service types\n" " -b --dump-db Dump service type database\n" @@ -694,58 +701,58 @@ msgstr "" " -k --no-db-lookup Nie przeszukuje typów usług\n" " -b --dump-db Zrzuca bazę danych typów usług\n" -#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 +#: avahi-utils/avahi-browse.c:766 avahi-utils/avahi-resolve.c:219 #, c-format msgid "Too few arguments\n" msgstr "Za mało parametrów\n" -#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378 -#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 +#: avahi-utils/avahi-browse.c:821 avahi-utils/avahi-publish.c:378 +#: avahi-utils/avahi-resolve.c:264 avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" msgstr "Utworzenie prostego obiektu typu „poll” się nie powiodło.\n" -#: ../avahi-utils/avahi-publish.c:76 +#: avahi-utils/avahi-publish.c:76 #, c-format msgid "Established under name '%s'\n" msgstr "Ustanowiono pod nazwą „%s”\n" -#: ../avahi-utils/avahi-publish.c:81 +#: avahi-utils/avahi-publish.c:81 #, c-format msgid "Failed to register: %s\n" msgstr "Zarejestrowanie się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:94 +#: avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" msgstr "Kolizja nazw, wybieranie nowej nazwy „%s”.\n" -#: ../avahi-utils/avahi-publish.c:114 +#: avahi-utils/avahi-publish.c:114 #, c-format msgid "Failed to create entry group: %s\n" msgstr "Utworzenie grupy wpisów się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:124 +#: avahi-utils/avahi-publish.c:124 #, c-format msgid "Failed to add address: %s\n" msgstr "Dodanie adresu się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:134 +#: avahi-utils/avahi-publish.c:134 #, c-format msgid "Failed to add service: %s\n" msgstr "Dodanie usługi się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:140 +#: avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" msgstr "Dodanie podtypu „%s” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:191 +#: avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" msgstr "Konflikt nazw komputerów\n" -#: ../avahi-utils/avahi-publish.c:216 +#: avahi-utils/avahi-publish.c:216 #, c-format msgid "" "%s [options] %s []\n" @@ -771,38 +778,38 @@ msgstr "" " -s --service Publikuję usługę\n" " -a --address Publikuje adres\n" " -v --verbose Wyświetla więcej informacji\n" -" -d --domain=DOMENA Domena, w której opublikować usługę\n" +" -d --domain=DOMENA Domena, w której opublikować usługę\n" " -H --host=DOMENA Komputer, na jakim znajduje się usługa\n" " --subtype=PODTYP Dodatkowy podtyp do zarejestrowania tej usługi\n" -" -R --no-reverse Nie publikuje odwróconego wpisu z adresem\n" +" -R --no-reverse Nie publikuje odwróconego wpisu z adresem\n" " -f --no-fail Nie wyłącza, jeśli usługa nie jest dostępna\n" -#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 +#: avahi-utils/avahi-publish.c:303 avahi-utils/avahi-publish.c:318 #, c-format msgid "Bad number of arguments\n" msgstr "Błędna liczba parametrów\n" -#: ../avahi-utils/avahi-publish.c:329 +#: avahi-utils/avahi-publish.c:329 #, c-format msgid "Failed to parse port number: %s\n" msgstr "Przetworzenie numeru portu się nie powiodło: %s\n" -#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 +#: avahi-utils/avahi-publish.c:361 avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" msgstr "Nie podano polecenia.\n" -#: ../avahi-utils/avahi-resolve.c:89 +#: avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" msgstr "Rozwiązanie nazwy komputera „%s” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-resolve.c:126 +#: avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" msgstr "Rozwiązanie adresu „%s” się nie powiodło: %s\n" -#: ../avahi-utils/avahi-resolve.c:157 +#: avahi-utils/avahi-resolve.c:157 #, c-format msgid "" "%s [options] %s \n" @@ -827,22 +834,22 @@ msgstr "" " -6 Przeszukuje adresy IPv6\n" " -4 Przeszukuje adresy IPv4\n" -#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 +#: avahi-utils/avahi-resolve.c:299 avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" msgstr "Utworzenie rozwiązania nazwy komputera się nie powiodło: %s\n" -#: ../avahi-utils/avahi-resolve.c:309 +#: avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" msgstr "Przetworzenie adresu „%s” się nie powiodło\n" -#: ../avahi-utils/avahi-resolve.c:314 +#: avahi-utils/avahi-resolve.c:314 #, c-format msgid "Failed to create address resolver: %s\n" msgstr "Utworzenie rozwiązania adresu się nie powiodło: %s\n" -#: ../avahi-utils/avahi-set-host-name.c:73 +#: avahi-utils/avahi-set-host-name.c:73 #, c-format msgid "" "%s [options] \n" @@ -857,12 +864,12 @@ msgstr "" " -V --version Wyświetla wersję\n" " -v --verbose Wyświetla więcej informacji\n" -#: ../avahi-utils/avahi-set-host-name.c:114 +#: avahi-utils/avahi-set-host-name.c:114 #, c-format msgid "Invalid number of arguments, expecting exactly one.\n" msgstr "Nieprawidłowa liczba parametrów, oczekiwano dokładnie jednego.\n" -#: ../avahi-utils/avahi-set-host-name.c:193 +#: avahi-utils/avahi-set-host-name.c:193 #, c-format msgid "Host name successfully changed to %s\n" msgstr "Pomyślnie zmieniono nazwę komputera na %s\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo new file mode 100644 index 0000000000000000000000000000000000000000..660837dcc30fa962ce5b14f7ecee3bbfa54abe9d GIT binary patch literal 17347 zcmcJV36LCTb;sMbFlNC9AK2!yTM%K()@WtfvE`L4d!=3BHPY^ScO_pK(L2+-+ty6? zczR|fnac;5T--;%F^5fzaV1c=RFH%skjf@hNK!yZDiu+g8)eeZkU_x78!fA^zjpc3KcTd}0t> z2`*87{6#_VWAM7ugCIE}2)3UQ1oOOq=*%Ga2=%9&9R#oj4}!c39tAgme+2#__ z>VF2j8ax6@pT7%g{D0`)|1~H(`8g=Pynx13J_nRuE&$c;l^~`YTn|cK^Pu$C0mXlh zd;fk=diYIH{d^G=-`7F4_jjP$`w=L6IXSfT+d27?k~P0ksZp1f`!0lzct}YP_Ft_*szU8GH#; z`(FXo-k*SK@7ti}{}_m=20sG#f~T-3wuAdY&Evfw|ANo)pX})`LG|;GuKXic{x9$( z>Ys-a)!(V0#&xzUhoIKiM(`KFIq+ieD9FFyA^y7p{2D0zp8yk01{Z*m_jRD`?5z$z z4Ql*<0ZP7)gOdMGK+W?M8WFz4;YHv&%G+J}8c=$;9(*pCfU=|8!IQu@fs*f?pyd8A zxC#6Q_#E)(p!9hnOyWNWWa$Ji14Hl%@UthNC-B=R(g%Y-O#R~s;nmdN#N;0V@1)Ut zd4Ca3=eKzO=oZ`Vt(RE)YJt28-Ue!Y9Rnr*AA^$be}l5yQ?}aip9dnsU?V8`>;n-= zaI3?+L5=fakfj%_fST9iUW&x8C6e!zdy>-i{Y8+aW! z4Bi83+{ZwT_dB4*`(sdk^=F{kKbgj)hjTz&NHFZmdqIt_2Fg#}4ZaxssKaC6S(Lx# z%8!9s7e8_3=i~HWOnE)1`YRkxy80NDeZLW058el!4t~kie;t$^|IpR{6cpbn2;pq- zB2eFtf~tQ57=m|$veQq3lFOfilEZ(3(!;9}lI;4mpzJ>dRev9dDub_pyTE?~_5Ed6 zTKhW)ZlwGU5R(cX1@-;kfck#jh?V0;Q1zpr`fY&I;QgT1?+?M3fIkD({#h(`>EUW{ z2%H8bhg-mNzy>ILdOIk2J_73duYj_zZ-Zxo|LX7w@LbBLW2`R)F9KB_2PL=HgOXbZ zWC+0rKgVOW8 zUIT;wlnQ-|IQif|1+%`Tc+^-{)`))L4%~lG%HpS;#*j zKV&PCj~>bMRZtx|1JZLFv;@fp^hg$Z4nlM07cvJc&^}1ECV3zZ6PE&Jeb&H_K}!Ei-(pv+%5&9$~d)Fg7 z)RRK5Grz3Q*H77wo?o$GY)U`nW8UQIa`4xoYoQN8L(toxN$6DQF6aZ$yC6MN(3>II z*=f+*Aw9na{RX6U&bDNpOZk5tGz`5L8in*MLzkFe#BL5F@U4*6p&r?J_p`?pUJh=A zZignI!;qdkpbMcY^sA7bt1JW$gE4d+^jhdG&{@zMAwAE5UJuC!$=ei?cm^n9rMX}ZED@M`}er#**`@4o*j`HVP;Z7*T{!^X za@@+3EcI-m;d7OiYYeXWR(3d#E48c|Q zYn?_@vyH+=)`~*}U`ATa8qIplSM?-s+pep$R*kBRu6)*P4GF|)yOqRwxX{WPX4>Xs z+g6>nlEsuBEA^}z85vHPa%jt5e3rchdn?Yf`f}O%j4OLil-EgXmVW{MG^;E`NvWN& zEWMx|nySRAp%%prECmxvvvwFQ!!1GDCYm(Sj9R%7t()*vr`_zd(M4Fi!D1Rwdngb` z<&f>RHqWH8LmgwUwp&+rV>JfgjA)*3q=QOr-t`iOW0buC8Q!oKwWIkckB5Q{d3a0K zY-8g2twVOGPjz|Zbd~2zMK}8441ad^TGJtm$F^zgEUgaWJutbumv>g}vI1&Txm^70}FD?VaH*JK9IuM)J3=7QH5KBm=t}!?U9SW6IVU`zeLfoq3$q zl3zG$%ilBhNa<-g)}Kyk3g3M#W+Mreu09N}l`$V)igCT(Ibgg=&FwKv zj*=>d=)qd!# zcPumB&yU%^lk+|r>eIqLB4*)f!-s@7m69L0et07$dLLlk$L ztu8*Y6m^hkZ7A50?3~OBEmb?M7DB2YrKTQN;n=)mIN2GDhLijE?hVm`-F9nc2kiXekNDlDwLsY`!&RdE!}?4JKk8KRufl^63L#+#I*EYL+ha@mK2!lQ+9*rxlOj zcU?m+a4|s?y=c4bWx%?%jrYFVMR=8V8uL^WB1NsmPJ`z2p+GP4HqlGqH!8R2=U5QA zuawq`fjYC#%MCqblRuhu&}`g3oV5-O`m7S0AgX3ID=UeC%@=&7#0oywv)!>3Hz~A; z8_o97^|njJSsH5(Bl{Ntg_9cvi7c)ek(xR8ebmjpV}9p`e8=$o&XIxb6K|#=JT{_o zlka6`j|_Gn%+eH73U)_n69o!-HUVkCki+ z<0Ck&bWwAo3)`!vhwHjvLwLW%*^cgTyN#f_@4c<<72&*v*R-d_KZ&K?XA6OV5>LX=vuXrCJRY| z*73w@IT*7q6o0llX^Jp{u{b}}&YFQ)yM{lm=@8*RMqXAxa}%+!9+?-_=&E^NZWA5ry?2s~WRxh3jFVZO8{V<=j^`e;evp zqaC**U2}umvAg7AE9*4ZXrnc#26R-!$1#N-_b_-Id7{%=*v#0%?4(#o zrG|7`DdpF%TKiVfo%6x{Q@Opv4pMH^gI}XIbMDSL^!X)TjsVrvoQkbn`{v;zm;Sb$ zR0`c|>}&CqqCOs%_r2mNglr0>7cRdy;hEM}V1AjUfzdA1lPZV4vM%qK4Sb-m93cLfqaT>@^o0&UEU;1rn<&jePfU z2f^wp;>=)D64rkx+Hr3Rn@RPMM5Bn=v?LQnI0U5J)HHOub~7~Fx8l@JBF7&4peJm4 zQAGZtgRcqUbZcUMA>T&QCXh9yywj9GDNVgLn3@fZT?JEK34Q~ch9{VDS243TIO{Ll zLyno3=hQ7&VJ~JGQsD#XB0h>bZ8o_!TGO(ckBOaP{HRs|!YH~?W6$K~6*{LTkF(v*Lc+HW$W1mh^Xe{)n6J4e3>BpI6h?x%8|Osf7#BLl5322P zp&sb+Z(q8jwP?xu2Jr_L4N z-t6Yc>fWS_Lv!#^d@F_2;)SSFZ@a+O%&YA5c&*$03r*xXAqh_TaAYs&jH@&awPLm; z9m>MODM)#V^QQB0l{1@ETf?@av~50eVzbM~4WQp@dKk_2yC!4Oh%@d2+1R)dtp#&g z7A~+jyUs4EVr3p3SZ5=U+ z3J=;KJ~%jL!b9yh2U)D@>{oDvaPb^(#qB= z!!6rJF1w<#W$TtLLwh4GyyjX_n$t{1;5rj6L~%Xbld<)sT#3fvj+UufSh$A!?MA#g zYc1~NyL7P=Eyk6(IBJZ9yIRp5Nj-_uQ2w;D$PoC@@K>5`WLwd3a!>;!A@6t14DFlP zH(rY1lFeI&cAFtEI2}2@#Dndt_RsC9Y%BRRi-ovV8Bd8Y@UJ7` zw)vzzG|d4%s#o@K(M>d+Hcc_VYU}pU{=DkKG~5|pvT^&+jg{9hXEtdG;y}`BM_f-a zl+9Zz^Km=6#NCn)x~|^GHCQVOxdVy9=(bKRvKLl^u45f*WSsNLCo{`AD5-;Sa2pcI z1+9E0O)}lDu>6RMb)pjdFSNBR2WWT24eH$(l~HvYH{TO?b8}{&9yM-0_)mn9&3@;CuyUGkZygc z_~bZgpD=2!9Lp6mG)Z=}$oj~z5K(N>Kf}uXSb-iV+tc3&BEd!TPd+TtZ^ragl08u= zM3eSOT;ETc?vbYGjYw4;daVt*o1B!M7bG3}LSD{SrbhjFJJBv*OY&xxu6$-WuG_f} z%KgknE1#)hp$)lQd@x61ZeNppY`5%+jii}AZ`zy@Gb~Pydv)gJXRKiD^ zscDM(A-n2n#HWKW=g-H-%?GWqzy_s+{IbD+TK&`ryK>$B*dZH>>`M);@lBEO8I&Sg z;~U*F#cSn?+zOg1*G`(Tc61FcQRVS%ky}dqC|6RzDVnUA6O+!=JLHQcQxlYY=gv?0 zL{c}8mUJt|*h0f#r~jQ@KEg8*kr_uXvp-&I=-sVNu6(gU;!X4M2TFv_`F7<2 zt_#uSI6)g<6g7eKshqw0V}#tlGX~=QP+lg?%J9detGGGR;^dC8XmfQWpa>F=QAlaY zMWiTut*<0#eKqKt(J~BOJ$~z7!ex#~(R%W$R>HV@BD-c>FWrWA3pC(`uA(BptYd`k z#+4$rVm>C0?Ea)Hqqa7Gq@$=SPSd zx#Pob{F;>65dRFUmu)NEHt;3FEltoF=%z5|xL4!U>(Xr+kft9I&fLEt|IVEsRa~P) zfyO}lTtkn9KIPV1>vL|aYL#?bRcW$reYHM8)?aNiWWBXM@zz^gWZrtKi_}|xwQYG6 zt0P%1Yq3V_jsOeBGy+0NmxFUh0*+t=`MR#?7#j;#?&6Y1;$gFz*GEdxsZGRL%Uo*C z$=1lzZ?xQ_+PKZ@+a&08Cmv!g{TVv5H=7(?$>CeF3x3{sYdo;rjGFdp^eSWv^_#4= z0vEhm{afMmaCl#^HiO%_eLsDSP6qmmiNfvn`mv(ZYAZ1zMz_O@%ORRHUDqrud+AEe z-cls|M>YsL+)`ctFz}p(=6CHXqyzEM5u6wW!2YYodwY4rjbJb*2tub@UZV=Cq}if zdWLKBn)O0Y?zm^&-`ebcX%w<6bmiAV&rahjZG(Q6mi%=*fXbcH(jT? z$ZQP^P(F%mq6wdzotPA2)ua&RzqP+~5PaW!C+ri^_aoCbwAh(G}`-)s4CgV|TnFv6v*I-N(y8da3wT z+SSf1f5%K3RY4rf&3}^Ry^<{IgOzut965|2x-*e}=uZ-4k&!f!r*=#-l5G+{y58$F zSZ^i`)<5#;sG7l0_TSZkSy^4L#*2KUZG}FXEIj3C)#b_+7+jP9Anxe5=bc zHep7fb&yNGihfwdnF65lh~-z4@|*U+!lE#di!@@>xF()5r@R&Oqdn3m(TnLgbX zncn#$6&FCvDq**}-b+I58dovn|1{1YHJ!WSeW9416I+oUwWi6z&u&9@brXDcwfGEM zSZ!`*a@h5O<@XTSAJ+7mq>Xh%H;P4`6g58_QS}iM;$PUDx zD>ULZlSM2nM6~B!VUJB41>fEw`DJY!KJQ122$ia!uE?&kK-@4&ZD9e$%>u7Ylta5- zcRd2`W}PEhm~j~74-trS+|@-eopq{cxjYIF1^f8(hQU=X63h)tS5m@%Vuj)IsuSc8 z8cqJhKnWG}Z#=7sTDVW=q@}9|`6qMEv, 2011 +# Rafael Fontenelle , 2018. msgid "" msgstr "" "Project-Id-Version: Avahi\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-10 13:24+0200\n" -"PO-Revision-Date: 2013-11-20 09:58+0000\n" -"Last-Translator: nullck \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/lennart/avahi/" -"language/pt_BR/)\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2017-05-20 13:03+0000\n" +"PO-Revision-Date: 2018-03-29 08:47-0200\n" +"Last-Translator: Rafael Fontenelle \n" +"Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 1.0.0-beta1\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -33,7 +32,7 @@ msgstr "Estado inválido" #: ../avahi-common/error.c:33 msgid "Invalid host name" -msgstr "Nome de máquina inválido" +msgstr "Nome de host inválido" #: ../avahi-common/error.c:34 msgid "Invalid domain name" @@ -49,7 +48,7 @@ msgstr "DNS TTL Inválido" #: ../avahi-common/error.c:37 msgid "Resource record key is pattern" -msgstr "Chave de gravação de recurso é a padrão" +msgstr "Chave de registro de recurso é um padrão" #: ../avahi-common/error.c:38 msgid "Local name collision" @@ -73,7 +72,7 @@ msgstr "Número de porta inválido" #: ../avahi-common/error.c:44 msgid "Invalid record key" -msgstr "Chave de gravação inválida" +msgstr "Chave de registro inválida" #: ../avahi-common/error.c:45 msgid "Invalid address" @@ -85,15 +84,15 @@ msgstr "Tempo limite esgotado" #: ../avahi-common/error.c:47 msgid "Too many clients" -msgstr "Muitos clientes simultâneos" +msgstr "Muitos clientes" #: ../avahi-common/error.c:48 msgid "Too many objects" -msgstr "Muitos objetos simultâneos" +msgstr "Muitos objetos" #: ../avahi-common/error.c:49 msgid "Too many entries" -msgstr "Muitas entradas simultâneas" +msgstr "Muitas entradas" #: ../avahi-common/error.c:50 msgid "OS Error" @@ -177,7 +176,7 @@ msgstr "Falha de DNS: NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" -msgstr "Falha de DNS: NO TIMP" +msgstr "Falha de DNS: NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" @@ -217,7 +216,7 @@ msgstr "Classe de DNS inválida" #: ../avahi-common/error.c:83 msgid "Not supported" -msgstr "Não suportado(a)" +msgstr "Sem suporte" #: ../avahi-common/error.c:85 msgid "Not permitted" @@ -237,14 +236,14 @@ msgstr "A operação de requisição é inválida porque é redundante" #: ../avahi-common/error.c:94 msgid "Invalid Error Code" -msgstr "Código de Erro Inválido" +msgstr "Código de erro inválido" #: ../avahi-discover-standalone/avahi-discover.ui.h:1 msgid "Avahi Discovery" msgstr "Avahi Discovery" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 -#: ../avahi-python/avahi-discover/avahi-discover.py:76 +#: ../avahi-python/avahi-discover/avahi-discover.py:82 msgid "No service currently selected." msgstr "Nenhum serviço selecionado atualmente." @@ -254,37 +253,37 @@ msgstr "Navegador Zeroconf do Avahi" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 msgid "Browse for Zeroconf services available on your network" -msgstr "Procurar por serviços Zeroconf disponíveis em sua rede" +msgstr "Procura por serviços Zeroconf disponíveis em sua rede" -#: ../avahi-python/avahi-discover/avahi-discover.py:224 +#: ../avahi-python/avahi-discover/avahi-discover.py:237 msgid "TXT" msgstr "TXT" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "TXT Data:" msgstr "TXT Dado:" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "empty" msgstr "vazio" -#: ../avahi-python/avahi-discover/avahi-discover.py:228 +#: ../avahi-python/avahi-discover/avahi-discover.py:241 msgid "Service Type:" -msgstr "Tipo de Serviço:" +msgstr "Tipo de serviço:" -#: ../avahi-python/avahi-discover/avahi-discover.py:229 +#: ../avahi-python/avahi-discover/avahi-discover.py:242 msgid "Service Name:" -msgstr "Name do Serviço:" +msgstr "Name do serviço:" -#: ../avahi-python/avahi-discover/avahi-discover.py:230 +#: ../avahi-python/avahi-discover/avahi-discover.py:243 msgid "Domain Name:" -msgstr "Nome de Dominio:" +msgstr "Nome de domínio:" -#: ../avahi-python/avahi-discover/avahi-discover.py:231 +#: ../avahi-python/avahi-discover/avahi-discover.py:244 msgid "Interface:" msgstr "Interface:" -#: ../avahi-python/avahi-discover/avahi-discover.py:232 +#: ../avahi-python/avahi-discover/avahi-discover.py:245 msgid "Address:" msgstr "Endereço:" @@ -302,7 +301,7 @@ msgstr "Domínio" #: ../avahi-ui/avahi-ui.c:190 msgid "The domain to browse in, or NULL for the default domain" -msgstr "O domínio a navegar ou ZERO para o domínio padrão" +msgstr "O domínio a navegar ou NULO para o domínio padrão" #: ../avahi-ui/avahi-ui.c:196 msgid "Service Type" @@ -338,11 +337,11 @@ msgstr "O número IP da porta do serviço resolvido" #: ../avahi-ui/avahi-ui.c:219 msgid "Host Name" -msgstr "Nome da máquina" +msgstr "Nome de host" #: ../avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" -msgstr "O nome da máquina do serviço resolvido" +msgstr "O nome de host do serviço resolvido" #: ../avahi-ui/avahi-ui.c:225 msgid "TXT Data" @@ -354,7 +353,7 @@ msgstr "Os dados TXT do serviço resolvido" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve Service" -msgstr "Serviço de Resolução" +msgstr "Serviço de resolução" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" @@ -362,7 +361,7 @@ msgstr "Resolver o serviço selecionado automaticamente antes de retornar" #: ../avahi-ui/avahi-ui.c:236 msgid "Resolve Service Host Name" -msgstr "Serviço de Resolução de Nome de Host" +msgstr "Serviço de resolução de nome do host" #: ../avahi-ui/avahi-ui.c:236 msgid "" @@ -377,7 +376,7 @@ msgstr "Família do endereço" #: ../avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" -msgstr "A família do endereço para o resolução de nome da máquina" +msgstr "A família do endereço para o resolução de nome de host" #: ../avahi-ui/avahi-ui.c:326 #, c-format @@ -398,7 +397,7 @@ msgstr "A navegação pelo serviço %s no domínio %s falhou: %s" #: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178 #: ../avahi-utils/avahi-browse.c:179 msgid "n/a" -msgstr "n/a" +msgstr "n/d" #: ../avahi-ui/avahi-ui.c:649 #, c-format @@ -421,7 +420,7 @@ msgstr "Falha ao conectar no servidor do Avahi: %s" #: ../avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" -msgstr "Procurando por serviços na Rede local:" +msgstr "Procurando por serviços na rede local:" #: ../avahi-ui/avahi-ui.c:737 #, c-format @@ -449,22 +448,20 @@ msgstr "Alterar domínio" #: ../avahi-ui/avahi-ui.c:1043 ../avahi-ui/avahi-ui.c:1180 msgid "Browsing..." -msgstr "Procurando..." +msgstr "Procurando…" #: ../avahi-ui/avahi-ui.c:1047 ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 #: ../avahi-ui/bssh.c:161 -#, fuzzy msgid "_Cancel" -msgstr "Cancelado.\n" +msgstr "_Cancelar" #: ../avahi-ui/avahi-ui.c:1048 -#, fuzzy msgid "_OK" -msgstr "OK" +msgstr "_OK" #: ../avahi-ui/avahi-ui.c:1134 msgid "Initializing..." -msgstr "Inicializando..." +msgstr "Inicializando…" #: ../avahi-ui/avahi-ui.c:1162 msgid "Location" @@ -480,7 +477,7 @@ msgstr "Type" #: ../avahi-ui/avahi-ui.c:1184 msgid "_Domain..." -msgstr "_Domínio..." +msgstr "_Domínio…" #: ../avahi-ui/bssh.c:55 #, c-format @@ -499,7 +496,7 @@ msgstr "" " -s --ssh Procura por servidores SSH\n" " -v --vnc Procura por servidores VNC\n" " -S --shell Procura por servidores SSH e VNC\n" -" -d --domain=DOMAIN O domínio no qual se deseja que seja procurado\n" +" -d --domain=DOMÍNIO O domínio no qual se deseja que seja procurado\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -512,7 +509,7 @@ msgstr "Escolha um servidor de shell" #: ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 ../avahi-ui/bssh.c:161 msgid "C_onnect" -msgstr "" +msgstr "C_onectar" #: ../avahi-ui/bssh.c:151 msgid "Desktop" @@ -533,7 +530,7 @@ msgstr "Escolha um servidor SSH" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "Conectando a \"%s\" ...\n" +msgstr "Conectando a “%s” …\n" #: ../avahi-ui/bssh.c:240 #, c-format @@ -551,7 +548,7 @@ msgstr "Navegador de servidores SSH do Avahi" #: ../avahi-ui/bssh.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled SSH Servers" -msgstr "Procurar por Servidores SSH com o Zeroconf Habilitado" +msgstr "Procurar por servidores SSH com o Zeroconf habilitado" #: ../avahi-ui/bvnc.desktop.in.in.h:1 msgid "Avahi VNC Server Browser" @@ -559,7 +556,7 @@ msgstr "Navegador de servidores VNC do Avahi" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Procurar por Servidores VNC com Zeroconf Habilitado" +msgstr "Procurar por servidores VNC com Zeroconf habilitado" #: ../avahi-utils/avahi-browse.c:107 #, c-format @@ -574,8 +571,7 @@ msgstr ": Cache esgotado\n" #: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261 #, c-format msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n" -msgstr "" -"Falha ao resolver o serviço \"%s\" do tipo \"%s\" no domínio \"%s\": %s\n" +msgstr "Falha ao resolver o serviço “%s” do tipo “%s” no domínio “%s”: %s\n" #: ../avahi-utils/avahi-browse.c:340 #, c-format @@ -613,13 +609,13 @@ msgstr "Falha ao consultar a string de versão: %s\n" #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" -msgstr "Falha ao consultar o nome de máquina: %s\n" +msgstr "Falha ao consultar o nome de host: %s\n" #: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 #: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 #, c-format msgid "Server version: %s; Host name: %s\n" -msgstr "Versão do servidor: %s; Nome de máquina: %s\n" +msgstr "Versão do servidor: %s; Nome de host: %s\n" #. Translators: This is a column heading with abbreviations for #. * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain @@ -639,7 +635,7 @@ msgstr "E Inter Prot %-*s %-20s Domínio\n" #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "Desconectado, reconectando...\n" +msgstr "Desconectado, reconectando…\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 @@ -657,7 +653,7 @@ msgstr "Falha no cliente, saindo: %s\n" #: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 #, c-format msgid "Waiting for daemon ...\n" -msgstr "Esperando pelo daemon...\n" +msgstr "Esperando pelo daemon…\n" #: ../avahi-utils/avahi-browse.c:647 msgid "" @@ -676,17 +672,16 @@ msgid "" " -p --parsable Output in parsable format\n" msgstr "" " -h --help Mostra essa ajuda\n" -" -V --version Mostra a versão\n" -" -D --browse-domains Procura por domínios de navegação no lugar de " -"serviços\n" +" -V --version Mostra a versão\n" +" -D --browse-domains Procura domínios de navegação em vez de serviços\n" " -a --all Mostra todos os serviços, independente do tipo\n" -" -d --domain=DOMAIN Nome do domínio em que será procurado\n" +" -d --domain=DOMÍNIO Nome do domínio em que será procurado\n" " -v --verbose Habilita o modo detalhado\n" -" -t --terminate Terminar após compilar a lista de more/less\n" -" -c --cache Terminar após compilar todas as entradas do cache\n" -" -l --ignore-local Ignorar serviços locais\n" -" -r --resolve Resolver serviços encontrados\n" -" -f --no-fail Não falhar se o daemon não estiver disponível\n" +" -t --terminate Termina após compilar a lista de more/less\n" +" -c --cache Termina após compilar todas as entradas do cache\n" +" -l --ignore-local Ignora serviços locais\n" +" -r --resolve Resolve serviços encontrados\n" +" -f --no-fail Não falha se o daemon não estiver disponível\n" " -p --parsable Saída em formato analisável\n" #: ../avahi-utils/avahi-browse.c:660 @@ -694,8 +689,8 @@ msgid "" " -k --no-db-lookup Don't lookup service types\n" " -b --dump-db Dump service type database\n" msgstr "" -" -k --no-db-lookup Ignorar tipos de serviços\n" -" -b --dump-db Compilar base de dados de tipos de serviço\n" +" -k --no-db-lookup Ignora tipos de serviços\n" +" -b --dump-db Compila base de dados de tipos de serviço\n" #: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 #, c-format @@ -711,7 +706,7 @@ msgstr "Falha ao criar objeto de enquete simples.\n" #: ../avahi-utils/avahi-publish.c:76 #, c-format msgid "Established under name '%s'\n" -msgstr "Estabelecida no nome \"%s\"\n" +msgstr "Estabelecida no nome “%s”\n" #: ../avahi-utils/avahi-publish.c:81 #, c-format @@ -721,7 +716,7 @@ msgstr "Falha ao registrar: %s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "Colisão de nomes, escolhendo um novo nome \"%s\".\n" +msgstr "Colisão de nomes, escolhendo um novo nome “%s”.\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format @@ -741,12 +736,12 @@ msgstr "Falha ao adicionar serviço: %s\n" #: ../avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "Falha ao adicionar subtipo \"%s\": %s\n" +msgstr "Falha ao adicionar subtipo “%s”: %s\n" #: ../avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" -msgstr "Conflito de nome de máquina\n" +msgstr "Conflito de nome de host\n" #: ../avahi-utils/avahi-publish.c:216 #, c-format @@ -766,18 +761,18 @@ msgid "" " -R --no-reverse Do not publish reverse entry with address\n" " -f --no-fail Don't fail if the daemon is not available\n" msgstr "" -"%s [opções] %s [] \n" -"%s [opções] %s \n" -"-h --help Mostra essa ajuda \n" -"-V --version Mostra a versão \n" -"-s --service Publica o serviço \n" -"-a --address Publica o endereço \n" -"-v --verbose Habilita o modo detalhado \n" -"-d --domain=DOMAIN Domínio onde se quer publicar o serviço \n" -"-H --host=DOMAIN Máquina onde o serviço está \n" -"--subtype=SUBTYPE Subtipo adicional para registrar junto ao serviço \n" -"-R --no-reverse Não publica endereço reverso\n" -"-f --no-fail Não falha se o daemon não estiver disponível \n" +"%s [opções] %s []\n" +"%s [opções] %s \n" +" -h --help Mostra essa ajuda\n" +" -V --version Mostra a versão\n" +" -s --service Publica o serviço\n" +" -a --address Publica o endereço\n" +" -v --verbose Habilita o modo detalhado\n" +" -d --domain=DOMÍNIO Domínio onde se quer publicar o serviço\n" +" -H --host=DOMÍNIO Host onde o serviço está\n" +" --subtype=SUBTIPO Subtipo adicional para registrar junto ao serviço\n" +" -R --no-reverse Não publica endereço reverso\n" +" -f --no-fail Não falha se o daemon não estiver disponível\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format @@ -797,12 +792,12 @@ msgstr "Nenhum comando especificado.\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "Falha ao resolver o nome da máquina \"%s\": %s\n" +msgstr "Falha ao resolver o nome do host “%s”: %s\n" #: ../avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "Falha ao resolver o endereço \"%s\": %s\n" +msgstr "Falha ao resolver o endereço “%s”: %s\n" #: ../avahi-utils/avahi-resolve.c:157 #, c-format @@ -818,26 +813,26 @@ msgid "" " -6 Lookup IPv6 address\n" " -4 Lookup IPv4 address\n" msgstr "" -"%s [opções] %s \n" -"%s [opções] %s \n" +"%s [opções] %s \n" +"%s [opções] %s \n" "\n" " -h --help Mostra essa ajuda\n" -" -V --version Mostra a versão\n" -" -n --name Resolve o nome de máquina fornecido\n" -" -a --address Resolve o endereço fornecido\n" -" -v --verbose Habilita o modo detalhado\n" +" -V --version Mostra a versão\n" +" -n --name Resolve o nome de host fornecido\n" +" -a --address Resolve o endereço fornecido\n" +" -v --verbose Habilita o modo detalhado\n" " -6 Procura por endereços IPv6\n" " -4 Procura por endereços IPv4\n" #: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" -msgstr "Falha ao criar o resolvedor de nomes de máquina: %s\n" +msgstr "Falha ao criar o resolvedor de nomes de host: %s\n" #: ../avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "Falha ao analisar o endereço \"%s\"\n" +msgstr "Falha ao analisar o endereço “%s”\n" #: ../avahi-utils/avahi-resolve.c:314 #, c-format @@ -853,9 +848,9 @@ msgid "" " -V --version Show version\n" " -v --verbose Enable verbose mode\n" msgstr "" -"%s [opções] \n" +"%s [opções] \n" "\n" -" -h --help Mostra essa ajuda\n" +" -h --help Mostra essa ajuda\n" " -V --version Mostra a versão\n" " -v --verbose Habilita o modo detalhado\n" @@ -867,4 +862,4 @@ msgstr "Número de argumentos inválido, esperando exatamente um.\n" #: ../avahi-utils/avahi-set-host-name.c:193 #, c-format msgid "Host name successfully changed to %s\n" -msgstr "Nome de máquina alterado para %s com sucesso\n" +msgstr "Nome de host alterado com sucesso para %s\n" diff --git a/po/quot.sed b/po/quot.sed new file mode 100644 index 0000000..0122c46 --- /dev/null +++ b/po/quot.sed @@ -0,0 +1,6 @@ +s/"\([^"]*\)"/“\1”/g +s/`\([^`']*\)'/‘\1’/g +s/ '\([^`']*\)' / ‘\1’ /g +s/ '\([^`']*\)'$/ ‘\1’/g +s/^'\([^`']*\)' /‘\1’ /g +s/“”/""/g diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin new file mode 100644 index 0000000..2436c49 --- /dev/null +++ b/po/remove-potcdate.sin @@ -0,0 +1,19 @@ +# Sed script that remove the POT-Creation-Date line in the header entry +# from a POT file. +# +# The distinction between the first and the following occurrences of the +# pattern is achieved by looking at the hold space. +/^"POT-Creation-Date: .*"$/{ +x +# Test if the hold space is empty. +s/P/P/ +ta +# Yes it was empty. First occurrence. Remove the line. +g +d +bb +:a +# The hold space was nonempty. Following occurrences. Do nothing. +x +:b +} diff --git a/po/ro.gmo b/po/ro.gmo new file mode 100644 index 0000000000000000000000000000000000000000..873185c9c5e0bed196f6711890cb61e8ad90fbe4 GIT binary patch literal 17054 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Ξ!qLHa21Cs3F|S8x5=ZX!p>Y{yBnC6 zb3FPh2Yiw5t2^mqP1^G|r7QO5aFXV_W#VufHfp&Im{!TS(B#gZ`gu0s3)>?ke#Ros z=1Uk}ZHe}ik8sgbW`mk}e7Dm5$_0ruCId=7*<>(|K% zrDTOtb?j0^NfaJ?pdB@t7b~Gs7eN@;s92?w&WcmnefWT?ro8e z@ksz2t!odR8@9KuosSf}I1AW|Y}~D)WgWhqpzTZNa5I@N5nT{yagzi8H7hPOIi+)) z>NhiOEq|dU@2y3i< zh(p1h-{4wq@i$3!W6MTM5k1!%s`n5LoO0n}!IbWgDha5Pvpwh`a}0CA+|eU02{qHv zbXeyzQOMASv?MuY9=PM0sV&A!9Hff5nvq7d0RLmpF~umW+mxAF)hb1GNh!EdEO#UQ z1RTA~dmX}ErDovi8ohPq%0tp4poSf1uF@EyJ53<6DE?nJTh>-U?LS+g(hM9dj(n=dAZ&j}$^7 ztHr^vrZt4$G-_kH0qS>Pv6pJ{$2KAUMuv-eh5r_|O@y)yAsVRCSbPo;Del zlLr%5Y)%X#QqI-><(>rLRiu<`FB+zgb17D@%cK=6w;7Jq>73SDvB@rtS?RS(tHWf` zZ4sHeuAh82N%)ox2UvcMTRz#~F5ejG9E&%zJb=Cux>a9QhW1L=YuPInRH0n8o|0AW zn^KOIZz|iWr0$5Z*t7N?z^|!M(z#wIWiH$?Kz|}&Gi@$nEY*m#hgj{%xVs3s1?5JF zI}n%Qu|7(fHyliyDArZ>&Dt+{nF*JbI`$A8w1$z)8(9)}y*x_R4OgRtoNpp(Ae+X% zRoVg9U3q0@iKeS{5i(65brpTu{9Dmo5vUb)x*zcwxT49f+h*XHx)L~cYKmSernG1_ zyF;|)&XSDWQHO&i(S-7EFoQ639@ohVi^)N4Rb2Bf11Fh$dnsZ^wie!oj$umbc$&Ip2lYIG;L!ucuXd8hXXGs zeU!S77%)L5j*W_4V4mwqr=em~D4VA^&SvyT=)vet(vtW{TEFt9DoFGNy_I}pEEj5- z$;e%X@xx~J2$ds}de|_|5u^lsP(8D!6rL7X7!WfBp_yKB#g=zkv?8`3XT$~eWlBNEJ;*$=qxJnG*mD=+D|M(;gnZ>s$sKmbnW0TGI-aad2(Cq0&F=Z6WH-5NaG5{s Ue$^|3*iBK)r#ebk#M^KFAGc*P?f?J) literal 0 HcmV?d00001 diff --git a/po/ro.po b/po/ro.po index 03b3472..410f7b8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,21 +4,22 @@ # # Translators: # Arthur Țițeică , 2014 +# Daniel Șerbănescu , 2017. msgid "" msgstr "" -"Project-Id-Version: Avahi\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-10 13:24+0200\n" -"PO-Revision-Date: 2014-03-15 19:22+0000\n" -"Last-Translator: Arthur Țițeică \n" -"Language-Team: Romanian (http://www.transifex.com/lennart/avahi/language/" -"ro/)\n" +"Project-Id-Version: Fedora 10\n" +"Report-Msgid-Bugs-To: https://github.com/lathiat/avahi/issues\n" +"POT-Creation-Date: 2017-08-12 15:24+0000\n" +"PO-Revision-Date: 2017-08-26 21:44+0200\n" +"Last-Translator: Daniel Șerbănescu \n" +"Language-Team: Gnome Romanian Translation Team\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" -"2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2);;\n" +"X-Generator: Virtaal 0.7.1\n" #: ../avahi-common/error.c:30 msgid "OK" @@ -34,15 +35,15 @@ msgstr "Stare greșită" #: ../avahi-common/error.c:33 msgid "Invalid host name" -msgstr "Nume de gazdă nevalid" +msgstr "Nume gazdă nevalid" #: ../avahi-common/error.c:34 msgid "Invalid domain name" -msgstr "Nume de domeniu nevalid" +msgstr "Nume domeniu nevalid" #: ../avahi-common/error.c:35 msgid "No suitable network protocol available" -msgstr "Nu este disponibil niciun protocol de rețea" +msgstr "Nu este disponibil nici un protocol de rețea" #: ../avahi-common/error.c:36 msgid "Invalid DNS TTL" @@ -50,7 +51,7 @@ msgstr "DNS TTL nevalid" #: ../avahi-common/error.c:37 msgid "Resource record key is pattern" -msgstr "Înregistrarea cheie resursă este model" +msgstr "Cheia înregistrării resursă este mostră" #: ../avahi-common/error.c:38 msgid "Local name collision" @@ -110,11 +111,11 @@ msgstr "Operație nevalidă" #: ../avahi-common/error.c:54 msgid "An unexpected D-Bus error occurred" -msgstr "S-a produs o eroare D-Bus" +msgstr "S-a produs o eroare D-Bus neașteptată" #: ../avahi-common/error.c:55 msgid "Daemon connection failed" -msgstr "Conexiune serviciu eșuată" +msgstr "Conxiunea la serviciu a eșuat" #: ../avahi-common/error.c:56 msgid "Memory exhausted" @@ -126,15 +127,15 @@ msgstr "Obiectul trimis nu este valid" #: ../avahi-common/error.c:58 msgid "Daemon not running" -msgstr "Serviciul nu funcționează" +msgstr "Serviciul nu rulează" #: ../avahi-common/error.c:59 msgid "Invalid interface index" -msgstr "Index interfață nevalid" +msgstr "Index interfeță nevalid" #: ../avahi-common/error.c:60 msgid "Invalid protocol specification" -msgstr "Specificație de protocol nevalidă" +msgstr "Specificație de protocol nevalid" #: ../avahi-common/error.c:61 msgid "Invalid flags" @@ -142,7 +143,7 @@ msgstr "Marcaje nevalide" #: ../avahi-common/error.c:63 msgid "Not found" -msgstr "Nu a fost găsit" +msgstr "Negăsit" #: ../avahi-common/error.c:64 msgid "Invalid configuration" @@ -154,7 +155,7 @@ msgstr "Versiunea nu corespunde" #: ../avahi-common/error.c:66 msgid "Invalid service subtype" -msgstr "Subtip serviciu nevalid" +msgstr "Subtip de serviciu nevalid" #: ../avahi-common/error.c:67 msgid "Invalid packet" @@ -162,47 +163,47 @@ msgstr "Pachet nevalid" #: ../avahi-common/error.c:68 msgid "Invalid DNS return code" -msgstr "Cod DNS returnat nevalid" +msgstr "Cod returnat DNS nevalid" #: ../avahi-common/error.c:69 msgid "DNS failure: FORMERR" -msgstr "Eroare DNS: FORMERR" +msgstr "DNS eșuat: FORMERR" #: ../avahi-common/error.c:70 msgid "DNS failure: SERVFAIL" -msgstr "Eroare DNS: SERVFAIL" +msgstr "DNS eșuat: SERVFAIL" #: ../avahi-common/error.c:71 msgid "DNS failure: NXDOMAIN" -msgstr "Eroare DNS: NXDOMAIN" +msgstr "DNS eșuat: NXDOMAIN" #: ../avahi-common/error.c:72 msgid "DNS failure: NOTIMP" -msgstr "Eroare DNS: NOTIMP" +msgstr "DNS eșuat: NOTIMP" #: ../avahi-common/error.c:74 msgid "DNS failure: REFUSED" -msgstr "Eroare DNS: REFUSED" +msgstr "DNS eșuat: REFUSED" #: ../avahi-common/error.c:75 msgid "DNS failure: YXDOMAIN" -msgstr "Eroare DNS: YXDMAIN" +msgstr "DNS eșuat: YXDMAIN" #: ../avahi-common/error.c:76 msgid "DNS failure: YXRRSET" -msgstr "Eroare DNS: YXRRSET" +msgstr "DNS eșuat: YXRRSET" #: ../avahi-common/error.c:77 msgid "DNS failure: NXRRSET" -msgstr "Eroare DNS: NXRRSET" +msgstr "DNS eșuat: NXRRSET" #: ../avahi-common/error.c:78 msgid "DNS failure: NOTAUTH" -msgstr "Eroare DNS: NOTAUTH" +msgstr "DNS eșuat: NOTAUTH" #: ../avahi-common/error.c:79 msgid "DNS failure: NOTZONE" -msgstr "Eroare DNS: NOTZONE" +msgstr "DNS eșuat: NOTZONE" #: ../avahi-common/error.c:80 msgid "Invalid RDATA" @@ -218,11 +219,11 @@ msgstr "Clasă DNS nevalidă" #: ../avahi-common/error.c:83 msgid "Not supported" -msgstr "Nu este suportat" +msgstr "Nesuportat" #: ../avahi-common/error.c:85 msgid "Not permitted" -msgstr "Nu este permis" +msgstr "Nepermis" #: ../avahi-common/error.c:86 msgid "Invalid argument" @@ -245,9 +246,9 @@ msgid "Avahi Discovery" msgstr "Descoperire Avahi" #: ../avahi-discover-standalone/avahi-discover.ui.h:2 -#: ../avahi-python/avahi-discover/avahi-discover.py:76 +#: ../avahi-python/avahi-discover/avahi-discover.py:82 msgid "No service currently selected." -msgstr "Niciun serviciu selectat." +msgstr "Niciun serviciu selectat curent." #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:1 msgid "Avahi Zeroconf Browser" @@ -255,37 +256,37 @@ msgstr "Navigator Avahi Zeroconf" #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2 msgid "Browse for Zeroconf services available on your network" -msgstr "Descoperă serviciile Zeroconf disponibile în rețeaua ta" +msgstr "Descoperă serviciile Zeroconf disponibile în rețeaua dumneavoastră." -#: ../avahi-python/avahi-discover/avahi-discover.py:224 +#: ../avahi-python/avahi-discover/avahi-discover.py:237 msgid "TXT" msgstr "TXT" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "TXT Data:" msgstr "Date TXT:" -#: ../avahi-python/avahi-discover/avahi-discover.py:226 +#: ../avahi-python/avahi-discover/avahi-discover.py:239 msgid "empty" msgstr "gol" -#: ../avahi-python/avahi-discover/avahi-discover.py:228 +#: ../avahi-python/avahi-discover/avahi-discover.py:241 msgid "Service Type:" msgstr "Tip serviciu:" -#: ../avahi-python/avahi-discover/avahi-discover.py:229 +#: ../avahi-python/avahi-discover/avahi-discover.py:242 msgid "Service Name:" msgstr "Nume serviciu:" -#: ../avahi-python/avahi-discover/avahi-discover.py:230 +#: ../avahi-python/avahi-discover/avahi-discover.py:243 msgid "Domain Name:" msgstr "Nume domeniu:" -#: ../avahi-python/avahi-discover/avahi-discover.py:231 +#: ../avahi-python/avahi-discover/avahi-discover.py:244 msgid "Interface:" msgstr "Interfață:" -#: ../avahi-python/avahi-discover/avahi-discover.py:232 +#: ../avahi-python/avahi-discover/avahi-discover.py:245 msgid "Address:" msgstr "Adresă:" @@ -319,7 +320,7 @@ msgstr "Nume serviciu" #: ../avahi-ui/avahi-ui.c:202 msgid "The service name of the selected service" -msgstr "Numele serviciului selectat" +msgstr "Numele serviciului al serviciului selectat" #: ../avahi-ui/avahi-ui.c:208 msgid "Address" @@ -343,7 +344,7 @@ msgstr "Nume gazdă" #: ../avahi-ui/avahi-ui.c:219 msgid "The host name of the resolved service" -msgstr "Numele de gazdă a serviciului rezolvat" +msgstr "Numele de gazdă al serviciului rezolvat" #: ../avahi-ui/avahi-ui.c:225 msgid "TXT Data" @@ -355,11 +356,11 @@ msgstr "Datele TXT ale serviciului rezolvat" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve Service" -msgstr "Rezolvă serviciul" +msgstr "Rezolvă serviciu" #: ../avahi-ui/avahi-ui.c:230 msgid "Resolve the selected service automatically before returning" -msgstr "Rezolvă automat serviciul selectat înainte de a reveni" +msgstr "Rezolvă automat serviciul selectat înainte de returnare" #: ../avahi-ui/avahi-ui.c:236 msgid "Resolve Service Host Name" @@ -369,15 +370,15 @@ msgstr "Rezolvă numele de gazdă a serviciului" msgid "" "Resolve the host name of the selected service automatically before returning" msgstr "" -"Rezolvă automat numele de gazdă a serviciului selectat înainte de a reveni" +"Rezolvă automat numele de gazdă al serviciului selectat înainte de returnare" #: ../avahi-ui/avahi-ui.c:242 msgid "Address family" -msgstr "Familie adresă" +msgstr "Familie de adrese" #: ../avahi-ui/avahi-ui.c:242 msgid "The address family for host name resolution" -msgstr "Familia adresei pentru rezolvarea numelui de gazdă" +msgstr "Familia de adrese pentru rezolvarea numelui de gazdă" #: ../avahi-ui/avahi-ui.c:326 #, c-format @@ -387,7 +388,7 @@ msgstr "Clientul Avahi a eșuat: %s" #: ../avahi-ui/avahi-ui.c:388 #, c-format msgid "Avahi resolver failure: %s" -msgstr "Eroare rezolvare Avahi: %s" +msgstr "Eroare rezolvator Avahi: %s" #: ../avahi-ui/avahi-ui.c:518 #, c-format @@ -412,7 +413,7 @@ msgstr "Încercare de citire domeniu Avahi eșuată: %s" #: ../avahi-ui/avahi-ui.c:706 msgid "Browse service type list is empty!" -msgstr "Lista tipului de serviciu este vidă!" +msgstr "Lista tipului de servici este vidă!" #: ../avahi-ui/avahi-ui.c:717 #, c-format @@ -421,27 +422,27 @@ msgstr "Conectarea la serverul Avahi a eșuat: %s" #: ../avahi-ui/avahi-ui.c:735 msgid "Browsing for services on local network:" -msgstr "Navigare servicii în rețea locală:" +msgstr "Navigare după servicii în rețea locală:" #: ../avahi-ui/avahi-ui.c:737 #, c-format msgid "Browsing for services in domain %s:" -msgstr "Navigare servicii în domeniu %s:" +msgstr "Navigare după servicii în domeniul %s:" #: ../avahi-ui/avahi-ui.c:773 #, c-format msgid "Failed to create browser for %s: %s" -msgstr "Creare navigator a eșuat pentru %s: %s" +msgstr "Crearea navigatorului a eșuat pentru %s: %s" #: ../avahi-ui/avahi-ui.c:907 #, c-format msgid "Failed to create resolver for %s of type %s in domain %s: %s" -msgstr "A eșuat crearea resolver-ului pentru %s de tipul %s în domeniul %s: %s" +msgstr "A eșuat crearea rezolvatorului pentru %s de tipul %s în domeniul %s: %s" #: ../avahi-ui/avahi-ui.c:982 #, c-format msgid "Failed to create domain browser: %s" -msgstr "Creare navigator domeniu a eșuat: %s" +msgstr "Crearea navigatorului de domenii a eșuat: %s" #: ../avahi-ui/avahi-ui.c:993 msgid "Change domain" @@ -453,14 +454,12 @@ msgstr "Se descoperă..." #: ../avahi-ui/avahi-ui.c:1047 ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 #: ../avahi-ui/bssh.c:161 -#, fuzzy msgid "_Cancel" -msgstr "Anulat.\n" +msgstr "_Anulează" #: ../avahi-ui/avahi-ui.c:1048 -#, fuzzy msgid "_OK" -msgstr "OK" +msgstr "_OK" #: ../avahi-ui/avahi-ui.c:1134 msgid "Initializing..." @@ -496,10 +495,10 @@ msgstr "" "%s [opțiuni]\n" "\n" " -h --help Afișează acest ajutor\n" -" -s --ssh Navigare servere SSH\n" -" -v --vnc Navigare servere VNC\n" -" -S --shell Navigare SSH și VNC\n" -" -d --domain=DOMAIN Domeniul de navigare\n" +" -s --ssh Navighează servere SSH\n" +" -v --vnc Navighează servere VNC\n" +" -S --shell Navighează SSH și VNC\n" +" -d --domain=DOMENIU Domeniul în care se navighează\n" #: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775 #, c-format @@ -508,15 +507,15 @@ msgstr "Prea mulți parametri\n" #: ../avahi-ui/bssh.c:149 msgid "Choose Shell Server" -msgstr "Alege consolă server" +msgstr "Alegeți server Shell" #: ../avahi-ui/bssh.c:149 ../avahi-ui/bssh.c:156 ../avahi-ui/bssh.c:161 msgid "C_onnect" -msgstr "" +msgstr "C_onectează" #: ../avahi-ui/bssh.c:151 msgid "Desktop" -msgstr "Birou" +msgstr "Desktop" #: ../avahi-ui/bssh.c:152 msgid "Terminal" @@ -524,16 +523,16 @@ msgstr "Terminal" #: ../avahi-ui/bssh.c:156 msgid "Choose VNC server" -msgstr "Alege server VNC" +msgstr "Alegeți server VNC" #: ../avahi-ui/bssh.c:161 msgid "Choose SSH server" -msgstr "Alege server SSH" +msgstr "Alegeți server SSH" #: ../avahi-ui/bssh.c:185 #, c-format msgid "Connecting to '%s' ...\n" -msgstr "Se conectează la '%s' ...\n" +msgstr "Se conectează la „%s” ...\n" #: ../avahi-ui/bssh.c:240 #, c-format @@ -559,7 +558,7 @@ msgstr "Navigator Avahi de server VNC" #: ../avahi-ui/bvnc.desktop.in.in.h:2 msgid "Browse for Zeroconf-enabled VNC Servers" -msgstr "Navighează serverele VNC având activat Zeroconf" +msgstr "Navigheză serverele VNC având activat Zeroconf" #: ../avahi-utils/avahi-browse.c:107 #, c-format @@ -606,14 +605,14 @@ msgstr "avahi_domain_browser_new() a eșuat: %s\n" #: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168 #, c-format msgid "Failed to query version string: %s\n" -msgstr "Interogare șir versiune eșuată: %s\n" +msgstr "Eșec la interogarea șirului de versiune: %s\n" #: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399 #: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173 #: ../avahi-utils/avahi-set-host-name.c:189 #, c-format msgid "Failed to query host name: %s\n" -msgstr "Interogare nume gazdă eșuată: %s\n" +msgstr "Eșec la interogarea numelui de server: %s\n" #: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403 #: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177 @@ -639,7 +638,7 @@ msgstr "Domeniu E Ifce Prot %-*s %-20s\n" #: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163 #, c-format msgid "Disconnected, reconnecting ...\n" -msgstr "Deconectat, se reconectează...\n" +msgstr "Deconectat, se reconectează ...\n" #: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829 #: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386 @@ -652,7 +651,7 @@ msgstr "Crearea obiectului client a eșuat: %s\n" #: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59 #, c-format msgid "Client failure, exiting: %s\n" -msgstr "Clientul a eșuat, ieșire: %s\n" +msgstr "Clientul a eșuat, se iese: %s\n" #: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206 #, c-format @@ -675,27 +674,27 @@ msgid "" " -f --no-fail Don't fail if the daemon is not available\n" " -p --parsable Output in parsable format\n" msgstr "" -" -h --help Afișează acest ajutor\n" -" -V --version Afișează versiunia\n" -" -D --browse-domains Navigare domenii de navigare în loc de servicii\n" -" -a --all Afișează toate serviciile, indiferent de tip\n" -" -d --domain=DOMENIU Domeniul pentru navigare\n" -" -v --verbose Activare modul detaliat\n" -" -t --terminate Termină după afișarea unei liste mai mult sau mai puțin " +" -h --help \t\tAfișează acest ajutor\n" +" -V --version \tAfișează versiunia\n" +" -D --browse-domains Navighează domenii de navigare în loc de servicii\n" +" -a --all \t\tAfișează toate serviciile, indiferent de tip\n" +" -d --domain=DOMENIU Domeniul în care se navighează\n" +" -v --verbose \tActivează modul detaliat\n" +" -t --terminate \tTermină după afișarea unei liste mai mult sau mai puțin " "complete\n" -" -c --cache Termină după afișarea tuturor întrărilor din cache\n" -" -l --ignore-local Ignorare servicii locale\n" -" -r --resolve Rezolvă serviciile găsite\n" -" -f --no-fail Nu eșua dacă serviciul nu este disponibil\n" -" -p --parsable Ieșire în format prelucrabil\n" +" -c --cache \t\tTermină după afișarea tuturor întrărilor din cache\n" +" -l --ignore-local \tIgnoră serviciile locale\n" +" -r --resolve \tRezolvă serviciile găsite\n" +" -f --no-fail \tNu eșua dacă serviciul nu este disponibil\n" +" -p --parsable \tIeșire în format prelucrabil\n" #: ../avahi-utils/avahi-browse.c:660 msgid "" " -k --no-db-lookup Don't lookup service types\n" " -b --dump-db Dump service type database\n" msgstr "" -" -k ---no-db-lookup Nu căuta tipuri de servicii\n" -" -b --dump-db Arată baza de date tip serviciu\n" +" -k ---no-db-lookup \t Nu căuta tipuri de servicii\n" +" -b --dump-db \t Arată baza de date tip serviciu\n" #: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219 #, c-format @@ -706,12 +705,12 @@ msgstr "Prea puțini parametrii\n" #: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152 #, c-format msgid "Failed to create simple poll object.\n" -msgstr "Creare obiect interogare eșuată.\n" +msgstr "Eșec la crearea unui simplu obiect poll.\n" #: ../avahi-utils/avahi-publish.c:76 #, c-format msgid "Established under name '%s'\n" -msgstr "Sub nume stabilit „%s”\n" +msgstr "Stabilit sub numele „%s”\n" #: ../avahi-utils/avahi-publish.c:81 #, c-format @@ -721,32 +720,32 @@ msgstr "Înregistrare eșuată: %s\n" #: ../avahi-utils/avahi-publish.c:94 #, c-format msgid "Name collision, picking new name '%s'.\n" -msgstr "Coloziune de nume, se alege nume nou „%s”.\n" +msgstr "Coloziune de nume, se alege un nume nou „%s”.\n" #: ../avahi-utils/avahi-publish.c:114 #, c-format msgid "Failed to create entry group: %s\n" -msgstr "Creare intrare grup eșuată: %s\n" +msgstr "Eșec la creare grupului de intrări: %s\n" #: ../avahi-utils/avahi-publish.c:124 #, c-format msgid "Failed to add address: %s\n" -msgstr "Adăugare adresă eșuată: %s\n" +msgstr "Eșec la adăugarea adresei: %s\n" #: ../avahi-utils/avahi-publish.c:134 #, c-format msgid "Failed to add service: %s\n" -msgstr "Adăugare serviciu eșuată: %s\n" +msgstr "Eșec la adăugarea serviciului: %s\n" #: ../avahi-utils/avahi-publish.c:140 #, c-format msgid "Failed to add subtype '%s': %s\n" -msgstr "Adăugare subtip „%s” eșuată: %s\n" +msgstr "Eșec la adăugarea subtipului „%s”: %s\n" #: ../avahi-utils/avahi-publish.c:191 #, c-format msgid "Host name conflict\n" -msgstr "Conflict nume gazdă\n" +msgstr "Conflict nume de server\n" #: ../avahi-utils/avahi-publish.c:216 #, c-format @@ -769,18 +768,15 @@ msgstr "" "%s [opțiuni] %s []\n" "%s [opțiuni] %s \n" "\n" -" -h --help Afișează acest ajutor\n" -" -V --version Afișează versiunea\n" -" -s --service Publicare serviciu\n" -" -a --address Publicare adresă\n" -" -v --verbose Activează modul detaliat\n" -" -d --domain=DOMENIU Domeniu în care se va publica serviciul\n" -" -H --host=DOMENIU Gazda unde este localizat serviciul\n" -" --subtype=SUBTIP Un subtip adițional cu care va fi înregistrat acest " -"serviciu\n" -" -R --no-reverse Nu publica înregistrarea inversă împreună cu " -"adresa\n" -" -f --no-fail Nu eșua dacă serviciul nu este disponibil\n" +" -h --help \t\t Afișează acest ajutor\n" +" -V --version \t Afișează versiunea\n" +" -s --service \t Publică serviciu\n" +" -a --address \t Publică adresă\n" +" -v --verbose \t Activează modul detaliat\n" +" -d --domain=DOMENIU Domeniu în care se publică serviciul\n" +" -H --host=DOMENIU \t Gazda serviciului\n" +" --subtype=SUBTIP Subtip adițional pentru înregistrare serviciului\n" +" -f --no-fail \t Nu eșua dacă serviciul nu este disponibil\n" #: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318 #, c-format @@ -790,22 +786,22 @@ msgstr "Număr incorect de parametri\n" #: ../avahi-utils/avahi-publish.c:329 #, c-format msgid "Failed to parse port number: %s\n" -msgstr "A eșuat interpretarea numărului de port: %s\n" +msgstr "Eșec la parsarea numărului de port: %s\n" #: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246 #, c-format msgid "No command specified.\n" -msgstr "Nicio comandă specificată.\n" +msgstr "Nici o comandă specificată.\n" #: ../avahi-utils/avahi-resolve.c:89 #, c-format msgid "Failed to resolve host name '%s': %s\n" -msgstr "A eșuat rezolvarea numelui de gazdă „%s”: %s\n" +msgstr "Eșec la rezolvarea numelui de server „%s”: %s\n" #: ../avahi-utils/avahi-resolve.c:126 #, c-format msgid "Failed to resolve address '%s': %s\n" -msgstr "A eșuat rezolvarea adresei „%s”: %s\n" +msgstr "Eșec la rezolvarea adresei „%s”: %s\n" #: ../avahi-utils/avahi-resolve.c:157 #, c-format @@ -824,28 +820,28 @@ msgstr "" "%s [opțiuni] %s \n" "%s [opțiuni] %s \n" "\n" -" -h --help Afișează acest ajutor\n" -" -V --version Afișează versiune\n" -" -n --name Rezolvare nume domeniu\n" -" -a --address Rezolvare adresă\n" -" -v --verbose Activare mod detaliat\n" -" -6 Căutare adresă IPv6\n" -" -4 Căutare adresă IPv4\n" +" -h --help Arată acest ajutor\n" +" -V --version Arată versiunea\n" +" -n --name Rezolvă numele de domeniu\n" +" -a --address Rezolvă adresa\n" +" -v --verbose Activează modul detaliat\n" +" -6 Caută adresă IPv6\n" +" -4 Caută adresă IPv4\n" #: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181 #, c-format msgid "Failed to create host name resolver: %s\n" -msgstr "A eșuat crearea rezolvatorului de nume: %s\n" +msgstr "Eșec la crearea rezolvatorului de nume de server: %s\n" #: ../avahi-utils/avahi-resolve.c:309 #, c-format msgid "Failed to parse address '%s'\n" -msgstr "Prelucrare adresă „%s” eșuată\n" +msgstr "Eșec la parsarea adresei „%s”\n" #: ../avahi-utils/avahi-resolve.c:314 #, c-format msgid "Failed to create address resolver: %s\n" -msgstr "A eșuat crearea rezolvatorului de adresă: %s\n" +msgstr "Eșec la crearea rezolvatorului de adrese: %s\n" #: ../avahi-utils/avahi-set-host-name.c:73 #, c-format @@ -858,14 +854,14 @@ msgid "" msgstr "" "%s [opțiuni] \n" "\n" -" -h --help Afișează acest ajutor\n" -" -V --version Afișează versiunea\n" +" -h --help Arată acest ajutor\n" +" -V --version Arată versiunea\n" " -v --verbose Activează modul detaliat\n" #: ../avahi-utils/avahi-set-host-name.c:114 #, c-format msgid "Invalid number of arguments, expecting exactly one.\n" -msgstr "Numărul de parametri nu este valid, se așteaptă unul singur.\n" +msgstr "Numărul de parametri nu este valid, se așteaptă doar unul singur.\n" #: ../avahi-utils/avahi-set-host-name.c:193 #, c-format diff --git a/po/ru.gmo b/po/ru.gmo new file mode 100644 index 0000000000000000000000000000000000000000..2ae2bfa7cad03e60efd5af40e85a33ae535b5775 GIT binary patch literal 20792 zcmcJV3vgYM$Ks@qlN)i%s2(iInS+-*+$d*C2H6{#eMjZ zLW6Ax4+AD76hZ;17*?2Y3rO2fPEk6#NDVDf3hC zE#QBFYX2MXH1L#jjQJpVHuzR>5%_Mf+v5!&O-;q$-wOuZKMlSY{GP9W89bf)--3St zo(Pf4z;nP0!F3+DfEw=!a0&Pq;Kkr?zy;v>?=j{Ka04iod;-+`he4KZY9LEDclrA- zf#T!0L54Pe18V$NJiZF5{h3Tw^#KUW%%%SRqaHuy>uVl&`}!wAre?kaioZVs#m85` z4}iY_PX*h~Weo7`;CbMApvLV2HNTI6G&Mz!_kimERZ#N!9yk~L1$Y7Yb~*_!^>{sa zKKHkQ7lC`hW#IQg^*`nP#_(q@;a>o*1~reHLD9Jf)Og#n?1Uo>< zu>@-V+d)0QAC!JP3ra43>F<9CN-jSEMfaB=Dr-(-F!Ad>pyW3nRR2y;&p!f64mW}t z=N3@y?gT~e^PuQG14>Vh`ubmk(%+K<*YBMmLz)Xg)vp3I?lqv~Jpzi(ZT|jYPS3v3Q&q3+`TVcNBGZz$p)`FVv$32E1W@##*=x+fz zUHugN5O@Yka0$2&qO>?Q~4p!gN4St%JcvJu;cg7S)}ao0-U7Q zxg6{Rhe1rj90oPdzXxH7`57p`^cI}jJn)^M_|XL}2G@GL9n^ZB1(~AxM{qfK0?Za( z1xntZ0Y&!+D89c8c7Z2ejxPtV^7u5U_NQK9%yr-jkfoR}fwKP}fYOiCJDpt40mY|_ zK~&4E0_9gn{QV=~O75QrHSX`g_kaO|2s^=dgZ=(~416#5clrCLJig%Tf9&yBzWz)m zrFG5)MLz`30q+K{1-}A{udjmA_Y+yP^zwW#0M~+AUlEiZ?ge3?`CE`ba|Xn(23LdE zfDeJI!G8m_uEkdpYrrkwAA^4d-TK_3=0{$~t1TSJx>A@qQqM`@kEye-XS2JZ}xY9oz(BBIY2t0sJ+H zN|}{wou2OkN4b9yoC|iKe8Ou%@$ojW9sF~!1N^bCKNTgM&;24$?LG;f3f=?G10Mv% zr^Ddc;6H)V|Nj6{bu*92pkihOYy-aqUIHEjPXT`hN)G=Hir(2D!v}$|%REBC4ch#1 z0a&I)*Sn%0Ex4U~@$U&=e;@b&MLgR`*+tPcNYT2kqI{Mj-e~;KQSPQNeS4t}Hhw(g z?;iy3^1q+*D1EtuatkG(=qgdPKIxwH{cDuy5+6JK&4nJn0=|v%CCZ}|*@7J7pn7mwcYCPdG3)gKwei_4gNfya)Uh^1CwV5_w3tak_feukBvF4if#eaCJeo z5YLNQm3n)k=|xgnkf`P$gH zR+|gPO64$s0d}T?rLpnRkY1yOO4SWL2(`i7AhT;;(^7*2VX;~+gq2{ZTpF{>ww)cV zQD_y0i;UPlS{lq*9>65-W~dDni3_Qg{BP_EFF zPEV5I-LU@N&($h`SE2#>NCxfs0Y6F*^l%?3kZl{}bJg5Ht`fGH zIhEkX(s&gWuiVt;rh2^QQDLY`Wh5R(KfK~^+<3Je5aV$)t)3MJv)W#}Ze_adM$yFz zo4k(c4wR}Rfr#gd`GAg&_-wR3wcvo&FB>UUszEU~76uCzELh%_WQcv9%jeORik=3` zXUU@D^B_gZSrbTHkvhh+b4#^8!cQn_9X0h6O)%VBaMW;G!@ewPk-#-hm`q^x}ByK#F(^}*5V42(%FkUKGmj^d4t8S}W&fheZ^;*2;49)!<-W&;7Rd&ue zT2io~Hh{Ali413Y{znZ{T$+_*%~IeV8%yM}$I}yuefQO4C;+WAV zy)EHM6%W1k_LQvmi{>0Xlk?slsB5erVs!iK^Q>tVTUHFW2C==oIf`<;Vl|yXHx5h* zK(Vy7joXzr)P>tday59GZ!^mZ%h#1+DGk=jWtcR&otn{bkQNJ;brhDH?qJ=sk}L>TYG4esJsnUjuV;W<91Ds z#qIpaE@CThQfd*7jaRpy?}k*KrMadW62C|&Jm0tx%fh^6saKNUk^>WuM%Ylx8+_gSf^9d&i}yu9+2> zl_}+zAB5ZRRmEW~i6KhGB6_P;;ju29Q@K#Vq|NlK+t}2WRqOlK_V)FqE7z^>@4lx0 z>M510*KU|ncfsd&hX3e$%Yx@qs=-Z zbf@VJRu2t^!G<#Q=Cog2;ostgmB6)WOFfS3uqqoa!#utukKx&bM)GJgtE>u2KE#>G z|2y%eA9+R2eB^?bm2m5Gza|af+>hvlWi?BTJy;I4ZSheWRyfBog_vs=dmQX*P9>X^ z_gbZao6*2&=y*f)ld(o?GSNoEFt9;vgc7LXp`PV91_f$!pcfGAkxur(nXvXL4$B4~tw=3-RA`@@U0MX>Vh#g;B z))6Hvt+YK?V%cl%)3s@`dZt#9%T=40$@Zq{e4G7kRwmmr_Lnscly+#eFvwo7Sy!pq zxII)GB@Y<1&NDBqmZMu;#Ovio3!jEBaZK=fMXwG2E0b;ddb<0&;|AW0n)g1)#uZv$VYpV#DX)xcy*Y>j zaox~pZn!zcnE&zfLbOs;I3I3{>oX#}f`if+g@bTgZczDDsTiWh5symaVat@pbAy}1 zYTO{9!Oc26A!!TAF~kc)g~9Zqy9dY#yzF66NnG_W{o}9 z@TxOPIv}>H((-pLM-Nz6oL-uB;;{Z9Xy1B%FkTqkEY>Jdwv?ozFo!&p1DY{ys{IOW z_*QyaE6A~jQLYn=N36(2=Nt4UbJJmo{RMx=3RUt~dsnHAi=o`D|EO8NF|c}N)<;5! z0@w!Hm_C03v(e>bt@mzkW7ie6)ZtgGFV+mHi1Oz+Ey~rZ1i30wlUWUfq)Z`xR8{~p z;$cMW_vu?J6DylCSCTfKg8}8D(Mkw~-l@ssEOo08^PL0oiw*3$k~f{UH>ZPva?{jJ zr|G}0UnS__94G!kwc90(8lCyA-hd~My>Y}H?+OvL=dzlLl#YaEY!n4fw|lSwrpbFt zwq{jP1f#b8fHHGX?+S2lE;wS{^L1Wm_d7~!C6IhLl&g(aeLic~)f{vt>MnjEiAsf( z1gE?;=g#GyZD!Q}&m zYTE`j;JMNERUA~478l3uZKZ3;(!l-fx~Mp3(Za5-MZw&;fqpJLziZK=;L2cOKy&Vw zcP)+{E$dpMpSH)sWs4REx8CZyEMK%_9$gmsE?r#<^~knc-gRlS`xW!zdgwAtH0H7{ zC|nsVhQNpCE%oQ=SqIzohZ?)<`|Af9I~qIdhl2WZ^@;k?`q9R&#sfiPNBvmib}IJQ z4>xwXGq0=@-BubRcRQUAH6C!CvR)C@AEm|N`b1-A<30^LS%0B^fPr@h498D9p-Ii* zNMl$1JN12u1IX0Tco5Y0(i>9sgLW;RBpeYc;e9R>a)&|UKb>8ulgMnJFX zM*{{rAmx^dp~lBFw3~m{3o&m<=tZO?sMiY&b~mDB%8+~^Xxw30rs|z&oU!M~S+C06 ztR?Ws%$#x~Elo6ORatM%TCIAYINI11SqQ96k}>SCZOdy;GZ_Tc{6A z64fbgC+l5X%LLV}soqJRV_l6qMHbmvUnis6uY))z3Tv+|FXvt_@%ZIj*4w<-OI$~Y z7;rpB!cEn`P=BKS<@&?*$E6qCdA}OKoJq?blwk@l+a&$A&r3bjEjvEsQ|#--PIs^?EVOQ+T6pS*=r%toM#H(TF*a(6E-bk-tww z$a+zkjz{sp?0>dg=0?wYV>v^wCC8%;ypeR?gdb8ZjD4rxX38fK2yk~&6ZcMYT0KeY zl_r?ZE1SaC_~CrmFc=S7yQO5%5iyw z=LiCOa14osO*B5s0uLoTdt!(9 zELLG*hkQvKfPAWjvueJXB{Dq0Fi(*o?DbB}Co+nQ8q6mK&pWsF9F=5kO2xDyy!-)D z3nHI_5Q6e+BD^3u@~n99XmMF@a$WeGOtB}OPc%|VPylV4cQA?~^|STKpef!cqkJRM z3q{9C7Ns0{M`|_M`Nnjy8GF-2_fu^0m~`^9u)jCQYrg?WG;f{jpJQ=oi_1%oq7!#n z-9R)}S)+iX^xLLvKBLte>-uBLX9={hnO-oR^oI0JZ?5Z4Le*|dr1ExCp-j`|oltf! zuW8jxNt}*~-Uli6@2)xxGo0Wj=t_93n}V&FEmrD56`vCYf}Nr41NY<8$?+ zrv6|Qc@saakZlUBtn`4Two_71wCOZbcP6Lphi3|ggLjy;$>%=hknYvEe>2^D7fw%Y z5f7p9N=XR?{vCzlg4DB_c1@7KlDufJ*>oY%F?a;+bPj5@&ijH$){hmvuclpM!pvF@ zTl>nL%-^1G=-jcTm9}70NwaveNXs&7CewDe5};*b*I_xK`9VZc4&fxbi`RCS>}6w> zftgx8(@q@e;5=CCvuK&uNk-V;=H!&@3xnMbcCxVta;(wgRK5b=u4zL-*lAv$M`Rv7Mb>-?c@ap+rn}uMhx(HYs$IGE z)N!*N!HeIVQ+e?Sd|=hdVR)^`A*TO?V(OFVJBrLF`j{f~f&HQ)<4N=ZMAjqs6~xph z(FYb&pTu8TOnnr8YLWHGkA$0Q)o}#aWS-Rs8=F*}a3r*O-oWS97^&b!x=BzI-zQA{ zD_%I9idp}H{-F@++8iYoktE5P4iY8%mVP2~+1GycqE=p-L`GH5MV=-SuoEl6(*lF76VCP6| z_8JJq4945}=?sQQ%d~JU@m|TR_3?Bh8Nj^=^DyVg(m(kh zmwCJ)vq_{PqL-;9t&4k>eYuVuF}fhVU6~z|UW4^fio;ksBAONdkCSvPj_3e#Vx}NE zTWM($K8tc2H|_geiZh{jkVVhCBWK$!CfPLQWF+xUK+%ZK+BaC4x*M!UhbZ-l>6HcM z%740fc`uMYLzz`yyN`gF-tLfL$THC%w*NCw(cbdVr^wHEotEoSRaE@}|Z%>`% zRhX-d7M#%d(^!-<-HRv8gEtNAgHSN_i844vQor-nCsm4Y1QVT(D2Y`&dsfoeW0OG} z|EyBn!I$JCneD$Tg)+GoDWEZG~L#CS9LA=I`&3L9vV zyOo7K^oz*28tJ7wRKkB)|L9w~Bo-^8g*0DV4zKy_=<1K9w{_G!sa=cCkr+Is^0MK* zF1V|wi)S)Vy|wq7)Rfkw+hoRhEjJ1^D9?j#4@7W~7xl+Th@O}HOobI_yQ=}SiKQea zgG(OE=orZvFhp7%Hu=l!M^EZU{G~~>8ZwcYM|+Hgx0<6p@<&y1yfB9Mn|qKKhi{R@ z0)(qm02zdJC>%9NvNV?N0ur+eY&QQ|s_kF$JlrQJzB0x9sdWTOdji)YrKxr9OGfsJ zQg;Q;1Ns(GhrFo@OHVU=0Y#K0utR>Fr4T-}KaDfTDOwLJ_zW_w1C8kHO)n^%KY=nb zx1I$xpECUH38XbR(sCxQ4_@?{goI$nhx0b2iARt2UGh}UKH^kIn&t`2eoFDy-|`Ew z+s`88wy=uC?%zJvkoth*2+mKE;7ca_TJ(K~JBUx~$LuE*d2F2^I^kQ#k=Q~W^=2FK z2II9x3_nf%5xO}a=lm9GAuo)%TV0OhpNRO3tvDll9$>cGRD13DWzcufC&iZhh0_9-V{pXhF#txt9MAH(=yd literal 0 HcmV?d00001 diff --git a/po/sk.gmo b/po/sk.gmo new file mode 100644 index 0000000000000000000000000000000000000000..de3b6ce2a8a7ccf9945bc1561d43c4ea51246843 GIT binary patch literal 17434 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 JoXH^J{{bXZMxg)z literal 0 HcmV?d00001 diff --git a/po/sr.gmo b/po/sr.gmo new file mode 100644 index 0000000000000000000000000000000000000000..8cabd0af88b626b637e9cf5cbbb27cea1eb55e4b GIT binary patch literal 21702 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 LQ)u2?Lgs$~Ioz&@ literal 0 HcmV?d00001 diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo new file mode 100644 index 0000000000000000000000000000000000000000..76f8f6d24707adffeebec45447ff43abb79669dc GIT binary patch literal 17413 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 GKKei16smOq literal 0 HcmV?d00001 diff --git a/po/stamp-po b/po/stamp-po new file mode 100644 index 0000000..9788f70 --- /dev/null +++ b/po/stamp-po @@ -0,0 +1 @@ +timestamp diff --git a/po/sv.gmo b/po/sv.gmo new file mode 100644 index 0000000000000000000000000000000000000000..2511e55ecb69aebfbf572b3100fbbd6d5d57bc3b GIT binary patch literal 17014 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 MwzvO2!{(;;|Jzv|6951J literal 0 HcmV?d00001 diff --git a/po/tr.gmo b/po/tr.gmo new file mode 100644 index 0000000000000000000000000000000000000000..79bd80d44fccb0698926707997bee9b6c3355a3a GIT binary patch literal 17181 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 VAD%fr^0rMWb22eadK!-K{{dRT;Hm%s literal 0 HcmV?d00001 diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo new file mode 100644 index 0000000000000000000000000000000000000000..7959c1ddedb58d243badaac7869358d12616c9de GIT binary patch literal 15737 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/dev/null || : # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am index d184fde..f9fa082 100644 --- a/service-type-database/Makefile.am +++ b/service-type-database/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -EXTRA_DIST=build-db.in service-types +EXTRA_DIST=service-types pkglibdatadir=$(libdir)/avahi @@ -27,16 +27,11 @@ if HAVE_GDBM noinst_SCRIPTS=build-db pkglibdata_DATA+=service-types.db -build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ - -e 's,@DBM\@,gdbm,g' $< > $@ && \ - chmod +x $@ - -service-types.db: service-types build-db +service-types.db: service-types $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ mv $@.coming $@ -CLEANFILES = service-types.db build-db +CLEANFILES = service-types.db endif if HAVE_DBM @@ -44,11 +39,6 @@ if HAVE_DBM noinst_SCRIPTS=build-db pkglibdata_DATA+=service-types.db.pag service-types.db.dir -build-db: build-db.in - $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ - -e 's,@DBM\@,dbm,g' $< > $@ && \ - chmod +x $@ - service-types.db.pag: service-types.db $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag service-types.db.dir: service-types.db @@ -57,7 +47,7 @@ service-types.db: service-types build-db $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ if test -f "$@.coming"; then mv $@.coming $@; fi -CLEANFILES = service-types.db* build-db +CLEANFILES = service-types.db* endif endif diff --git a/service-type-database/Makefile.in b/service-type-database/Makefile.in index a625367..5cd51c1 100644 --- a/service-type-database/Makefile.in +++ b/service-type-database/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,14 +113,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -183,7 +188,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -196,8 +200,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -208,7 +210,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -249,11 +250,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -267,16 +269,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -295,16 +288,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -312,15 +313,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -339,10 +340,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -357,6 +355,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -367,6 +367,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -410,8 +412,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -437,13 +437,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = build-db.in service-types +EXTRA_DIST = service-types pkglibdatadir = $(libdir)/avahi pkglibdata_DATA = $(am__append_1) $(am__append_2) @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@noinst_SCRIPTS = build-db @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@noinst_SCRIPTS = build-db -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@CLEANFILES = service-types.db* build-db -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@CLEANFILES = service-types.db build-db +@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@CLEANFILES = service-types.db* +@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@CLEANFILES = service-types.db all: all-am .SUFFIXES: @@ -662,20 +662,10 @@ uninstall-am: uninstall-pkglibdataDATA .PRECIOUS: Makefile -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@build-db: build-db.in -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@DBM\@,gdbm,g' $< > $@ && \ -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ - -@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@service-types.db: service-types build-db +@HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@service-types.db: service-types @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \ @HAVE_GDBM_TRUE@@HAVE_PYTHON_TRUE@ mv $@.coming $@ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@build-db: build-db.in -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ -e 's,@DBM\@,dbm,g' $< > $@ && \ -@HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ chmod +x $@ - @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@service-types.db.pag: service-types.db @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@ $(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag @HAVE_DBM_TRUE@@HAVE_PYTHON_TRUE@service-types.db.dir: service-types.db diff --git a/service-type-database/build-db.in b/service-type-database/build-db.in deleted file mode 100755 index 4cda425..0000000 --- a/service-type-database/build-db.in +++ /dev/null @@ -1,44 +0,0 @@ -#!@PYTHON@ -# -*-python-*- -# This file is part of avahi. -# -# avahi is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# avahi is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -# License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with avahi; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -import @DBM@, sys - -if len(sys.argv) > 1: - infn = sys.argv[1] -else: - infn = "service-types" - -if len(sys.argv) > 2: - outfn = sys.argv[2] -else: - outfn = infn + ".db" - -db = @DBM@.open(outfn, "n") - -for ln in file(infn, "r"): - ln = ln.strip(" \r\n\t") - - if ln == "" or ln.startswith("#"): - continue - - t, n = ln.split(":", 1) - - db[t.strip()] = n.strip() - -db.close() diff --git a/service-type-database/service-types b/service-type-database/service-types index 18493ae..b2cb266 100644 --- a/service-type-database/service-types +++ b/service-type-database/service-types @@ -140,6 +140,7 @@ _realplayfavs._tcp:RealPlayer Shared Favorites _realplayfavs._tcp[it]:RealPlayer - Preferiti Condivisi _raop._tcp:AirTunes Remote Audio +_airplay._tcp:AirPlay Remote Video _rtsp._tcp:RTSP Realtime Streaming Server _rtp._udp:RTP Realtime Streaming Server @@ -217,6 +218,10 @@ _adobe-vc._tcp:Adobe Version Cue _home-sharing._tcp:Apple Home Sharing +_amzn-wplay._tcp:Amazon Fire TV + +_qdiscover._tcp:QNAP NAS + # Other @@ -233,3 +238,5 @@ _shifter._tcp:Window Shifter _xpra._tcp:Xpra Session Server _libvirt._tcp:Virtual Machine Manager + +_device-info._tcp:Device Info diff --git a/tests/Makefile.in b/tests/Makefile.in index b4224b4..1083802 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -111,14 +111,19 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/intltool.m4 \ + $(top_srcdir)/common/gettext.m4 $(top_srcdir)/common/iconv.m4 \ $(top_srcdir)/common/introspection.m4 \ + $(top_srcdir)/common/lib-ld.m4 \ + $(top_srcdir)/common/lib-link.m4 \ + $(top_srcdir)/common/lib-prefix.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)/common/nls.m4 $(top_srcdir)/common/po.m4 \ + $(top_srcdir)/common/progtest.m4 \ + $(top_srcdir)/common/python.m4 $(top_srcdir)/common/qt5-pie.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -210,7 +215,6 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ @@ -223,8 +227,6 @@ AVAHI_GROUP = @AVAHI_GROUP@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -235,7 +237,6 @@ CXXCPP = @CXXCPP@ 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@ @@ -276,11 +277,12 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GACUTIL = @GACUTIL@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ @@ -294,16 +296,7 @@ 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@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -322,16 +315,24 @@ LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO = @LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO LIBAVAHI_CORE_VERSION_INFO = @LIBAVAHI_CORE_VERSION_INFO@ LIBAVAHI_GLIB_VERSION_INFO = @LIBAVAHI_GLIB_VERSION_INFO@ LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@ +LIBAVAHI_LIBEVENT_VERSION_INFO = @LIBAVAHI_LIBEVENT_VERSION_INFO@ LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@ LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@ +LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@ LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@ LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@ LIBDAEMON_LIBS = @LIBDAEMON_LIBS@ +LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@ +LIBEVENT_LIBS = @LIBEVENT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ @@ -339,15 +340,15 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ +MOC_QT5 = @MOC_QT5@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -366,10 +367,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -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@ @@ -384,6 +382,8 @@ QT3_CFLAGS = @QT3_CFLAGS@ QT3_LIBS = @QT3_LIBS@ QT4_CFLAGS = @QT4_CFLAGS@ QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -394,6 +394,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ abs_builddir = @abs_builddir@ @@ -437,8 +439,6 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ interfacesdir = @interfacesdir@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ -- 2.7.4