[PATCH 1/2] fix compilation without emacs

[Tomi Ollila]

On Tue, Nov 19 2013, Tomi Valkeinen <tomi.valkeinen at iki.fi> wrote:

> If emacs is not installed, the following error is printed while
> compiling:
>
> /bin/sh: 1: emacs: not found
>
> This patch fixes the build.

Tervetuloa notmuch-muutosten ihmeelliseen maailmaan !

> It might be better to exclude the whole emacs directory from build when
> compiling without emacs, but that's a bigger change.

Well, that change would probably break my build: I configure --without-emacs
(to disable emacs build during normal build) but then I build emacs MUA
separately (to just one notmuch.elc file)...

You could look http://article.gmane.org/gmane.mail.notmuch.general/15837
( id:"1377630047-27756-1-git-send-email-tomi.ollila at iki.fi" ) instead.

If that works for you you can gain karma by reviewing it :D

Tomi

>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at iki.fi>
> ---
>  emacs/Makefile.local | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/emacs/Makefile.local b/emacs/Makefile.local
> index 92467a3..0fcf64c 100644
> --- a/emacs/Makefile.local
> +++ b/emacs/Makefile.local
> @@ -24,6 +24,7 @@ emacs_images := \
>  
>  emacs_bytecode = $(emacs_sources:.el=.elc)
>  
> +ifeq ($(WITH_EMACS),1)
>  # Because of defmacro's and defsubst's, we have to account for load
>  # dependencies between Elisp files when byte compiling.  Otherwise,
>  # the byte compiler may load an old .elc file when processing a
> @@ -39,7 +40,6 @@ CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp
>  %.elc: %.el $(global_deps)
>  	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
>  
> -ifeq ($(WITH_EMACS),1)
>  ifeq ($(HAVE_EMACS),1)
>  all: $(emacs_bytecode)
>  endif
> -- 
> 1.8.3.2
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch