From c56edd8eef092a1d7cf65b74177cb62d8af9a435 Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Thu, 29 Dec 2016 14:56:19 +0000
Subject: [PATCH] Fixed automatic detection of ARCHLIB=lib64 on non-Debian
 machines having dpkg installed.

git-svn-id: http://voip.null.ro/svn/yate@6157 acf43c95-373e-0410-b603-e72c3f656dc1
---
 configure.ac | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7be06c54..fcc91d8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,15 +39,21 @@ archname=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`
 test -z "$archname" && archname=`uname -m 2>/dev/null`
 test -z "$archname" && archname=`arch -k 2>/dev/null`
 test -z "$archname" && archname=`arch 2>/dev/null`
-ARCHLIB="lib"
+ARCHLIB=""
 case "x$archname" in
     x*-*-*)
-	ARCHLIB="lib/$archname"
-	;;
-    x*x86_64*|xppc64*|xaarch64)
-	ARCHLIB=lib64
+	test -d "/usr/lib/$archname" && ARCHLIB="lib/$archname"
 	;;
 esac
+if [[ -z "$ARCHLIB" ]]; then
+    case "x$archname" in
+	x*x86_64*|xppc64*|xaarch64)
+	    ARCHLIB="lib64"
+	    ;;
+	*)
+	    ARCHLIB="lib"
+    esac
+fi
 case "x$ac_cv_use_archlib" in
     x|xyes)
 	;;