Re: [PATCH 1/2] fix compilation without emacs

diff --git a/30/a5dbe120bdd7200f76ade6bbe7858010996599 b/30/a5dbe120bdd7200f76ade6bbe7858010996599
new file mode 100644 (file)
index 0000000..34105c6
--- /dev/null
+++ b/30/a5dbe120bdd7200f76ade6bbe7858010996599
@@ -0,0 +1,108 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 15E4C431FC2\r
+       for <notmuch@notmuchmail.org>; Tue, 19 Nov 2013 02:43:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Y3-vCLS7A0yK for <notmuch@notmuchmail.org>;\r
+       Tue, 19 Nov 2013 02:43:35 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 922E5431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 19 Nov 2013 02:43:35 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id D5B92100030;\r
+       Tue, 19 Nov 2013 12:43:25 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Tomi Valkeinen <tomi.valkeinen@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] fix compilation without emacs\r
+In-Reply-To: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi>\r
+References: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi>\r
+User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 19 Nov 2013 12:43:25 +0200\r
+Message-ID: <m2fvqsn036.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 19 Nov 2013 10:43:43 -0000\r
+\r
+On Tue, Nov 19 2013, Tomi Valkeinen <tomi.valkeinen@iki.fi> wrote:\r
+\r
+> If emacs is not installed, the following error is printed while\r
+> compiling:\r
+>\r
+> /bin/sh: 1: emacs: not found\r
+>\r
+> This patch fixes the build.\r
+\r
+Tervetuloa notmuch-muutosten ihmeelliseen maailmaan !\r
+\r
+> It might be better to exclude the whole emacs directory from build when\r
+> compiling without emacs, but that's a bigger change.\r
+\r
+Well, that change would probably break my build: I configure --without-emacs\r
+(to disable emacs build during normal build) but then I build emacs MUA\r
+separately (to just one notmuch.elc file)...\r
+\r
+You could look http://article.gmane.org/gmane.mail.notmuch.general/15837\r
+( id:"1377630047-27756-1-git-send-email-tomi.ollila@iki.fi" ) instead.\r
+\r
+If that works for you you can gain karma by reviewing it :D\r
+\r
+Tomi\r
+\r
+>\r
+> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@iki.fi>\r
+> ---\r
+>  emacs/Makefile.local | 2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/emacs/Makefile.local b/emacs/Makefile.local\r
+> index 92467a3..0fcf64c 100644\r
+> --- a/emacs/Makefile.local\r
+> +++ b/emacs/Makefile.local\r
+> @@ -24,6 +24,7 @@ emacs_images := \\r
+>  \r
+>  emacs_bytecode = $(emacs_sources:.el=.elc)\r
+>  \r
+> +ifeq ($(WITH_EMACS),1)\r
+>  # Because of defmacro's and defsubst's, we have to account for load\r
+>  # dependencies between Elisp files when byte compiling.  Otherwise,\r
+>  # the byte compiler may load an old .elc file when processing a\r
+> @@ -39,7 +40,6 @@ CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp\r
+>  %.elc: %.el $(global_deps)\r
+>      $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<\r
+>  \r
+> -ifeq ($(WITH_EMACS),1)\r
+>  ifeq ($(HAVE_EMACS),1)\r
+>  all: $(emacs_bytecode)\r
+>  endif\r
+> -- \r
+> 1.8.3.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r