unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH] configure: disable features that do not work out of tree
Date: Thu, 23 Apr 2020 23:58:57 +0300	[thread overview]
Message-ID: <20200423205857.346-1-tomi.ollila@iki.fi> (raw)

When doing out of tree build,

- sphinx-build cannot collect source files from source code
  directory and generated files from build directory.

- python3-cffi did not work, did not investigate further.

In order to get at least something done out of tree, these
features are disabled when doing out of tree builds. The output
is still useful if these features are not needed, and helps with
e.g. test output comparisons.
---
 configure | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configure b/configure
index 70031d14..8c2c9b72 100755
--- a/configure
+++ b/configure
@@ -70,6 +70,10 @@ if [ "$srcdir" != "." ]; then
     mkdir bindings/ruby
     cp -a "$srcdir"/bindings/ruby/*.[ch] bindings/ruby
     cp -a "$srcdir"/bindings/ruby/extconf.rb bindings/ruby
+
+    out_of_tree_build=1
+else
+    out_of_tree_build=0
 fi
 
 # Set several defaults (optionally specified by the user in
@@ -1089,6 +1093,11 @@ printf "\n\t%s\n" "${WARN_CFLAGS}"
 
 rm -f minimal minimal.c _libversion.c _libversion _libversion.sh _check_session_keys.c _check_session_keys
 
+if [ "$out_of_tree_build" = 1 ]; then
+   printf '\n*** Out of tree build: disabling sphinx docs, python3-cffi ***\n'
+   have_sphinx=0 have_python3_cffi=0
+fi
+
 # construct the Makefile.config
 cat > Makefile.config <<EOF
 # This Makefile.config was automatically generated by the ./configure
-- 
2.25.3

                 reply	other threads:[~2020-04-23 20:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200423205857.346-1-tomi.ollila@iki.fi \
    --to=tomi.ollila@iki.fi \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).