[PATCH] Place extra_cflags before CONFIGURE_CFLAGS

[Jani Nikula]

On Tue, 15 Oct 2013, Moritz Wilhelmy <mw+notmuch at barfooze.de> wrote:
> From: Moritz Wilhelmy <moritz+git at wzff.de>
>
> This ensures that the build will not attempt to use an existing notmuch.h when
> an older version of notmuch is already installed elsewhere (e.g. in /usr/local)
> and /usr/local/include is added to CONFIGURE_CFLAGS by one of the libraries
> (talloc, in my case)

LGTM. I reached the exact same solution independently when we were
debugging this on IRC.

BR,
Jani.


> ---
>  Makefile.local |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.local b/Makefile.local
> index 0464a50..72524eb 100644
> --- a/Makefile.local
> +++ b/Makefile.local
> @@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc
>  PV_FILE=bindings/python/notmuch/version.py
>  
>  # Smash together user's values with our extra values
> -FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
> -FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
> +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
> +FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
>  FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
>  FINAL_NOTMUCH_LINKER = CC
>  ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
> -- 
> 1.7.9.4
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch