From a551a9e18c8074baa0496fc3c2a6202edd764121 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Tue, 19 Nov 2013 12:43:25 +0200 Subject: [PATCH] Re: [PATCH 1/2] fix compilation without emacs --- 30/a5dbe120bdd7200f76ade6bbe7858010996599 | 108 ++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 30/a5dbe120bdd7200f76ade6bbe7858010996599 diff --git a/30/a5dbe120bdd7200f76ade6bbe7858010996599 b/30/a5dbe120bdd7200f76ade6bbe7858010996599 new file mode 100644 index 000000000..34105c65f --- /dev/null +++ b/30/a5dbe120bdd7200f76ade6bbe7858010996599 @@ -0,0 +1,108 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 15E4C431FC2 + for ; Tue, 19 Nov 2013 02:43:43 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Y3-vCLS7A0yK for ; + Tue, 19 Nov 2013 02:43:35 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 922E5431FBC + for ; Tue, 19 Nov 2013 02:43:35 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id D5B92100030; + Tue, 19 Nov 2013 12:43:25 +0200 (EET) +From: Tomi Ollila +To: Tomi Valkeinen , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/2] fix compilation without emacs +In-Reply-To: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi> +References: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi> +User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 19 Nov 2013 10:43:43 -0000 + +On Tue, Nov 19 2013, Tomi Valkeinen 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@iki.fi" ) instead. + +If that works for you you can gain karma by reviewing it :D + +Tomi + +> +> Signed-off-by: Tomi Valkeinen +> --- +> 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@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2