1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1B230431FC3
\r
6 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:14 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 86cauR3bVlzZ for <notmuch@notmuchmail.org>;
\r
16 Fri, 30 May 2014 00:43:10 -0700 (PDT)
\r
17 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com
\r
18 [209.85.212.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 07426431FAE
\r
21 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:09 -0700 (PDT)
\r
22 Received: by mail-wi0-f182.google.com with SMTP id r20so595212wiv.9
\r
23 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 00:43:08 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=1e100.net; s=20130820;
\r
26 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
\r
28 bh=rxgerB/o0mpK0jUPS5HDCQcvkgT4FjCbXzFmRz89E0Q=;
\r
29 b=Hhbmb7KapOfTXDJWiPipqtvLS3BD7imZ8TzJ5EmexkbXTyKMdCjEw18k3+crf+Cgqx
\r
30 /n0FdNhsc+4V0TTUAHmsXzUsE3CFwv290xujXxDn7bjxDgpInAV7mkACIdKp7DSsnAEC
\r
31 5L3Ny1odMxzFhqrf1scRfcXgPf4odcwUT0FIKTnhvk9BktxoDpoFmMWn7soWPvZN6cBb
\r
32 SAJd+wIBI9LZwDmJiYSnOz9M7OnFl3365ObTAZG7ZhiJt0rfrpZH4FUAMXbbd1fNi5Pj
\r
33 p+DVjXC2WX8UUi2S7UICQ3aFFGRj+2JT89ii46B6mRGcWtfG2v0T79cmlDh8I1R68wbk
\r
36 ALoCoQmWMA+TwRrIkMiWZaF0zvqPKN3pK3/BqFA66OeIWu9jaNup19EtF8SUSHR5Suiq3xj7a26l
\r
37 X-Received: by 10.194.62.104 with SMTP id x8mr19044874wjr.15.1401435787588;
\r
38 Fri, 30 May 2014 00:43:07 -0700 (PDT)
\r
39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
\r
41 by mx.google.com with ESMTPSA id qq5sm3714495wic.10.2014.05.30.00.43.05
\r
42 for <multiple recipients>
\r
43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
44 Fri, 30 May 2014 00:43:06 -0700 (PDT)
\r
45 From: Jani Nikula <jani@nikula.org>
\r
46 To: notmuch@notmuchmail.org
\r
47 Subject: [PATCH 1/2] build: generate sh.config for feeding configure results
\r
49 Date: Fri, 30 May 2014 10:43:04 +0300
\r
50 Message-Id: <1401435785-2894-1-git-send-email-jani@nikula.org>
\r
51 X-Mailer: git-send-email 2.0.0.rc2
\r
52 In-Reply-To: <m2lhtphn1b.fsf@guru.guru-group.fi>
\r
53 References: <m2lhtphn1b.fsf@guru.guru-group.fi>
\r
54 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Fri, 30 May 2014 07:43:14 -0000
\r
69 Only include the relevant information.
\r
71 Makefile.local | 2 +-
\r
72 configure | 13 +++++++++++++
\r
73 2 files changed, 14 insertions(+), 1 deletion(-)
\r
75 diff --git a/Makefile.local b/Makefile.local
\r
76 index 3377d55e1d49..31e524070849 100644
\r
77 --- a/Makefile.local
\r
78 +++ b/Makefile.local
\r
79 @@ -338,7 +338,7 @@ SRCS := $(SRCS) $(notmuch_client_srcs)
\r
80 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
\r
81 CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
\r
83 -DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
\r
84 +DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config
\r
86 DEPS := $(SRCS:%.c=.deps/%.d)
\r
87 DEPS := $(DEPS:%.cc=.deps/%.d)
\r
88 diff --git a/configure b/configure
\r
89 index 9bde2eb72b0e..4e3d2c4ac0b2 100755
\r
92 @@ -935,3 +935,16 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\r
94 CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)
\r
97 +# construct the sh.config
\r
98 +cat > sh.config <<EOF
\r
99 +# This sh.config was automatically generated by the ./configure
\r
100 +# script of notmuch.
\r
102 +# Whether the Xapian version in use supports compaction
\r
103 +_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
\r
105 +# Whether there's either sphinx or rst2man available for building
\r
107 +_HAVE_MAN=$((have_sphinx || have_rst2man))
\r