From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id BEC6D6DE1016 for ; Mon, 10 Jun 2019 17:50:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.046 X-Spam-Level: X-Spam-Status: No, score=-0.046 tagged_above=-999 required=5 tests=[AWL=-0.045, 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 YBxrYE4BI7SQ for ; Mon, 10 Jun 2019 17:50:12 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 6892A6DE0F39 for ; Mon, 10 Jun 2019 17:50:12 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1haUzJ-0006Cv-St; Mon, 10 Jun 2019 20:50:09 -0400 Received: (nullmailer pid 22859 invoked by uid 1000); Tue, 11 Jun 2019 00:50:29 -0000 From: David Bremner To: Tomi Ollila , David Bremner , notmuch@notmuchmail.org Subject: [PATCH 1/2] doc: don't build notmuch-emacs.info for configure --without-emacs Date: Mon, 10 Jun 2019 21:50:23 -0300 Message-Id: <20190611005024.22814-1-david@tethera.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Tue, 11 Jun 2019 00:50:14 -0000 Since the docstrings are not built in the case of --without-emacs, even if emacs is detected, don't let sphinx build the emacs docs. This avoids a large number of error messages due to missing includes. It's actually a bit surprising sphinx doesn't generate an error for the missing include files. --- doc/Makefile.local | 2 +- doc/conf.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 719172fe..a88beb46 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -4,7 +4,7 @@ dir := doc # You can set these variables from the command line. SPHINXOPTS := -q -SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} sphinx-build +SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} WITH_EMACS=${WITH_EMACS} sphinx-build DOCBUILDDIR := $(dir)/_build # Internal variables. diff --git a/doc/conf.py b/doc/conf.py index 5f8c9f1c..8afff929 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -29,9 +29,10 @@ release = version # directories to ignore when looking for source files. exclude_patterns = ['_build'] -# If we don't have emacs, don't build the notmuch-emacs docs, as they need -# emacs to generate the docstring include files -if os.environ.get('HAVE_EMACS') != '1': +# If we don't have emacs (or the user configured --without-emacs), +# don't build the notmuch-emacs docs, as they need emacs to generate +# the docstring include files +if os.environ.get('HAVE_EMACS') != '1' or os.environ.get('WITH_EMACS') != '1': exclude_patterns.append('notmuch-emacs.rst') # The name of the Pygments (syntax highlighting) style to use. -- 2.20.1