1 Return-Path: <tomi.ollila@iki.fi>
\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 A920B431FC3
\r
6 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:57 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 C02TN33uOmMx for <notmuch@notmuchmail.org>;
\r
16 Fri, 30 May 2014 04:50:49 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 7D78C431FAE
\r
19 for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:49 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 082B810008F;
\r
22 Fri, 30 May 2014 14:50:41 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH 1/2] build: generate sh.config for feeding configure
\r
26 results to shell scripts
\r
27 In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org>
\r
28 References: <m2lhtphn1b.fsf@guru.guru-group.fi>
\r
29 <1401435785-2894-1-git-send-email-jani@nikula.org>
\r
30 User-Agent: Notmuch/0.18+28~gcecaba1 (http://notmuchmail.org) Emacs/24.3.1
\r
31 (x86_64-unknown-linux-gnu)
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Fri, 30 May 2014 14:50:40 +0300
\r
36 Message-ID: <m2mwdza3jj.fsf@guru.guru-group.fi>
\r
38 Content-Type: text/plain
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Fri, 30 May 2014 11:50:57 -0000
\r
53 On Fri, May 30 2014, Jani Nikula <jani@nikula.org> wrote:
\r
55 > Only include the relevant information.
\r
58 Series LGTM. Tests pass.
\r
63 > Makefile.local | 2 +-
\r
64 > configure | 13 +++++++++++++
\r
65 > 2 files changed, 14 insertions(+), 1 deletion(-)
\r
67 > diff --git a/Makefile.local b/Makefile.local
\r
68 > index 3377d55e1d49..31e524070849 100644
\r
69 > --- a/Makefile.local
\r
70 > +++ b/Makefile.local
\r
71 > @@ -338,7 +338,7 @@ SRCS := $(SRCS) $(notmuch_client_srcs)
\r
72 > CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
\r
73 > CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
\r
75 > -DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
\r
76 > +DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config
\r
78 > DEPS := $(SRCS:%.c=.deps/%.d)
\r
79 > DEPS := $(DEPS:%.cc=.deps/%.d)
\r
80 > diff --git a/configure b/configure
\r
81 > index 9bde2eb72b0e..4e3d2c4ac0b2 100755
\r
84 > @@ -935,3 +935,16 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\r
86 > CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)
\r
89 > +# construct the sh.config
\r
90 > +cat > sh.config <<EOF
\r
91 > +# This sh.config was automatically generated by the ./configure
\r
92 > +# script of notmuch.
\r
94 > +# Whether the Xapian version in use supports compaction
\r
95 > +_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
\r
97 > +# Whether there's either sphinx or rst2man available for building
\r
99 > +_HAVE_MAN=$((have_sphinx || have_rst2man))
\r
104 > _______________________________________________
\r
105 > notmuch mailing list
\r
106 > notmuch@notmuchmail.org
\r
107 > http://notmuchmail.org/mailman/listinfo/notmuch
\r