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