From 1f8e87b470dcee73b270d9c6319661aad89730fc Mon Sep 17 00:00:00 2001 From: Stephan Bosch <stephan@rename-it.nl> Date: Wed, 14 Apr 2010 23:38:44 +0200 Subject: [PATCH] Added --with-docs configure option. --- Makefile.am | 6 +++++- configure.in | 19 +++++++++++++++++++ doc/Makefile.am | 8 +++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f8fea5ac3..c6800cbdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = src doc +if BUILD_DOCS +DOCS = doc +endif + +SUBDIRS = src $(DOCS) ACLOCAL_AMFLAGS = -I m4 --install diff --git a/configure.in b/configure.in index 71c9c613e..34619d79c 100644 --- a/configure.in +++ b/configure.in @@ -21,10 +21,19 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_LIBTOOL +# Couple with Dovecot +# + DC_DOVECOT LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE" AC_SUBST(LIBDOVECOT_INCLUDE) +# Defome Sieve documentation install dir +# + +sieve_docdir='${dovecot_docdir}/sieve' +AC_SUBST(sieve_docdir) + # Extensions under development # @@ -57,6 +66,16 @@ AC_ARG_ENABLE(header-install, want_headers=no) AM_CONDITIONAL(INSTALL_HEADERS, test "$want_headers" = "yes") +AC_ARG_WITH(docs, +[ --with-docs Install documentation (default)], + if test x$withval = xno; then + want_docs=no + else + want_docs=yes + fi, + want_docs=yes) +AM_CONDITIONAL(BUILD_DOCS, test "$want_docs" = "yes") + AC_ARG_ENABLE(valgrind, [AC_HELP_STRING([--enable-valgrind], [Enable Valgrind memory leak checks in testsuite [default=no]])], if test x$enableval = xno || test x$enableval = xauto; then diff --git a/doc/Makefile.am b/doc/Makefile.am index 48f90c36c..7c673e627 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,13 @@ SUBDIRS = man example-config +docfiles = spamtest-virustest.txt + +if BUILD_DOCS +sieve_doc_DATA = $(docfiles) +endif + EXTRA_DIST = \ rfc \ devel \ - spamtest-virustest.txt + $(docfiles) -- GitLab