[PATCH] configure: really expand libdir_expanded

diff --git a/55/308f7c210f7a9ccd2ecd86660869d50da80fdb b/55/308f7c210f7a9ccd2ecd86660869d50da80fdb
new file mode 100644 (file)
index 0000000..b711e11
--- /dev/null
+++ b/55/308f7c210f7a9ccd2ecd86660869d50da80fdb
@@ -0,0 +1,85 @@
+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 olra.theworths.org (Postfix) with ESMTP id B3771431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Nov 2012 04:26:11 -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 gkqsnph+yOg9 for <notmuch@notmuchmail.org>;\r
+       Wed, 28 Nov 2012 04:26:11 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 46B07431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Nov 2012 04:26:11 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TdgiQ-0002hi-3X; Wed, 28 Nov 2012 08:26:10 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TdgiK-00089S-Ks; Wed, 28 Nov 2012 08:26:04 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] configure: really expand libdir_expanded\r
+Date: Wed, 28 Nov 2012 08:25:52 -0400\r
+Message-Id: <1354105552-31297-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Wed, 28 Nov 2012 12:26:11 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+It turns out that if people really use configure in autotools style and pass\r
+libdir containing '${prefix}/foo' then the ldconfig previously failed.\r
+\r
+This uses sed for portability (versus bash parameter expansion with\r
+substitution) and hopefully a bit more robustness than blindly\r
+parameter expanding the string.\r
+---\r
+ configure |    7 ++++++-\r
+ 1 file changed, 6 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/configure b/configure\r
+index ea8a1ad..460fcfc 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -236,7 +236,12 @@ done\r
+ # Makefile.config file later like most values), because we need to\r
+ # actually investigate this value compared to the ldconfig_paths value\r
+ # below.\r
+-libdir_expanded=${LIBDIR:-${PREFIX}/lib}\r
++if [ -z "$LIBDIR" ] ; then\r
++    libdir_expanded="${PREFIX}/lib"\r
++else\r
++    # very non-general variable expansion\r
++    libdir_expanded=`echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g"`\r
++fi\r
+ \r
+ cat <<EOF\r
+ Welcome to Notmuch, a system for indexing, searching and tagging your email.\r
+-- \r
+1.7.10.4\r
+\r