From f5c002a60264f215686e7ae8e39391d892e64c16 Mon Sep 17 00:00:00 2001 From: mp39590 Date: Sat, 25 Jul 2015 21:57:11 +0300 Subject: [PATCH] [PATCH] configure: add --without-docs switch --- 1c/e5d46bd1c3260288644396fd87dd2b690fc284 | 150 ++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 1c/e5d46bd1c3260288644396fd87dd2b690fc284 diff --git a/1c/e5d46bd1c3260288644396fd87dd2b690fc284 b/1c/e5d46bd1c3260288644396fd87dd2b690fc284 new file mode 100644 index 000000000..e2ba0f0b0 --- /dev/null +++ b/1c/e5d46bd1c3260288644396fd87dd2b690fc284 @@ -0,0 +1,150 @@ +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 8B4406DE0AC2 + for ; Sat, 25 Jul 2015 11:57:22 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.57 +X-Spam-Level: +X-Spam-Status: No, score=-0.57 tagged_above=-999 required=5 + tests=[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_H3=-0.01, + RCVD_IN_MSPIKE_WL=-0.01, 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 7E8sooepkp44 for ; + Sat, 25 Jul 2015 11:57:21 -0700 (PDT) +Received: from mail-la0-f53.google.com (mail-la0-f53.google.com + [209.85.215.53]) + by arlo.cworth.org (Postfix) with ESMTPS id 6E88E6DE00CB + for ; Sat, 25 Jul 2015 11:57:20 -0700 (PDT) +Received: by lafd3 with SMTP id d3so19539976laf.1 + for ; Sat, 25 Jul 2015 11:57:17 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:subject:date:message-id; + bh=u00JnJZV+fHLrHaRKofY/xxSkETpW9J+kXQ/SuQU7ZI=; + b=oXwsIrDFHHsF7lcqNRCRuC5P7fjgt/nKAzjfyFmk+djOkQR5TaBcWFQGsbdTcO8ssM + JzZ8krsU3WH8kmaFWKenHQAR2x9HzXZHTVK5qZzwkfMxKGJuNsHaRoyi0jHpbUoiQvBN + yGcu2SekH3iuGwuELFOOn2zJ5Ym3RhEn+E8BrYjDIYFm4dwMWQ4K3nYVpkhIGSnkpE4J + 8ZyhVH3JIHVnLdNQHMqwhQI/lkkYgkCS3w94z6xpnrf3Y1EKrL+h7lOCdt4Asf0XCfOC + sTzhMrJy4zdz3B5D44bi+WVT5IpDXRFNzVpEkB6Jg6NPpRghGAwomqfjn/b9Rqx7yw5q + cRSg== +X-Received: by 10.152.23.38 with SMTP id j6mr19047435laf.47.1437850637077; + Sat, 25 Jul 2015 11:57:17 -0700 (PDT) +Received: from edge.my.domain ([46.31.31.62]) + by smtp.gmail.com with ESMTPSA id w9sm2722739laj.21.2015.07.25.11.57.15 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); + Sat, 25 Jul 2015 11:57:16 -0700 (PDT) +From: mp39590@gmail.com +To: notmuch@notmuchmail.org +Subject: [PATCH] configure: add --without-docs switch +Date: Sat, 25 Jul 2015 21:57:11 +0300 +Message-Id: <1437850631-30742-1-git-send-email-mp39590@gmail.com> +X-Mailer: git-send-email 2.4.6 +X-Mailman-Approved-At: Sun, 26 Jul 2015 01:22:07 -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: Sat, 25 Jul 2015 18:57:22 -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). +--- + configure | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +diff --git configure configure +index b967a4e..c07a49b 100755 +--- configure ++++ 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 + -- 2.26.2