dovecot-1.2-sieve: Added --with-docs configure option.

pigeonhole at rename-it.nl pigeonhole at rename-it.nl
Mon Apr 19 23:50:14 EEST 2010


details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/bcfa819f257b
changeset: 1247:bcfa819f257b
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Apr 19 22:50:01 2010 +0200
description:
Added --with-docs configure option.

diffstat:

 Makefile.am         |   8 +++++++-
 configure.in        |  14 ++++++++++++++
 doc/Makefile.am     |  23 ++++++++---------------
 doc/man/Makefile.am |  16 ++++++++++++++++
 4 files changed, 45 insertions(+), 16 deletions(-)

diffs (100 lines):

diff -r 0e89d5a7e00b -r bcfa819f257b Makefile.am
--- a/Makefile.am	Sun Mar 28 18:16:21 2010 +0200
+++ b/Makefile.am	Mon Apr 19 22:50:01 2010 +0200
@@ -1,4 +1,10 @@
-SUBDIRS = doc src
+if BUILD_DOCS
+DOCS = doc
+endif
+
+SUBDIRS = \
+	src \
+	$(DOCS)
 
 EXTRA_DIST = \
 	tests \
diff -r 0e89d5a7e00b -r bcfa819f257b configure.in
--- a/configure.in	Sun Mar 28 18:16:21 2010 +0200
+++ b/configure.in	Mon Apr 19 22:50:01 2010 +0200
@@ -73,6 +73,16 @@
 #
 #
 
+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(header-install,
 [  --enable-header-install Install development headers],
     if test x$enableval = xno; then
@@ -110,9 +120,13 @@
 dovecot_pkgincludedir='$(includedir)/dovecot'
 AC_SUBST(dovecot_pkgincludedir)
 
+sieve_docdir='${docdir}/dovecot/sieve'
+AC_SUBST(sieve_docdir)
+
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
+doc/man/Makefile
 src/Makefile
 src/lib-sieve/Makefile
 src/lib-sieve/plugins/Makefile
diff -r 0e89d5a7e00b -r bcfa819f257b doc/Makefile.am
--- a/doc/Makefile.am	Sun Mar 28 18:16:21 2010 +0200
+++ b/doc/Makefile.am	Mon Apr 19 22:50:01 2010 +0200
@@ -1,19 +1,12 @@
-unfinished = man/sieve-filter.1
+SUBDIRS = man
 
-if BUILD_UNFINISHED
-unfinished_mans = $(unfinished)
-else
-unfinished_dist = $(unfinished)
+docfiles = spamtest-virustest.txt
+
+if BUILD_DOCS
+sieve_doc_DATA = $(docfiles)
 endif
 
-dist_man_MANS = \
-    man/sievec.1 \
-    man/sieved.1 \
-    man/sieve-test.1 \
-    $(unfinished_mans)
-
 EXTRA_DIST = \
-	rfc \
-	devel \
-	spamtest-virustest.txt \
-    $(unfinished_dist)
+        rfc \
+        devel \
+        $(docfiles)
diff -r 0e89d5a7e00b -r bcfa819f257b doc/man/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/man/Makefile.am	Mon Apr 19 22:50:01 2010 +0200
@@ -0,0 +1,16 @@
+unfinished = sieve-filter.1
+
+if BUILD_UNFINISHED
+unfinished_mans = $(unfinished)
+else
+unfinished_dist = $(unfinished)
+endif
+
+EXTRA_DIST = \
+        $(unfinished_dist)
+
+dist_man_MANS = \
+        sievec.1 \
+        sieved.1 \
+        sieve-test.1 \
+        $(unfinished_mans)


More information about the dovecot-cvs mailing list