some autoconf fixes

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

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index b4125d6..9030e04 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -34,8 +34,11 @@ avahi_commoninclude_HEADERS = \
        alternative.h \
        rr.h \
        util.h \
-       cdecl.h \
-       dbus.h
+       cdecl.h
+
+if ENABLE_DBUS
+avahi_commoninclude_HEADERS += dbus.h
+endif
 
 noinst_PROGRAMS = \
        strlst-test \

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 7abc497..2a2d134 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -34,7 +34,8 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 avahiincludedir=$(includedir)/avahi-core
 
 avahiinclude_HEADERS = \
-       core.h
+       core.h \
+       log.h
 
 lib_LTLIBRARIES = \
        libavahi-core.la 

diff --git a/man/Makefile.am b/man/Makefile.am
index 8fbe35c..1fa4723 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -17,6 +17,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+if HAVE_PYTHON
+
 man_MANS = \
        avahi-browse.1 \
        avahi-publish-service.1 \
@@ -24,6 +26,8 @@ man_MANS = \
        avahi-resolve-address.1 \
        avahi-resolve-host-name.1
 
+endif
+
 noinst_DATA = \
        avahi-browse.1.xml \
        avahi-publish-service.1.xml \