[PATCH 2/3] doc: configure detection of sphinx and rst2man

diff --git a/bb/12231a4e49e8daa9befa7fec9a57da2e0e7f59 b/bb/12231a4e49e8daa9befa7fec9a57da2e0e7f59
new file mode 100644 (file)
index 0000000..de5166f
--- /dev/null
+++ b/bb/12231a4e49e8daa9befa7fec9a57da2e0e7f59
@@ -0,0 +1,107 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4C303431FC3\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id psiWiFYGLEwf for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Mar 2014 19:20:12 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6FA41431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:12 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNCIe-0005QE-3o; Mon, 10 Mar 2014 23:20:12 -0300\r
+Received: (nullmailer pid 7590 invoked by uid 1000); Tue, 11 Mar 2014\r
+       02:20:05 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] doc: configure detection of sphinx and rst2man\r
+Date: Mon, 10 Mar 2014 23:18:28 -0300\r
+Message-Id: <1394504309-7433-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394504309-7433-1-git-send-email-david@tethera.net>\r
+References: <m2y50hisnb.fsf@guru.guru-group.fi>\r
+       <1394504309-7433-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Tue, 11 Mar 2014 02:20:17 -0000\r
+\r
+Because sphinx-build does not provide a convenient way of listing\r
+which builders exist, and some people actually have pre 1.0 sphinx, we\r
+try loading a relevant python module.\r
+\r
+Currently the assumption is that no python in path -> no sphinx-build\r
+in path.\r
+---\r
+ configure | 27 +++++++++++++++++++++++++++\r
+ 1 file changed, 27 insertions(+)\r
+\r
+diff --git a/configure b/configure\r
+index 2eaed4a..10356e7 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -393,6 +393,27 @@ else\r
+     have_emacs=0\r
+ fi\r
+ \r
++printf "Checking if sphinx is available and supports nroff output... "\r
++if hash sphinx-build > /dev/null 2>&1 && python -m sphinx.writers.manpage > /dev/null 2>&1 ; then\r
++    printf "Yes.\n"\r
++    have_sphinx=1\r
++    have_rst2man=0\r
++else\r
++    printf "No (falling back to rst2man).\n"\r
++    have_sphinx=0\r
++\r
++    printf "Checking if rst2man is available... "\r
++    if rst2man -V > /dev/null 2>&1; then\r
++       printf "Yes.\n"\r
++       have_rst2man=1\r
++    else\r
++       printf "No (so will not install man pages).\n"\r
++       have_rst2man=0\r
++    fi\r
++fi\r
++\r
++\r
++\r
+ libdir_in_ldconfig=0\r
+ \r
+ printf "Checking which platform we are on... "\r
+@@ -759,6 +780,12 @@ emacsetcdir=${EMACSETCDIR}\r
+ # Whether there's an emacs binary available for byte-compiling\r
+ HAVE_EMACS = ${have_emacs}\r
+ \r
++# Whether there's a sphinx-build binary available for building documentation\r
++HAVE_SPHINX=${have_sphinx}\r
++\r
++# Whether there's a rst2man binary available and used for building documentation\r
++HAVE_RST2MAN=${have_rst2man}\r
++\r
+ # The directory to which desktop files should be installed\r
+ desktop_dir = \$(prefix)/share/applications\r
+ \r
+-- \r
+1.8.5.3\r
+\r