Apply Carsten's multiarch patch fixes bug #2437

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index 4e9007de6275e4f1a67fb14b86ca61ad68ad1c88..988c737a8b998cfc184df73e8f8c8a354a6180af 100644 (file)
--- 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 81b27b237b02a32bcb301226980c468b3cd3691b..81d4efa80a46114903defcd61d2f24ef1bb815bd 100644 (file)
--- 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 ------------------------------------------------------