From 57540a1952460fe88817ad53dc32274543cf0514 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 30 May 2014 10:43:04 +0300 Subject: [PATCH] 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. --- Makefile.local | 2 +- configure | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 <