Add a --disable-doc configuration option.

This allows mutt to be built without the documentation.

Thanks to Sylvain Bertrand for the original patch.

diff --git a/Makefile.am b/Makefile.am
index a05249561c6456f08ac5a48c9a349cc2a696bcd4..789c23ba0b8cb9c1efceb897f1f3213cd9fb925f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,16 @@ include $(top_srcdir)/flymake.am
 AUTOMAKE_OPTIONS = 1.6 foreign
 EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap mutt_md5
 
+if BUILD_DOC
+DOC_SUBDIR = doc
+endif
+
 if BUILD_IMAP
 IMAP_SUBDIR = imap
 IMAP_INCLUDES = -I$(top_srcdir)/imap
 endif
 
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
 
 bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
 

diff --git a/configure.ac b/configure.ac
index b84b531cbd6083059dc7d922f428610f9b8b1a57..8281445585df92b1109a56a2465ad3a50f3ee28c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1347,6 +1347,13 @@ then
 fi
 AC_SUBST(DSLROOT)
 
+AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc],[Do not build the documentation]),
+[       if test x$enableval = xno ; then
+                do_build_doc=no
+        fi
+])
+AM_CONDITIONAL(BUILD_DOC, test x$do_build_doc != xno)
+
 AC_ARG_ENABLE(full_doc,
              AS_HELP_STRING([--disable-full-doc],[Omit disabled variables]),
 [       if test x$enableval = xno ; then