avahi: cleanup options & targetinstall

 - Qt3 is obsolete
 - use the default  system.d directory used by D-Bus in ptxdist
 - D-Bus system socket option is broken and for old D-Bus versions anyways

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 79 insertions, 130 deletions

diff --git a/rules/avahi.in b/rules/avahi.in
index 049354736..48ff79e74 100644
--- a/rules/avahi.in
+++ b/rules/avahi.in
@@ -28,13 +28,6 @@ config AVAHI_GOBJECT
 	help
 	  --enable-gobject
 
-config AVAHI_QT3
-	bool
-	depends on BROKEN
-	prompt "enable qt3 support"
-	help
-	  --enable-qt3
-
 config AVAHI_QT4
 	bool
 	prompt "enable qt4 support"
@@ -57,59 +50,39 @@ config AVAHI_LIBAVAHI_CLIENT
 	  It is recommend using this API in C or C++ progams.
 	  The D-Bus internals are hidden completely.
 
-menuconfig AVAHI_DBUS
+config AVAHI_DBUS
 	bool
 	prompt "enable dbus support"
 	help
 	  --enable-dbus
 
-if AVAHI_DBUS
-
-config AVAHI_DBUS_SYS
-        string
-        prompt "Path to D-Bus system.d directory"
-        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 "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
-          old D-Bus releases
-
-endif
-
 menuconfig AVAHI_DAEMON
 	bool
-	prompt "avahi-daemon"
+	prompt "avahi-daemon                "
 	help
 	  Install the avahi-daemon program
 
 if AVAHI_DAEMON
 
 config AVAHI_USER
-        string
-        prompt "user for running the avahi (mDNS/DNS-SD) daemon"
-        default "avahi"
-        help
-          Enter the user name to run the avahi (mDNS/DNS-SD) daemon with.
-          The PTXdist standard configuration has only root, so if you want
-          to use the avahi default user "avahi" you have to create 
-          a related user yourself.
+	string
+	prompt "user for running the avahi (mDNS/DNS-SD) daemon"
+	default "avahi"
+	help
+	  Enter the user name to run the avahi (mDNS/DNS-SD) daemon with.
+	  The PTXdist standard configuration has only root, so if you want
+	  to use the avahi default user "avahi" you have to create
+	  a related user yourself.
 
 config AVAHI_GROUP
-        string
-        prompt "group for running the avahi (mDNS/DNS-SD) daemon"
-        default "avahi"
-        help
-          Enter the group name to run the avahi (mDNS/DNS-SD) daemon with.
-          The PTXdist standard configuration has only root, so if you want
-          to use the avahi default group "avahi" you have to create 
-          a related group yourself.
+	string
+	prompt "group for running the avahi (mDNS/DNS-SD) daemon"
+	default "avahi"
+	help
+	  Enter the group name to run the avahi (mDNS/DNS-SD) daemon with.
+	  The PTXdist standard configuration has only root, so if you want
+	  to use the avahi default group "avahi" you have to create
+	  a related group yourself.
 
 config AVAHI_SERVICES
 	bool
@@ -128,12 +101,12 @@ config AVAHI_DNSCONFD
 	  avahi-dnsconfd connects to a running avahi-daemon and runs the
 	  script /etc/avahi/dnsconfd.action 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 
+	  configuring unicast DNS servers in a DHCP-like fashion
 	  with mDNS.
 
 menuconfig AVAHI_AUTOIP
 	bool
-	prompt "avahi-autoipd"
+	prompt "avahi-autoipd               "
 	help
 	  Install the avahi-autoipd daemon (IPv4 link-local address autoconfiguration)
 	  Please check: You need CONFIG_FILE_LOCKING=y in your Kernel Config.
@@ -141,24 +114,24 @@ menuconfig AVAHI_AUTOIP
 if AVAHI_AUTOIP
 
 config AVAHI_AUTOIP_USER
-        string
-        prompt "user for running the avahi autoip (IPv4LL) daemon"
-        default "avahi-autoipd"
-        help
-          Enter the user name to run the avahi autoip (IPv4LL) daemon with.
-          The PTXdist standard configuration has only root, so if you want
-          to use the avahi default user "avahi-autoipd" you have to create 
-          a related user yourself.
+	string
+	prompt "user for running the avahi autoip (IPv4LL) daemon"
+	default "avahi-autoipd"
+	help
+	  Enter the user name to run the avahi autoip (IPv4LL) daemon with.
+	  The PTXdist standard configuration has only root, so if you want
+	  to use the avahi default user "avahi-autoipd" you have to create
+	  a related user yourself.
 
 config AVAHI_AUTOIP_GROUP
-        string
-        prompt "group for running the avahi autoip (IPv4LL) daemon"
-        default "avahi-autoipd"
-        help
-          Enter the group name to run the avahi autoip (IPv4LL) daemon with.
-          The PTXdist standard configuration has only root, so if you want
-          to use the avahi default group "avahi-autoipd" you have to create 
-          a related group yourself.
+	string
+	prompt "group for running the avahi autoip (IPv4LL) daemon"
+	default "avahi-autoipd"
+	help
+	  Enter the group name to run the avahi autoip (IPv4LL) daemon with.
+	  The PTXdist standard configuration has only root, so if you want
+	  to use the avahi default group "avahi-autoipd" you have to create
+	  a related group yourself.
 endif
 
 endif
diff --git a/rules/avahi.make b/rules/avahi.make
index e90c6b335..322d8daac 100644
--- a/rules/avahi.make
+++ b/rules/avahi.make
@@ -42,10 +42,18 @@ AVAHI_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-AVAHI_AUTOCONF := \
+AVAHI_CONF_TOOL	:= autoconf
+AVAHI_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--enable-fast-install \
+	--disable-stack-protector \
 	--disable-nls \
+	--$(call ptx/endis, PTXCONF_AVAHI_GLIB)-glib \
+	--$(call ptx/endis, PTXCONF_AVAHI_GOBJECT)-gobject \
+	--disable-introspection \
+	--disable-qt3 \
+	--$(call ptx/endis, PTXCONF_AVAHI_QT4)-qt4 \
+	--$(call ptx/endis, PTXCONF_AVAHI_GTK)-gtk \
+	--$(call ptx/endis, PTXCONF_AVAHI_DBUS)-dbus \
 	--disable-dbm \
 	--disable-gdbm \
 	--enable-libdaemon \
@@ -72,61 +80,13 @@ AVAHI_AUTOCONF := \
 	--disable-compat-libdns_sd \
 	--disable-compat-howl \
 	--with-distro=none \
+	--with-dbus-sys=/etc/dbus-1/system.d \
 	--with-xml=expat \
+	--with-avahi-user=$(PTXCONF_AVAHI_USER) \
+	--with-avahi-group=$(PTXCONF_AVAHI_GROUP) \
 	--with-avahi-priv-access-group=netdev \
-	--disable-stack-protector
-
-ifdef PTXCONF_AVAHI_DAEMON
-AVAHI_AUTOCONF += 				\
-	--with-avahi-user=$(PTXCONF_AVAHI_USER)	\
-	--with-avahi-group=$(PTXCONF_AVAHI_GROUP)
-endif
-
-ifdef PTXCONF_AVAHI_AUTOIP
-AVAHI_AUTOCONF += 						\
-	--with-autoipd-user=$(PTXCONF_AVAHI_AUTOIP_USER)	\
+	--with-autoipd-user=$(PTXCONF_AVAHI_AUTOIP_USER) \
 	--with-autoipd-group=$(PTXCONF_AVAHI_AUTOIP_GROUP)
-endif
-
-ifdef PTXCONF_AVAHI_GLIB
-AVAHI_AUTOCONF += --enable-glib
-else
-AVAHI_AUTOCONF += --disable-glib
-endif
-
-ifdef PTXCONF_AVAHI_GOBJECT
-AVAHI_AUTOCONF += --enable-gobject
-else
-AVAHI_AUTOCONF += --disable-gobject
-endif
-
-ifdef PTXCONF_AVAHI_QT3
-AVAHI_AUTOCONF += --enable-qt3
-else
-AVAHI_AUTOCONF += --disable-qt3
-endif
-
-ifdef PTXCONF_AVAHI_QT4
-AVAHI_AUTOCONF += --enable-qt4
-else
-AVAHI_AUTOCONF += --disable-qt4
-endif
-
-ifdef PTXCONF_AVAHI_GTK
-AVAHI_AUTOCONF += --enable-gtk
-else
-AVAHI_AUTOCONF += --disable-gtk
-endif
-
-ifdef PTXCONF_AVAHI_DBUS
-AVAHI_AUTOCONF += 					\
-	--enable-dbus					\
-	--with-dbus-sys=$(PTXCONF_AVAHI_DBUS_SYS)	\
-	--with-dbus-system-socket=$(PTXCONF_AVAHI_DBUS_SOCKET)
-else
-AVAHI_AUTOCONF += --disable-dbus
-endif
-
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -141,15 +101,18 @@ $(STATEDIR)/avahi.targetinstall:
 	@$(call install_fixup, avahi,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, avahi,DESCRIPTION,missing)
 
-	@$(call install_copy, avahi, 0, 0, 0644, -, /usr/share/avahi/service-types)
-	@$(call install_copy, avahi, 0, 0, 0644, -, /usr/share/avahi/avahi-service.dtd)
+	@$(call install_copy, avahi, 0, 0, 0644, -, \
+		/usr/share/avahi/service-types)
+	@$(call install_copy, avahi, 0, 0, 0644, -, \
+		/usr/share/avahi/avahi-service.dtd)
 
 #	avahi core libs
 	@$(call install_lib, avahi, 0, 0, 0644, libavahi-core)
 	@$(call install_lib, avahi, 0, 0, 0644, libavahi-common)
 
 ifdef PTXCONF_AVAHI_DBUS
-	@$(call install_alternative, avahi, 0, 0, 0644, $(PTXCONF_AVAHI_DBUS_SYS)/avahi-dbus.conf)
+	@$(call install_alternative, avahi, 0, 0, 0644, \
+		/etc/dbus-1/system.d/avahi-dbus.conf)
 endif
 
 ifdef PTXCONF_AVAHI_QT4
@@ -164,24 +127,37 @@ ifdef PTXCONF_AVAHI_DAEMON
 #	avahi daemon (avahi mDNS/DNS-SD Implementation)
 #	depends on expat
 	@$(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)
+
+	@$(call install_alternative, avahi, 0, 0, 0644, \
+		/etc/avahi/avahi-daemon.conf)
+	@$(call install_alternative, avahi, 0, 0, 0644, /etc/avahi/hosts)
+
+ifdef PTXCONF_INITMETHOD_BBINIT
 	@$(call install_alternative, avahi, 0, 0, 0755, /etc/init.d/avahi-daemon)
-	@$(call install_link, avahi, ../init.d/avahi-daemon, /etc/rc.d/S35avahi-daemon)
+	@$(call install_link, avahi, ../init.d/avahi-daemon, \
+		/etc/rc.d/S35avahi-daemon)
+endif
+ifdef PTXCONF_INITMETHOD_UPSTART
+	@$(call install_alternative, avahi, 0, 0, 0644, \
+		/etc/init/avahi-daemon.conf)
+endif
 endif
 
 ifdef PTXCONF_AVAHI_SERVICES
 #	avahi service descriptions
 #	depends on avahi-daemon
-	@$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/services/sftp-ssh.service)
-	@$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/services/ssh.service)
+	@$(call install_copy, avahi, 0, 0, 0644, -, \
+		/etc/avahi/services/sftp-ssh.service)
+	@$(call install_copy, avahi, 0, 0, 0644, -, \
+		/etc/avahi/services/ssh.service)
 endif
 
 ifdef PTXCONF_AVAHI_DNSCONFD
 #	avahi dnsconfd (Unicast DNS server from mDNS/DNS-SD configuration daemon)
 #	depends on avahi-daemon
 	@$(call install_copy, avahi, 0, 0, 0755, -, /usr/sbin/avahi-dnsconfd)
-	@$(call install_copy, avahi, 0, 0, 0755, -, /etc/avahi/avahi-dnsconfd.action)
+	@$(call install_copy, avahi, 0, 0, 0755, -, \
+		/etc/avahi/avahi-dnsconfd.action)
 endif
 
 ifdef PTXCONF_AVAHI_AUTOIP
@@ -190,13 +166,13 @@ ifdef PTXCONF_AVAHI_AUTOIP
 #	depends on libdaemon
 #	be shure to set CONFIG_FILE_LOCKING=y in your Kernel Config
 	@$(call install_copy, avahi, 0, 0, 0755, -, /usr/sbin/avahi-autoipd)
-	@$(call install_copy, avahi, 0, 0, 0755, -, /etc/avahi/avahi-autoipd.action)
+	@$(call install_copy, avahi, 0, 0, 0755, -, \
+		/etc/avahi/avahi-autoipd.action)
+
+ifdef PTXCONF_INITMETHOD_BBINIT
 	@$(call install_alternative, avahi, 0, 0, 0755, /etc/init.d/zeroconf)
 	@$(call install_link, avahi, ../init.d/zeroconf, /etc/rc.d/S30zeroconf)
 endif
-
-ifdef PTXCONF_INITMETHOD_UPSTART
-	@$(call install_alternative, avahi, 0, 0, 0644, /etc/init/avahi-daemon.conf)
 endif
 
 	@$(call install_finish, avahi)