From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 30 May 2014 11:50:40 +0000 (+0300)
Subject: Re: [PATCH 1/2] build: generate sh.config for feeding configure results	to shell... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bda40e90a78a0d03955ebd41754deaf7f59c95b;p=notmuch-archives.git

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

diff --git a/61/899e103a56665e08c3a738ddef50797a5b2fcf b/61/899e103a56665e08c3a738ddef50797a5b2fcf
new file mode 100644
index 000000000..7e28df841
--- /dev/null
+++ b/61/899e103a56665e08c3a738ddef50797a5b2fcf
@@ -0,0 +1,107 @@
+Return-Path: <tomi.ollila@iki.fi>
+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 A920B431FC3
+	for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:57 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 C02TN33uOmMx for <notmuch@notmuchmail.org>;
+	Fri, 30 May 2014 04:50:49 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 7D78C431FAE
+	for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:49 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 082B810008F;
+	Fri, 30 May 2014 14:50:41 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH 1/2] build: generate sh.config for feeding configure
+	results	to shell scripts
+In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org>
+References: <m2lhtphn1b.fsf@guru.guru-group.fi>
+	<1401435785-2894-1-git-send-email-jani@nikula.org>
+User-Agent: Notmuch/0.18+28~gcecaba1 (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Fri, 30 May 2014 14:50:40 +0300
+Message-ID: <m2mwdza3jj.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+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 11:50:57 -0000
+
+On Fri, May 30 2014, Jani Nikula <jani@nikula.org> wrote:
+
+> Only include the relevant information.
+> ---
+
+Series LGTM. Tests pass.
+
+Tomi
+
+
+>  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
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch