--- /dev/null
+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 C365A431FD0\r
+ for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 05:06:27 -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 zaegCz0F77+Y for <notmuch@notmuchmail.org>;\r
+ Tue, 11 Mar 2014 05:06:25 -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 97A3A431FD2\r
+ for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 05:06:13 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1WNLRl-0007Jt-9G; Tue, 11 Mar 2014 09:06:13 -0300\r
+Received: (nullmailer pid 28627 invoked by uid 1000); Tue, 11 Mar 2014\r
+ 12:05:59 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 3/3] doc: configure detection of sphinx and rst2man\r
+Date: Tue, 11 Mar 2014 09:05:55 -0300\r
+Message-Id: <1394539555-28334-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394539555-28334-1-git-send-email-david@tethera.net>\r
+References: <1394539555-28334-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 12:06:28 -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
+ doc/Makefile.local | 24 +++++++++++++++---------\r
+ 2 files changed, 42 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 2eaed4a..4aaecc6 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 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
+diff --git a/doc/Makefile.local b/doc/Makefile.local\r
+index 23f4095..4883c4a 100644\r
+--- a/doc/Makefile.local\r
++++ b/doc/Makefile.local\r
+@@ -33,21 +33,26 @@ sphinx-info: sphinx-texinfo\r
+ \r
+ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES})\r
+ \r
+-build-man: ${MAN_GZIP_FILES}\r
+-\r
+-${MAN_ROFF_FILES}: ${dir}/man.stamp\r
+-\r
+-$(dir)/man.stamp: ${MAN_RST_FILES}\r
++# Use the man page converter that is available. We should never depend\r
++# on MAN_ROFF_FILES if a converter is not available.\r
++${MAN_ROFF_FILES}: ${MAN_RST_FILES}\r
+ ifeq ($(HAVE_SPHINX),1)\r
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(DOCBUILDDIR)/man\r
+- touch $@\r
+ else ifeq ($(HAVE_RST2MAN),1)\r
+ $(prerst2man) $(DOCBUILDDIR)/.. $(DOCBUILDDIR)/man\r
+- touch $@\r
+ else\r
+- @echo "No sphinx or rst2man, will not install man pages."\r
++ @echo "Fatal: build dependency fail."\r
++ @false\r
+ endif\r
+ \r
++# Do not try to build or install man pages if a man page converter is\r
++# not available.\r
++ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)\r
++build-man:\r
++install-man:\r
++ @echo "No sphinx or rst2man, will not install man pages."\r
++else\r
++build-man: ${MAN_GZIP_FILES}\r
+ install-man: ${MAN_GZIP_FILES}\r
+ mkdir -p "$(DESTDIR)$(mandir)/man1"\r
+ mkdir -p "$(DESTDIR)$(mandir)/man5"\r
+@@ -56,9 +61,10 @@ install-man: ${MAN_GZIP_FILES}\r
+ install -m0644 $(DOCBUILDDIR)/man/*.5.gz $(DESTDIR)/$(mandir)/man5\r
+ install -m0644 $(DOCBUILDDIR)/man/*.7.gz $(DESTDIR)/$(mandir)/man7\r
+ cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz\r
++endif\r
+ \r
+ $(dir)/docdeps.mk: $(dir)/conf.py $(dir)/mkdocdeps.py\r
+ $(mkdocdeps) $< $(DOCBUILDDIR) $@\r
+ \r
+-CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk $(dir)/man.stamp\r
++CLEAN := $(CLEAN) $(DOCBUILDDIR) $(dir)/docdeps.mk\r
+ CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES)\r
+-- \r
+1.8.5.3\r
+\r
projects / notmuch-archives.git / commitdiff