always build core docs

diff --git a/Makefile.am b/Makefile.am
index ec525a38dd4bdcc60e7fda45eda4e9e9141792a1..b49ca9b36dac6a402bd27cbba059d2b030dcbc29 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,19 +56,15 @@ DX_INPUT = \
        $(srcdir)/avahi-common/domain.h \
        $(srcdir)/avahi-common/watch.h \
        $(srcdir)/avahi-common/simple-watch.h \
-       $(srcdir)/avahi-common/thread-watch.h
-
-DX_EXAMPLE_PATH = $(srcdir)/examples
-DX_EXAMPLE_PATTERNS = *.c
-
-if ENABLE_CORE_DOCS
-DX_INPUT += \
+       $(srcdir)/avahi-common/thread-watch.h \
        $(srcdir)/avahi-core/core.h \
        $(srcdir)/avahi-core/lookup.h \
        $(srcdir)/avahi-core/publish.h \
        $(srcdir)/avahi-core/rr.h \
        $(srcdir)/avahi-core/log.h
-endif
+
+DX_EXAMPLE_PATH = $(srcdir)/examples
+DX_EXAMPLE_PATTERNS = *.c
 
 pkgconfigdir = $(libdir)/pkgconfig
 

diff --git a/configure.ac b/configure.ac
index 3f60cd7993c20a77297ae8199b44da09425ede80..85d5416f3b2d40a281502e80eabda8c3b3e68d98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -331,16 +331,6 @@ DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 
-AC_ARG_ENABLE(core-docs,
-        AS_HELP_STRING([--enable-core-docs],[Enable building of documentation for avahi-core]),
-[case "${enableval}" in
-  yes) ENABLE_CORE_DOCS=yes ;;
-  no)  ENABLE_CORE_DOCS=no ;;
-  *) AC_MSG_ERROR([bad value ${enableval} for --enable-core-docs]) ;;
-esac],[ENABLE_CORE_DOCS=no])
-
-AM_CONDITIONAL([ENABLE_CORE_DOCS], [test "x$ENABLE_CORE_DOCS" = xyes])
-
 #
 # Conditionally compile test and example programs
 #
@@ -380,5 +370,4 @@ echo "
 echo "\
     Building libavahi-core              yes
     Building tests:                     ${ENABLE_TESTS}
-    Building avahi-core documentation:  ${ENABLE_CORE_DOCS}
 "