From e0e5fe96efa4dee27e193d2af0ae02a5300fed5f Mon Sep 17 00:00:00 2001
From: Carsten Leonhardt <leo@debian.org>
Date: Sun, 3 Feb 2019 17:38:01 +0100
Subject: [PATCH] Apply Carsten's multiarch patch fixes bug #2437

---
 bacula/autoconf/bacula-macros/db.m4 | 4 +++-
 bacula/autoconf/configure.in        | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index 4e9007de6..988c737a8 100644
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -763,7 +763,9 @@ AC_HELP_STRING([--with-sqlite3@<:@=DIR@:>@], [Include SQLite3 support. DIR is th
            SQLITE_BINDIR=/usr/local/bin
         elif test -f /usr/include/sqlite3.h; then
            SQLITE_INCDIR=/usr/include
-           if test -d /usr/lib64; then
+           if test -n $multiarch -a -d /usr/lib/$multiarch; then
+              SQLITE_LIBDIR=/usr/lib/$multiarch
+           elif test -d /usr/lib64; then
               SQLITE_LIBDIR=/usr/lib64
            else
               SQLITE_LIBDIR=/usr/lib
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 81b27b237..81d4efa80 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -121,6 +121,13 @@ if test ! -e $CXX; then
    AC_MSG_ERROR(Unable to find C++ compiler)
 fi
 
+dnl -------------------------------------------------------
+dnl Check for multiarch.
+dnl ------------------------------------------------------
+AC_MSG_CHECKING(for multiarch system)
+multiarch=`$CC $CFLAGS -print-multiarch 2>/dev/null`
+AC_MSG_RESULT($multiarch)
+
 dnl -------------------------------------------------------
 dnl Check for programs.
 dnl ------------------------------------------------------
-- 
2.47.3