- added Option for libavahi-client
- more useful (the common) default values for AVAHI_DBUS_SYS and
AVAHI_DBUS_SOCKET
- copy the configuration file of avahi for dbus (if option is set)
Signed-off-by: Markus Rathgeb rathgeb.mar...@googlemail.com
---
{rules.org = rules}/avahi.in | 14 --
{rules.org = rules}/avahi.make | 11 +++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/rules.org/avahi.in b/rules/avahi.in
index cd1d5fb..e59651b 100644
--- a/rules.org/avahi.in
+++ b/rules/avahi.in
@@ -46,6 +46,16 @@ config AVAHI_GTK
help
--enable-gtk
+config AVAHI_LIBAVAHI_CLIENT
+ bool
+ prompt enable avahi-client support
+ select AVAHI_DBUS
+ select AVAHI_DAEMON
+ help
+ A simplifying C wrapper around the D-Bus API.
+ It is recommend using this API in C or C++ progams.
+ The D-Bus internals are hidden completely.
+
config AVAHI_DBUS
bool
prompt enable dbus support
@@ -56,14 +66,14 @@ if AVAHI_DBUS
config AVAHI_DBUS_SYS
string
prompt Path to D-Bus system.d directory
-default unconfigured
+default /etc/dbus-1/system.d
help
Enter the Path to the D-Bus system.d directory
config AVAHI_DBUS_SOCKET
string
prompt Path to the D-Bus system socket
-default unconfigured
+default unix:path=/var/run/dbus/system_bus_socket
help
Enter the Path to the D-Bus system socket, you probably want
to put unix:path= at the start. Only needed for very
diff --git a/rules.org/avahi.make b/rules/avahi.make
index f42bfe5..fa5d02f 100644
--- a/rules.org/avahi.make
+++ b/rules/avahi.make
@@ -124,6 +124,7 @@ AVAHI_AUTOCONF += \
--enable-dbus \
--with-dbus-sys=$(PTXCONF_AVAHI_DBUS_SYS) \
--with-dbus-system-address=$(PTXCONF_AVAHI_DBUS_SOCKET)
+
else
AVAHI_AUTOCONF += --disable-dbus
endif
@@ -157,12 +158,22 @@ $(STATEDIR)/avahi.targetinstall:
@$(call install_link, avahi, libavahi-common.so.3.5.1,
/usr/lib/libavahi-common.so.3)
@$(call install_link, avahi, libavahi-common.so.3.5.1,
/usr/lib/libavahi-common.so)
+ifdef PTXCONF_AVAHI_DBUS
+ @$(call install_copy, avahi, 0, 0, 0644, -,
$(PTXCONF_AVAHI_DBUS_SYS)/avahi-dbus.conf)
+endif
+
ifdef PTXCONF_AVAHI_QT4
@$(call install_copy, avahi, 0, 0, 0644, -,
/usr/lib/libavahi-qt4.so.1.0.2)
@$(call install_link, avahi, libavahi-qt4.so.1.0.2,
/usr/lib/libavahi-qt4.so.1)
@$(call install_link, avahi, libavahi-qt4.so.1.0.2,
/usr/lib/libavahi-qt4.so)
endif
+ifdef PTXCONF_AVAHI_LIBAVAHI_CLIENT
+ @$(call install_copy, avahi, 0, 0, 0644, -,
/usr/lib/libavahi-client.so.3.2.5)
+ @$(call install_link, avahi, libavahi-client.so.3.2.5,
/usr/lib/libavahi-client.so.3)
+ @$(call install_link, avahi, libavahi-client.so.3.2.5,
/usr/lib/libavahi-client.so)
+endif
+
ifdef PTXCONF_AVAHI_DAEMON
# avahi daemon (avahi mDNS/DNS-SD Implementation)
# depends on expat
--
Markus Rathgeb
Public Key Server: http://wwwkeys.us.pgp.net/ bzw. hkp://wwwkeys.us.pgp.net/
Public Key Server: http://stinkfoot.org:11371/ bzw. hkp://stinkfoot.org
Erst nachdem wir alles verloren haben, haben wir die Freiheit, alles zu tun.
It's only after we've lost everything, that we're free to do anything!
signature.asc
Description: This is a digitally signed message part.
--
ptxdist mailing list
ptxdist@pengutronix.de
