From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id ECA73431FC9 for ; Mon, 18 Nov 2013 21:11:32 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.699 X-Spam-Level: X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 RwS6wKswZwdb for ; Mon, 18 Nov 2013 21:11:24 -0800 (PST) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id D611A431FC2 for ; Mon, 18 Nov 2013 21:11:23 -0800 (PST) Received: by mail-la0-f50.google.com with SMTP id el20so5591090lab.23 for ; Mon, 18 Nov 2013 21:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=1hBHHAktJHZVr1tklMbsBvWjmVGUgQ9HNTZY/0+OuOE=; b=x/CxDRbG59Rya86Pyn7D+5rk34N3/iGcuozSOiJ2U0gOjoFCo1KO93nSyIAcHfspyn ONupRD4cdGNdttbIUKasss/Tbshs5kfWbGQyAEL6J31QyjglEhI06WokfKc6EX9p32IL hNlcjBCiVOSY6sgM1I61c1ZQhq6kRXT/k13JqEUDWocirH5wDjLMqzzhYxd2Bey+gNjk mEVUDHn47vWmFipGCuKXtPUEUGnuUsMc82p0rixF5dfRa3/k8FvWZZjUQTzXnXcXC/3K RR2krYiU3ooZj7mGawMjs/PrWx+75xa7Y/Mz7QaZozyrahA6+sEgaXhcVbJc3/dY97wo rl8A== X-Received: by 10.112.169.103 with SMTP id ad7mr10498lbc.33.1384837878631; Mon, 18 Nov 2013 21:11:18 -0800 (PST) Received: from deskari.tieu.ti.com (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPSA id m5sm11942484laj.4.2013.11.18.21.11.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Nov 2013 21:11:17 -0800 (PST) Sender: Tomi Valkeinen From: Tomi Valkeinen To: notmuch@notmuchmail.org Subject: [PATCH 1/2] fix compilation without emacs Date: Tue, 19 Nov 2013 07:10:30 +0200 Message-Id: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi> X-Mailer: git-send-email 1.8.3.2 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 05:11:33 -0000 If emacs is not installed, the following error is printed while compiling: /bin/sh: 1: emacs: not found This patch fixes the build. It might be better to exclude the whole emacs directory from build when compiling without emacs, but that's a bigger change. 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