Am Donnerstag, 17. September 2009 16:01 schrieb Marc Kleine-Budde:
> Tim Sander wrote:
> > Hi
> >
> > Attached a new version which not only builds but is also able to start
> > the avahi-deamon.
>
> can you please send a patch against the git repo?
> http://git.pengutronix.de/?p=ptxdist;a=summary
>
> cheers, Marc
--- rules/avahi.make.old 2009-09-07 16:10:12.000000000 +0200
+++ rules/avahi.make 2009-09-17 16:09:16.000000000 +0200
@@ -44,11 +44,12 @@
#
AVAHI_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
+ --prefix="/usr" \
+ --localstatedir="/var" \
--enable-fast-install \
--disable-nls \
--disable-dbm \
--disable-gdbm \
- --disable-libdaemon \
--disable-python \
--disable-pygtk \
--disable-python-dbus \
@@ -72,9 +73,9 @@
--disable-compat-libdns_sd \
--disable-compat-howl \
--with-distro=none \
- --with-xml=none \
- --with-avahi-user=avahi \
- --with-avahi-group=avahi \
+ --disable-stack-protector \
+ --with-avahi-user=messagebus \
+ --with-avahi-group=messagebus \
--with-avahi-priv-access-group=netdev \
--with-autoipd-user=avahi-autoipd \
--with-autoipd-group=avahi-autoipd
@@ -88,8 +89,25 @@
--disable-gobject \
--disable-qt3 \
--disable-qt4 \
- --disable-gtk \
- --disable-dbus
+ --disable-gtk
+
+ifdef PTXCONF_AVAHI_XML
+ AVAHI_AUTOCONF += --with-xml=expat
+else
+ AVAHI_AUTOCONF += --with-xml=none
+endif
+
+ifdef PTXCONF_AVAHI_LIBDAEMON
+ AVAHI_AUTOCONF += --enable-libdaemon
+else
+ AVAHI_AUTOCONF += --disable-libdaemon
+endif
+
+ifndef PTXCONF_AVAHI_DBUS
+ AVAHI_AUTOCONF += --disable-dbus
+else
+ AVAHI_AUTOCONF += --enable-dbus
+endif
#
# FIXME:
@@ -123,12 +141,28 @@
@$(call install_link, avahi, libavahi-core.so.6.0.1,
/usr/lib/libavahi-core.so)
@$(call install_copy, avahi, 0, 0, 0644, -,
/usr/lib/libavahi-common.so.3.5.1)
- @$(call install_link, avahi, libavahi-common.so.6.0.1,
/usr/lib/libavahi-common.so.3)
- @$(call install_link, avahi, libavahi-common.so.6.0.1,
/usr/lib/libavahi-common.so)
+ @$(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)
-# # FIXME: looks like wrong prefix? Untested anyway...
-# #/usr/var/run
-# #/usr/lib/avahi
+ifdef PTXCONF_AVAHI_LIBDAEMON
+ @$(call install_copy, avahi, 0, 0, 0755, -, /usr/sbin/avahi-daemon)
+ @$(call install_copy, avahi, 0, 0, 0644, -,
/etc/avahi/avahi-daemon.conf)
+ @$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/hosts)
+endif
+
+ifdef PTXCONF_AVAHI_DBUS
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/avahi-dbus.conf, /etc/dbus-1/system.d/avahi-dbus.conf)
+ @$(call install_copy, avahi, 0, 0, 0644, - ,
/usr/share/avahi/avahi-service.dtd)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/Server.introspect ,
/usr/share/avahi/introspection/Server.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/ServiceResolver.introspect,
/usr/share/avahi/introspection/ServiceResolver.introspect )
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/EntryGroup.introspect,
/usr/share/avahi/introspection/EntryGroup.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/AddressResolver.introspect,
/usr/share/avahi/introspection/AddressResolver.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/RecordBrowser.introspect,
/usr/share/avahi/introspection/RecordBrowser.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/DomainBrowser.introspect,
/usr/share/avahi/introspection/DomainBrowser.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/ServiceBrowser.introspect,
/usr/share/avahi/introspection/ServiceBrowser.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/HostNameResolver.introspect,
/usr/share/avahi/introspection/HostNameResolver.introspect)
+ @$(call install_copy, avahi, 0, 0, 0644,
$(AVAHI_DIR)/avahi-daemon/ServiceTypeBrowser.introspect,
/usr/share/avahi/introspection/ServiceTypeBrowser.introspect)
+endif
@$(call install_finish, avahi)
--- rules/avahi.in.old 2009-09-07 16:10:12.000000000 +0200
+++ rules/avahi.in 2009-09-17 16:09:16.000000000 +0200
@@ -2,7 +2,31 @@
config AVAHI
tristate
- depends on BROKEN
prompt "avahi"
+ select INTLTOOL
+ select LIBDAEMON
+# select PYTHON_26
+ select GLIBC
+# select DBUS_PYTHON
help
- Avahi is a system which facilitates service discovery on a local
network.
+ Avahi is a system which facilitates service discovery on a local
network
+
+if AVAHI
+
+config AVAHI_LIBDAEMON
+ bool "daemon"
+ help
+ Enable the avahi daemon
+
+config AVAHI_DBUS
+ bool "dbus support"
+ select DBUS
+ help
+ Enable avahi dbus support
+
+config AVAHI_XML
+ bool "xml parser"
+ select EXPAT
+ help
+ Enable avahi xml parser
+endif
--
ptxdist mailing list
[email protected]
