From 698fccd6e488a3facc8e5a08a997e8d5e8ff953b Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Tue, 19 Aug 2014 14:08:21 +0200 Subject: [PATCH] always build core docs --- Makefile.am | 12 ++++-------- configure.ac | 11 ----------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec525a3..b49ca9b 100644 --- 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 3f60cd7..85d5416 100644 --- 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} " -- 2.39.5