From f71e7eb605098efcb42d11e9f7ef46cef14a5084 Mon Sep 17 00:00:00 2001
From: Trent Lloyd <lathiat@bur.st>
Date: Thu, 8 Sep 2005 23:40:18 +0000
Subject:  * Do the usual avahi thing and sneak in a few updates to the 0.4
 tag.

git-svn-id: file:///home/lennart/svn/public/avahi/tags/release-0.4@537 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-discover-standalone/Makefile.am |  5 -----
 configure.ac                          | 11 +++++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 18fbdde..bbf1895 100644
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -26,8 +26,6 @@ interfaces = \
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
-
-
 bin_PROGRAMS = \
 	avahi-discover-standalone
 
@@ -46,7 +44,6 @@ avahi_discover_standalone_LDADD = \
 	../avahi-core/libavahi-core.la  \
 	$(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
 
-interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
 else 
@@ -54,8 +51,6 @@ else
 if HAVE_PYTHON 
 if HAVE_DBUS
 
-# We need this for the python version of avahi-discover
-interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
 endif
diff --git a/configure.ac b/configure.ac
index a61d0f2..8e63c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,6 +251,8 @@ if test "x$HAVE_GTK" = "xyes" ; then
 fi
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
+
+
 #
 # D-BUS
 #
@@ -414,6 +416,15 @@ AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
 
+#
+# Avahi interfaces dir
+#
+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
+	interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+	AC_SUBST(interfacesdir)
+fi
+
+
 #
 # Doxygen
 #
-- 
cgit