* Fix interfaces stuff

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@534 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 021026220825b07aca818875d190bcff13a2e6fb..bbf1895bf1340f1ee733f15986e40d31ad7ed3c8 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -26,9 +26,6 @@ interfaces = \
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
-
-interfacesdir=${datadir}/${PACKAGE}/interfaces/
-
 bin_PROGRAMS = \
        avahi-discover-standalone
 
@@ -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 a61d0f2da50d4d4357f1d59544b93877347a5f71..85e3865cc2555d3f91090c124b9d7bb5d580a7d6 100644 (file)
--- 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 || test x$HAVE_GTK; then
+       interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+       AC_SUBST(interfacesdir)
+fi
+
+
 #
 # Doxygen
 #