unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
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
Date: Fri, 30 May 2014 14:50:40 +0300	[thread overview]
Message-ID: <m2mwdza3jj.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1401435785-2894-1-git-send-email-jani@nikula.org>

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

  parent reply	other threads:[~2014-05-30 11:50 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-11 10:06 [RFC PATCH] configure: Create sh.config based on Makefile.config data Tomi Ollila
2014-05-25  8:22 ` Jani Nikula
2014-05-25 15:54   ` Tomi Ollila
2014-05-30  7:43     ` [PATCH 1/2] build: generate sh.config for feeding configure results to shell scripts Jani Nikula
2014-05-30  7:43       ` [PATCH 2/2] test: use sh.config for configuration Jani Nikula
2014-05-30 11:50       ` Tomi Ollila [this message]
2014-05-30 15:42       ` [PATCH 1/2] build: generate sh.config for feeding configure results to shell scripts W. Trevor King
2014-07-13 15:25         ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2mwdza3jj.fsf@guru.guru-group.fi \
    --to=tomi.ollila@iki.fi \
    --cc=jani@nikula.org \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).