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

diff --git a/61/899e103a56665e08c3a738ddef50797a5b2fcf b/61/899e103a56665e08c3a738ddef50797a5b2fcf
new file mode 100644 (file)
index 0000000..7e28df8
--- /dev/null
+++ b/61/899e103a56665e08c3a738ddef50797a5b2fcf
@@ -0,0 +1,107 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A920B431FC3\r
+       for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id C02TN33uOmMx for <notmuch@notmuchmail.org>;\r
+       Fri, 30 May 2014 04:50:49 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7D78C431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 30 May 2014 04:50:49 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 082B810008F;\r
+       Fri, 30 May 2014 14:50:41 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] build: generate sh.config for feeding configure\r
+       results to shell scripts\r
+In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org>\r
+References: <m2lhtphn1b.fsf@guru.guru-group.fi>\r
+       <1401435785-2894-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.18+28~gcecaba1 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 30 May 2014 14:50:40 +0300\r
+Message-ID: <m2mwdza3jj.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 30 May 2014 11:50:57 -0000\r
+\r
+On Fri, May 30 2014, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Only include the relevant information.\r
+> ---\r
+\r
+Series LGTM. Tests pass.\r
+\r
+Tomi\r
+\r
+\r
+>  Makefile.local |  2 +-\r
+>  configure      | 13 +++++++++++++\r
+>  2 files changed, 14 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/Makefile.local b/Makefile.local\r
+> index 3377d55e1d49..31e524070849 100644\r
+> --- a/Makefile.local\r
+> +++ b/Makefile.local\r
+> @@ -338,7 +338,7 @@ SRCS  := $(SRCS) $(notmuch_client_srcs)\r
+>  CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)\r
+>  CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp\r
+>  \r
+> -DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config\r
+> +DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config\r
+>  \r
+>  DEPS := $(SRCS:%.c=.deps/%.d)\r
+>  DEPS := $(DEPS:%.cc=.deps/%.d)\r
+> diff --git a/configure b/configure\r
+> index 9bde2eb72b0e..4e3d2c4ac0b2 100755\r
+> --- a/configure\r
+> +++ b/configure\r
+> @@ -935,3 +935,16 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\\r
+>  \r
+>  CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)\r
+>  EOF\r
+> +\r
+> +# construct the sh.config\r
+> +cat > sh.config <<EOF\r
+> +# This sh.config was automatically generated by the ./configure\r
+> +# script of notmuch.\r
+> +\r
+> +# Whether the Xapian version in use supports compaction\r
+> +_HAVE_XAPIAN_COMPACT=${have_xapian_compact}\r
+> +\r
+> +# Whether there's either sphinx or rst2man available for building\r
+> +# documentation\r
+> +_HAVE_MAN=$((have_sphinx || have_rst2man))\r
+> +EOF\r
+> -- \r
+> 2.0.0.rc2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r