diff options
| -rw-r--r-- | avahi-discover-standalone/Makefile.am | 5 | ||||
| -rw-r--r-- | 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 # @@ -415,6 +417,15 @@ 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 # DX_HTML_FEATURE(ON) |