build docs for avahi-core only if --enable-core-docs was passed to configure. Build...

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

diff --git a/Makefile.am b/Makefile.am
index 3c75e1ec20fdf7dc02c9e7f0a9e01fe1e0c3b65a..d09f75ac9120ba9472d7aad226b8be45bd45c446 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,33 +71,53 @@ SUBDIRS = \
 
 
 DX_INPUT = \
-       $(srcdir)/avahi-core/core.h \
-       $(srcdir)/avahi-core/lookup.h \
-       $(srcdir)/avahi-core/publish.h \
        $(srcdir)/avahi-common/address.h \
-       $(srcdir)/avahi-core/rr.h \
        $(srcdir)/avahi-common/strlst.h \
        $(srcdir)/avahi-common/alternative.h \
-       $(srcdir)/avahi-core/log.h \
        $(srcdir)/avahi-common/defs.h \
-       $(srcdir)/avahi-client/client.h \
-       $(srcdir)/avahi-client/lookup.h \
-       $(srcdir)/avahi-client/publish.h \
        $(srcdir)/avahi-common/error.h \
        $(srcdir)/avahi-common/malloc.h \
        $(srcdir)/avahi-common/domain.h \
        $(srcdir)/avahi-common/watch.h \
        $(srcdir)/avahi-common/simple-watch.h \
        $(srcdir)/avahi-common/thread-watch.h \
-       $(srcdir)/avahi-glib/glib-watch.h \
-       $(srcdir)/avahi-glib/glib-malloc.h \
-       $(srcdir)/avahi-common/timeval.h \
-       $(srcdir)/avahi-qt/qt-watch.h
+       $(srcdir)/avahi-common/timeval.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
-
 DX_EXAMPLE_PATTERNS = *.c
 
+if HAVE_QT3
+DX_INPUT += \
+       $(srcdir)/avahi-qt/qt-watch.h
+else
+if HAVE_QT4
+DX_INPUT += \
+       $(srcdir)/avahi-qt/qt-watch.h
+endif
+endif
+
+if HAVE_GLIB
+DX_INPUT += \
+       $(srcdir)/avahi-glib/glib-watch.h \
+       $(srcdir)/avahi-glib/glib-malloc.h
+endif
+
+if HAVE_DBUS
+DX_INPUT += \
+       $(srcdir)/avahi-client/client.h \
+       $(srcdir)/avahi-client/lookup.h \
+       $(srcdir)/avahi-client/publish.h
+endif
+
+if ENABLE_CORE_DOCS
+DX_INPUT += \
+       $(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
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc
 

diff --git a/avahi-client/client.h b/avahi-client/client.h
index 16fde9109b494482c79496a95e8539ffcfc0a90d..e15c1303be94d1c695a63cb0062477f9f93e75b5 100644 (file)
--- a/avahi-client/client.h
+++ b/avahi-client/client.h
@@ -33,9 +33,6 @@
 
 /** \file client.h Definitions and functions for the client API over D-Bus */
 
-/** \example glib-integration.c Example of how to integrate
- * avahi use with GLIB/GTK applications */
-
 AVAHI_C_DECL_BEGIN
 
 /** A connection context */

diff --git a/avahi-glib/glib-watch.h b/avahi-glib/glib-watch.h
index 0abc291d439e1cb473e60dbdc67d506eb1d5fc71..6035cf88316a7fb8bd4b08a7edb763dc97cce08b 100644 (file)
--- a/avahi-glib/glib-watch.h
+++ b/avahi-glib/glib-watch.h
@@ -24,6 +24,9 @@
 
 /** \file glib-watch.h GLib main loop adapter */
 
+/** \example yglib-integration.c Example of how to integrate
+ * avahi use with GLIB/GTK applications */
+
 #include <glib.h>
 
 #include <avahi-common/cdecl.h>

diff --git a/configure.ac b/configure.ac
index ae38e5b6d1ac849d33c6cfaa86168e5a74294282..deac981b6a163d49519fcac23116f6dd25ef0d32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -709,6 +709,16 @@ 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])
+
 #
 # Build and Install man pages
 #
@@ -902,4 +912,5 @@ echo "\
     Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
     Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}
     Building tests:                     ${ENABLE_TESTS}
+    Building avahi-core documentation:  ${ENABLE_CORE_DOCS}
 "