From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 1 Dec 2009 14:42:44 +0000 (+0100)
Subject: Fix search to include 64 bit libs for --with-dbi option
X-Git-Tag: Release-5.0.0~230
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=285414de8dcebe26d388c09088469417247b9ab7;p=bacula%2Fbacula

Fix search to include 64 bit libs for --with-dbi option
---

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index 537ecdd1d8..ac27d5f034 100644
--- a/bacula/autoconf/bacula-macros/db.m4
+++ b/bacula/autoconf/bacula-macros/db.m4
@@ -55,6 +55,12 @@ AC_HELP_STRING([--with-dbi@<:@=DIR@:>@], [Include DBI support. DIR is the DBD ba
            else
               DRIVERDIR=$prefix/lib/dbd
            fi
+        elif test -d /usr/local/lib64/dbd; then
+           DRIVERDIR=/usr/local/lib64/dbd
+        elif test -d /usr/lib64/dbd; then
+           DRIVERDIR=/usr/lib64/dbd
+        elif test -d $prefix/lib64/dbd; then
+           DRIVERDIR=$prefix/lib64/dbd
         else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(Unable to find DBD drivers in standard locations)
@@ -84,6 +90,8 @@ AC_HELP_STRING([--with-dbi@<:@=DIR@:>@], [Include DBI support. DIR is the DBD ba
            else
               DRIVERDIR=$withval/lib/dbd
            fi
+        elif test -d $withval/lib64/dbd; then
+           DRIVERDIR=$withval/lib64/dbd
         else
            AC_MSG_RESULT(no)
            AC_MSG_ERROR(Invalid DBD driver directory $withval - unable to find DBD drivers under $withval)
diff --git a/bacula/configure b/bacula/configure
index 18a1caff90..a007d7bcc4 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -28657,6 +28657,12 @@ echo "$as_me: error: Unable to find dbi.h in standard locations" >&2;}
            else
               DRIVERDIR=$prefix/lib/dbd
            fi
+        elif test -d /usr/local/lib64/dbd; then
+           DRIVERDIR=/usr/local/lib64/dbd
+        elif test -d /usr/lib64/dbd; then
+           DRIVERDIR=/usr/lib64/dbd
+        elif test -d $prefix/lib64/dbd; then
+           DRIVERDIR=$prefix/lib64/dbd
         else
            { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
@@ -28692,6 +28698,8 @@ echo "$as_me: error: Invalid DBI directory $withval - unable to find dbi.h under
            else
               DRIVERDIR=$withval/lib/dbd
            fi
+        elif test -d $withval/lib64/dbd; then
+           DRIVERDIR=$withval/lib64/dbd
         else
            { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }