[PATCH 1/2] fix compilation without emacs

diff --git a/3e/e60dcd46909465bf94c18dec5eca4428ad3d9c b/3e/e60dcd46909465bf94c18dec5eca4428ad3d9c
new file mode 100644 (file)
index 0000000..3b1b05c
--- /dev/null
+++ b/3e/e60dcd46909465bf94c18dec5eca4428ad3d9c
@@ -0,0 +1,100 @@
+Return-Path: <tomi.valkeinen@gmail.com>\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 ECA73431FC9\r
+       for <notmuch@notmuchmail.org>; Mon, 18 Nov 2013 21:11:32 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 RwS6wKswZwdb for <notmuch@notmuchmail.org>;\r
+       Mon, 18 Nov 2013 21:11:24 -0800 (PST)\r
+Received: from mail-la0-f50.google.com (mail-la0-f50.google.com\r
+       [209.85.215.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D611A431FC2\r
+       for <notmuch@notmuchmail.org>; Mon, 18 Nov 2013 21:11:23 -0800 (PST)\r
+Received: by mail-la0-f50.google.com with SMTP id el20so5591090lab.23\r
+       for <notmuch@notmuchmail.org>; Mon, 18 Nov 2013 21:11:19 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=sender:from:to:cc:subject:date:message-id;\r
+       bh=1hBHHAktJHZVr1tklMbsBvWjmVGUgQ9HNTZY/0+OuOE=;\r
+       b=x/CxDRbG59Rya86Pyn7D+5rk34N3/iGcuozSOiJ2U0gOjoFCo1KO93nSyIAcHfspyn\r
+       ONupRD4cdGNdttbIUKasss/Tbshs5kfWbGQyAEL6J31QyjglEhI06WokfKc6EX9p32IL\r
+       hNlcjBCiVOSY6sgM1I61c1ZQhq6kRXT/k13JqEUDWocirH5wDjLMqzzhYxd2Bey+gNjk\r
+       mEVUDHn47vWmFipGCuKXtPUEUGnuUsMc82p0rixF5dfRa3/k8FvWZZjUQTzXnXcXC/3K\r
+       RR2krYiU3ooZj7mGawMjs/PrWx+75xa7Y/Mz7QaZozyrahA6+sEgaXhcVbJc3/dY97wo\r
+       rl8A==\r
+X-Received: by 10.112.169.103 with SMTP id ad7mr10498lbc.33.1384837878631;\r
+       Mon, 18 Nov 2013 21:11:18 -0800 (PST)\r
+Received: from deskari.tieu.ti.com (a91-156-160-115.elisa-laajakaista.fi.\r
+       [91.156.160.115])\r
+       by mx.google.com with ESMTPSA id m5sm11942484laj.4.2013.11.18.21.11.16\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+       Mon, 18 Nov 2013 21:11:17 -0800 (PST)\r
+Sender: Tomi Valkeinen <tomi.valkeinen@gmail.com>\r
+From: Tomi Valkeinen <tomi.valkeinen@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] fix compilation without emacs\r
+Date: Tue, 19 Nov 2013 07:10:30 +0200\r
+Message-Id: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi>\r
+X-Mailer: git-send-email 1.8.3.2\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 05:11:33 -0000\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
+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
+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