[PATCH] configure: add --without-docs switch

diff --git a/0f/142ee80bbdd8ccd3ae62a41d9f27703d29b567 b/0f/142ee80bbdd8ccd3ae62a41d9f27703d29b567
new file mode 100644 (file)
index 0000000..dfe2071
--- /dev/null
+++ b/0f/142ee80bbdd8ccd3ae62a41d9f27703d29b567
@@ -0,0 +1,156 @@
+Return-Path: <mp39590@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 1D3626DE13F4\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Jul 2015 11:04:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.568\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.568 tagged_above=-999 required=5\r
+ tests=[AWL=-0.017, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ DKIM_VALID_AU=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001,\r
+ SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id n18e5HFwnZAx for <notmuch@notmuchmail.org>;\r
+ Mon, 27 Jul 2015 11:04:46 -0700 (PDT)\r
+Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com\r
+ [209.85.217.175])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id B7BE16DE1399\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Jul 2015 11:04:45 -0700 (PDT)\r
+Received: by lblf12 with SMTP id f12so58891292lbl.2\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Jul 2015 11:04:43 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:subject:date:message-id:in-reply-to:references;\r
+ bh=/KA9kY+JpxgnDDDzJJphXCk4wGbiLW5/NSVDJlDYwp8=;\r
+ b=HT+vcs/BSWaQrmAqGfliG9uQ4lg/8F1z4XRLI8mi30TSHFV2thlt6xK/8QYNWNO0d1\r
+ Jj5c2nMKlWlKa5K7O61LN2DgLkUyet7EdV3BrFDNyWzk1DkNVoyj+7+A3oYoQAhxNmBm\r
+ mEllfkof7vPfAsvnhVF+Z3Wqw0a8vhB9exWPgaPjPQo2ZHM/gpLGZcE/8SJT7869XJzh\r
+ KQ47Z0vJIb4xXVKWmdcGkKHaujBp5j/saXz5za8HJpDEsDnUBXztH3seV08yb21imITe\r
+ CQqVy/uR2ACEcQj1S9FXTgBDfSLtlg+FZ4me9BrGPZpUGW86M7mJVFv9nHTLZDvuuG2B\r
+ eHbw==\r
+X-Received: by 10.112.56.139 with SMTP id a11mr28114396lbq.90.1438020283260;\r
+ Mon, 27 Jul 2015 11:04:43 -0700 (PDT)\r
+Received: from edge.my.domain ([46.31.31.62])\r
+ by smtp.gmail.com with ESMTPSA id f4sm4042035lag.24.2015.07.27.11.04.41\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\r
+ Mon, 27 Jul 2015 11:04:42 -0700 (PDT)\r
+From: mp39590@gmail.com\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] configure: add --without-docs switch\r
+Date: Mon, 27 Jul 2015 21:04:37 +0300\r
+Message-Id: <1438020277-5145-1-git-send-email-mp39590@gmail.com>\r
+X-Mailer: git-send-email 2.4.6\r
+In-Reply-To: <87oaiysyzu.fsf@maritornes.cs.unb.ca>\r
+References: <87oaiysyzu.fsf@maritornes.cs.unb.ca>\r
+X-Mailman-Approved-At: Mon, 27 Jul 2015 12:21:12 -0700\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 27 Jul 2015 18:04:52 -0000\r
+\r
+From: Mikhail <mp39590@gmail.com>\r
+\r
+Previously documentation was build automatically if sphinx/doxygen\r
+executable were found. The switch is used to unconditionally disable\r
+sphinx/doxygen detection and therefor, building of documentation\r
+(including man pages).\r
+---\r
+ \r
+ The issue was about setting "noprefix = true" in .gitconfig.\r
+ Please try this patch.\r
+\r
+ configure | 36 ++++++++++++++++++++++--------------\r
+ 1 file changed, 22 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index b967a4e..c07a49b 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -65,6 +65,7 @@ PYTHON=${PYTHON:-}\r
+ # options.\r
+ PREFIX=/usr/local\r
+ LIBDIR=\r
++WITH_DOCS=1\r
+ WITH_EMACS=1\r
+ WITH_BASH=1\r
+ WITH_ZSH=1\r
+@@ -143,6 +144,7 @@ Some specific library versions can be specified (auto-detected otherwise):\r
+ Some features can be disabled (--with-feature=no is equivalent to\r
+ --without-feature) :\r
+ \r
++      --without-docs                  Do not install documentation and man pages\r
+       --without-emacs                 Do not install lisp file\r
+       --without-bash-completion       Do not install bash completions files\r
+       --without-zsh-completion        Do not install zsh completions files\r
+@@ -185,6 +187,8 @@ for option; do\r
+       BASHCOMPLETIONDIR="${option#*=}"\r
+     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then\r
+       ZSHCOMLETIONDIR="${option#*=}"\r
++    elif [ "${option}" = '--without-docs' ] ; then\r
++      WITH_DOCS=0\r
+     elif [ "${option%%=*}" = '--with-emacs' ]; then\r
+       if [ "${option#*=}" = 'no' ]; then\r
+           WITH_EMACS=0\r
+@@ -466,13 +470,15 @@ else\r
+     have_emacs=0\r
+ fi\r
+ \r
+-printf "Checking if doxygen is available... "\r
+-if command -v doxygen > /dev/null; then\r
+-    printf "Yes.\n"\r
+-    have_doxygen=1\r
+-else\r
+-    printf "No (so will not install api docs)\n"\r
+-    have_doxygen=0\r
++have_doxygen=0\r
++if [ $WITH_DOCS = "1" ] ; then\r
++    printf "Checking if doxygen is available... "\r
++    if command -v doxygen > /dev/null; then\r
++        printf "Yes.\n"\r
++        have_doxygen=1\r
++    else\r
++        printf "No (so will not install api docs)\n"\r
++    fi\r
+ fi\r
+ \r
+ printf "Checking for ruby development files... "\r
+@@ -484,13 +490,15 @@ else\r
+     have_ruby_dev=0\r
+ fi\r
+ \r
+-printf "Checking if sphinx is available and supports nroff output... "\r
+-if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then\r
+-    printf "Yes.\n"\r
+-    have_sphinx=1\r
+-else\r
+-    printf "No (so will not install man pages).\n"\r
+-    have_sphinx=0\r
++have_sphinx=0\r
++if [ $WITH_DOCS = "1" ] ; then\r
++    printf "Checking if sphinx is available and supports nroff output... "\r
++    if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then\r
++        printf "Yes.\n"\r
++        have_sphinx=1\r
++    else\r
++        printf "No (so will not install man pages).\n"\r
++    fi\r
+ fi\r
+ \r
+ libdir_in_ldconfig=0\r
+-- \r
+2.4.6\r
+\r