From: David Bremner <bremner@debian.org>
Date: Wed, 28 Nov 2012 12:25:52 +0000 (-0400)
Subject: configure: really expand libdir_expanded
X-Git-Tag: 0.15_rc1~145
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c6b2d5071fb71035d5d8cfd24b3bb843840eb9b;p=notmuch.git

configure: really expand libdir_expanded

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.
---

diff --git a/configure b/configure
index ea8a1ad5..460fcfcf 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 <<EOF
 Welcome to Notmuch, a system for indexing, searching and tagging your email.