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

[Tomi Ollila]

On Fri, May 30 2014, Jani Nikula <jani at 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 at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch