aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jani Nikula <jani@nikula.org>2014-05-30 10:43:04 +0300
committerGravatar David Bremner <david@tethera.net>2014-07-13 12:15:47 -0300
commit57540a1952460fe88817ad53dc32274543cf0514 (patch)
tree5b5113eb366d6d822feabd7b54d25f7a20837c08
parent5694d72a8367931776890e3a8ffb23e5bf5b34b7 (diff)
build: generate sh.config for feeding configure results to shell scripts
Only include the relevant information. Amended by David Bremner: Use a prefix NOTMUCH_ to minimize collisions with other variables.
-rw-r--r--Makefile.local2
-rwxr-xr-xconfigure13
2 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.local b/Makefile.local
index d5ee85ce..81ee3477 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -338,7 +338,7 @@ SRCS := $(SRCS) $(notmuch_client_srcs)
CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
-DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
+DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config
DEPS := $(SRCS:%.c=.deps/%.d)
DEPS := $(DEPS:%.cc=.deps/%.d)
diff --git a/configure b/configure
index 3f0c8d52..86ba2f7c 100755
--- a/configure
+++ b/configure
@@ -956,3 +956,16 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)
EOF
+
+# construct the sh.config
+cat > sh.config <<EOF
+# This sh.config was automatically generated by the ./configure
+# script of notmuch.
+
+# Whether the Xapian version in use supports compaction
+NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
+
+# Whether there's either sphinx or rst2man available for building
+# documentation
+NOTMUCH_HAVE_MAN=$((have_sphinx || have_rst2man))
+EOF