From: David Bremner <david@tethera.net>
Date: Sun, 6 Dec 2015 16:10:20 +0000 (+2000)
Subject: [PATCH] configure: drop use of "pkg-config emacs"
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e29fb2d585da5102eafb9f7e26f7057b0b6e7aa1;p=notmuch-archives.git

[PATCH] configure: drop use of "pkg-config emacs"
---

diff --git a/55/62a7be4595de153dac75607e0aecea69c6217b b/55/62a7be4595de153dac75607e0aecea69c6217b
new file mode 100644
index 000000000..d1d51a5ff
--- /dev/null
+++ b/55/62a7be4595de153dac75607e0aecea69c6217b
@@ -0,0 +1,88 @@
+Return-Path: <bremner@tethera.net>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+ by arlo.cworth.org (Postfix) with ESMTP id 7ECFE6DE12E8
+ for <notmuch@notmuchmail.org>; Sun,  6 Dec 2015 08:10:28 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at cworth.org
+X-Spam-Flag: NO
+X-Spam-Score: -0.32
+X-Spam-Level: 
+X-Spam-Status: No, score=-0.32 tagged_above=-999 required=5 tests=[AWL=0.231, 
+ RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled
+Received: from arlo.cworth.org ([127.0.0.1])
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id uebp_GaLZK-2 for <notmuch@notmuchmail.org>;
+ Sun,  6 Dec 2015 08:10:26 -0800 (PST)
+X-Greylist: delayed 334 seconds by postgrey-1.35 at arlo;
+ Sun, 06 Dec 2015 08:10:26 PST
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])
+ by arlo.cworth.org (Postfix) with ESMTPS id 1FC856DE0B29
+ for <notmuch@notmuchmail.org>; Sun,  6 Dec 2015 08:10:26 -0800 (PST)
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)
+ (envelope-from <bremner@tethera.net>)
+ id 1a5btF-0001yT-DH; Sun, 06 Dec 2015 11:10:21 -0500
+Received: (nullmailer pid 17836 invoked by uid 1000);
+ Sun, 06 Dec 2015 16:10:22 -0000
+From: David Bremner <david@tethera.net>
+To: Tomi Ollila <tomi.ollila@iki.fi>, David Bremner <david@tethera.net>,
+ Andrew Burgess <andrew.burgess@embecosm.com>, notmuch@notmuchmail.org
+Subject: [PATCH] configure: drop use of "pkg-config emacs"
+Date: Sun,  6 Dec 2015 12:10:20 -0400
+Message-Id: <1449418220-17790-1-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 2.6.2
+In-Reply-To: <m2k2p2rwth.fsf@guru.guru-group.fi>
+References: <m2k2p2rwth.fsf@guru.guru-group.fi>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.20
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+ <notmuch.notmuchmail.org>
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sun, 06 Dec 2015 16:10:28 -0000
+
+This does not play well with --prefix. As Tomi notes in
+id:m2k2p2rwth.fsf@guru.guru-group.fi, people still have the option of e.g.
+
+% ./configure ---emacslispdir=`pkg-config emacs --variable sitepkglispdir`
+---
+oops, I missed a second use of pkg-config emacs
+
+configure | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index 440d678..abd28da 100755
+--- a/configure
++++ b/configure
+@@ -472,19 +472,11 @@ else
+ fi
+ 
+ if [ -z "${EMACSLISPDIR}" ]; then
+-    if pkg-config --exists emacs; then
+-	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
+-    else
+-	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
+-    fi
++    EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
+ fi
+ 
+ if [ -z "${EMACSETCDIR}" ]; then
+-    if pkg-config --exists emacs; then
+-	EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir)
+-    else
+-	EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+-    fi
++    EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+ fi
+ 
+ printf "Checking if emacs is available... "
+-- 
+2.6.2
+