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

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