1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4C303431FC3
\r
6 for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id psiWiFYGLEwf for <notmuch@notmuchmail.org>;
\r
16 Mon, 10 Mar 2014 19:20:12 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 6FA41431FBD
\r
21 for <notmuch@notmuchmail.org>; Mon, 10 Mar 2014 19:20:12 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WNCIe-0005QE-3o; Mon, 10 Mar 2014 23:20:12 -0300
\r
25 Received: (nullmailer pid 7590 invoked by uid 1000); Tue, 11 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH 2/3] doc: configure detection of sphinx and rst2man
\r
30 Date: Mon, 10 Mar 2014 23:18:28 -0300
\r
31 Message-Id: <1394504309-7433-2-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 In-Reply-To: <1394504309-7433-1-git-send-email-david@tethera.net>
\r
34 References: <m2y50hisnb.fsf@guru.guru-group.fi>
\r
35 <1394504309-7433-1-git-send-email-david@tethera.net>
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.13
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Tue, 11 Mar 2014 02:20:17 -0000
\r
50 Because sphinx-build does not provide a convenient way of listing
\r
51 which builders exist, and some people actually have pre 1.0 sphinx, we
\r
52 try loading a relevant python module.
\r
54 Currently the assumption is that no python in path -> no sphinx-build
\r
57 configure | 27 +++++++++++++++++++++++++++
\r
58 1 file changed, 27 insertions(+)
\r
60 diff --git a/configure b/configure
\r
61 index 2eaed4a..10356e7 100755
\r
64 @@ -393,6 +393,27 @@ else
\r
68 +printf "Checking if sphinx is available and supports nroff output... "
\r
69 +if hash sphinx-build > /dev/null 2>&1 && python -m sphinx.writers.manpage > /dev/null 2>&1 ; then
\r
74 + printf "No (falling back to rst2man).\n"
\r
77 + printf "Checking if rst2man is available... "
\r
78 + if rst2man -V > /dev/null 2>&1; then
\r
82 + printf "No (so will not install man pages).\n"
\r
89 libdir_in_ldconfig=0
\r
91 printf "Checking which platform we are on... "
\r
92 @@ -759,6 +780,12 @@ emacsetcdir=${EMACSETCDIR}
\r
93 # Whether there's an emacs binary available for byte-compiling
\r
94 HAVE_EMACS = ${have_emacs}
\r
96 +# Whether there's a sphinx-build binary available for building documentation
\r
97 +HAVE_SPHINX=${have_sphinx}
\r
99 +# Whether there's a rst2man binary available and used for building documentation
\r
100 +HAVE_RST2MAN=${have_rst2man}
\r
102 # The directory to which desktop files should be installed
\r
103 desktop_dir = \$(prefix)/share/applications
\r