Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public...

[catta] / avahi-discover-standalone / Makefile.am

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 021026220825b07aca818875d190bcff13a2e6fb..ca007be22d959d70e65d79af0e338a7bf5f3b0df 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -26,9 +26,7 @@ interfaces = \
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
-
-interfacesdir=${datadir}/${PACKAGE}/interfaces/
-
+if  HAVE_GLIB
 bin_PROGRAMS = \
        avahi-discover-standalone
 
@@ -49,16 +47,13 @@ avahi_discover_standalone_LDADD = \
 
 interfaces_DATA = $(interfaces)
 
+endif  # HAVE_GLIB
 else 
 
-if HAVE_PYTHON 
-if HAVE_DBUS
+if HAVE_PYTHON_DBUS
 
-# We need this for the python version of avahi-discover
-interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
-endif
 endif
 endif