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