diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-09-08 20:20:03 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-09-08 20:20:03 +0000 |
| commit | b70de951352c60e6203648253cdbdda2bc93c136 (patch) | |
| tree | c7725e74c9d94681964e25f6584f4b616cd23770 | |
| parent | 4c14eb800d1d39c40c28be8f6225314cfd513abe (diff) | |
* Fix interfaces stuff
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@534 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -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 0210262..bbf1895 100644 --- 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 a61d0f2..85e3865 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 || test x$HAVE_GTK; then + interfacesdir="${datadir}/${PACKAGE}/interfaces/" + AC_SUBST(interfacesdir) +fi + + +# # Doxygen # DX_HTML_FEATURE(ON) |