From: Jani Nikula <jani@nikula.org>
Date: Fri, 30 May 2014 07:43:04 +0000 (+0300)
Subject: [PATCH 1/2] build: generate sh.config for feeding configure results to shell scripts
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4a60a2b3ffeb39a725397dd1479c841e925fb63;p=notmuch-archives.git

[PATCH 1/2] build: generate sh.config for feeding configure results to shell scripts
---

diff --git a/4d/3a40a77bb59094705fde029420b74353ed9074 b/4d/3a40a77bb59094705fde029420b74353ed9074
new file mode 100644
index 000000000..2ac16f8d1
--- /dev/null
+++ b/4d/3a40a77bb59094705fde029420b74353ed9074
@@ -0,0 +1,111 @@
+Return-Path: <jani@nikula.org>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 1B230431FC3
+	for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:14 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: -0.7
+X-Spam-Level: 
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
+	tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 86cauR3bVlzZ for <notmuch@notmuchmail.org>;
+	Fri, 30 May 2014 00:43:10 -0700 (PDT)
+Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com
+	[209.85.212.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 07426431FAE
+	for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:09 -0700 (PDT)
+Received: by mail-wi0-f182.google.com with SMTP id r20so595212wiv.9
+	for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:08 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+	d=1e100.net; s=20130820;
+	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+	:references;
+	bh=rxgerB/o0mpK0jUPS5HDCQcvkgT4FjCbXzFmRz89E0Q=;
+	b=Hhbmb7KapOfTXDJWiPipqtvLS3BD7imZ8TzJ5EmexkbXTyKMdCjEw18k3+crf+Cgqx
+	/n0FdNhsc+4V0TTUAHmsXzUsE3CFwv290xujXxDn7bjxDgpInAV7mkACIdKp7DSsnAEC
+	5L3Ny1odMxzFhqrf1scRfcXgPf4odcwUT0FIKTnhvk9BktxoDpoFmMWn7soWPvZN6cBb
+	SAJd+wIBI9LZwDmJiYSnOz9M7OnFl3365ObTAZG7ZhiJt0rfrpZH4FUAMXbbd1fNi5Pj
+	p+DVjXC2WX8UUi2S7UICQ3aFFGRj+2JT89ii46B6mRGcWtfG2v0T79cmlDh8I1R68wbk
+	3X2Q==
+X-Gm-Message-State:
+ ALoCoQmWMA+TwRrIkMiWZaF0zvqPKN3pK3/BqFA66OeIWu9jaNup19EtF8SUSHR5Suiq3xj7a26l
+X-Received: by 10.194.62.104 with SMTP id x8mr19044874wjr.15.1401435787588;
+	Fri, 30 May 2014 00:43:07 -0700 (PDT)
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
+	[88.195.111.91])
+	by mx.google.com with ESMTPSA id qq5sm3714495wic.10.2014.05.30.00.43.05
+	for <multiple recipients>
+	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+	Fri, 30 May 2014 00:43:06 -0700 (PDT)
+From: Jani Nikula <jani@nikula.org>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 1/2] build: generate sh.config for feeding configure results
+	to shell scripts
+Date: Fri, 30 May 2014 10:43:04 +0300
+Message-Id: <1401435785-2894-1-git-send-email-jani@nikula.org>
+X-Mailer: git-send-email 2.0.0.rc2
+In-Reply-To: <m2lhtphn1b.fsf@guru.guru-group.fi>
+References: <m2lhtphn1b.fsf@guru.guru-group.fi>
+Cc: Tomi Ollila <tomi.ollila@iki.fi>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Fri, 30 May 2014 07:43:14 -0000
+
+Only include the relevant information.
+---
+ Makefile.local |  2 +-
+ configure      | 13 +++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.local b/Makefile.local
+index 3377d55e1d49..31e524070849 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 9bde2eb72b0e..4e3d2c4ac0b2 100755
+--- a/configure
++++ b/configure
+@@ -935,3 +935,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
++_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
++
++# Whether there's either sphinx or rst2man available for building
++# documentation
++_HAVE_MAN=$((have_sphinx || have_rst2man))
++EOF
+-- 
+2.0.0.rc2
+