From: Michal Suchanek <hramrach@gmail.com>
Date: Fri, 7 Sep 2012 10:55:48 +0000 (+0200)
Subject: Fix configure to work with multiarch distributions.
X-Git-Tag: v2.23-rc1~705^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b4f1aeeccb985fcb97e1fcd1df6c050e169dfb3;p=thirdparty%2Futil-linux.git

Fix configure to work with multiarch distributions.
---

diff --git a/configure.ac b/configure.ac
index ead559c30c..2ae34ef8d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,30 @@ case $prefix:$localstatedir in
 esac
 AC_SUBST([localstatedir])
 
-libdirname=`basename "$libdir"`
+# sed_quote separator string
+# Prefixes occurences of sed special characters and separator with \ in string.
+# Suggested separators: , / (space) .
+# Note that the character is prefixed with \ so characters that get special meaning
+# will not work as separator. eg: n \ ? ( { ) }
+sed_quote()
+{
+        echo -n "$2" | sed -e 's/\n/\\n/' -e 's|\([][*.$|'"$1"']\)|\\\1|g'
+}
+
+# remove_dir_prefix prefix path
+# Remove leading path prefix.
+# Return directory name without leading slash (basename drop-in).
+# Handle prefix trailing slash.
+# // (double slash) is not handled.
+remove_dir_prefix(){
+    local prefix="$(sed_quote "," "$1")"
+    echo "$1" | grep -q '/$' || prefix="${prefix}/"
+    local re="^$(sed_quote "," "$prefix")"
+    echo "$2" | grep -q "$re" || re=/
+    echo "$2" | sed -e "s,${re},,"
+}
+
+libdirname=`remove_dir_prefix '${exec_prefix}' "$libdir"`
 AC_SUBST([libdirname])
 
 # The original default values of {bin,sbin,lib}dir