From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 5 Feb 2014 20:45:36 +0000 (-0500)
Subject: configure: support biarch builds with --multiarch=lib64
X-Git-Tag: v1.42.9.wc1~67
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d7fa4103f5dec96d18998478e8833e7215030584;p=tools%2Fe2fsprogs.git

configure: support biarch builds with --multiarch=lib64

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/configure b/configure
index 965fe6b..19e8d82 100755
--- a/configure
+++ b/configure
@@ -11379,8 +11379,13 @@ fi
 
 # Check whether --with-multiarch was given.
 if test "${with_multiarch+set}" = set; then :
-  withval=$with_multiarch; libdir=$libdir/$withval
-root_libdir=$root_libdir/$withval
+  withval=$with_multiarch; if test "$withval" = "lib64"; then
+    libdir=/usr/lib64
+    root_libdir=/lib64
+else
+    libdir=$libdir/$withval
+    root_libdir=$root_libdir/$withval
+fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can link with -static" >&5
diff --git a/configure.in b/configure.in
index 44dc3ad..fffab7a 100644
--- a/configure.in
+++ b/configure.in
@@ -1225,8 +1225,13 @@ dnl Allow specification of the multiarch arch
 dnl
 AC_ARG_WITH([multiarch],
 [  --with-multiarch=ARCH specify the multiarch triplet],
-libdir=$libdir/$withval
-root_libdir=$root_libdir/$withval
+if test "$withval" = "lib64"; then
+    libdir=/usr/lib64
+    root_libdir=/lib64
+else
+    libdir=$libdir/$withval
+    root_libdir=$root_libdir/$withval
+fi
 )dnl
 dnl
 dnl See if -static works.  This could fail if the linker does not