From 802b973e96865968e8b19db25cf08d08cf6f3626 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 1 Dec 2009 15:58:45 +0100 Subject: [PATCH] Fix include MySQL libs to use shared object. Fixes bug #1427 --- bacula/autoconf/bacula-macros/db.m4 | 6 +++++- bacula/configure | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index ac27d5f034..da18207543 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -420,7 +420,11 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My AC_DEFINE(HAVE_THREAD_SAFE_MYSQL) fi SQL_BINDIR=$MYSQL_BINDIR - SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a + if test -f $MYSQL_LIBDIR/libmysqlclient_r.so; then + SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so + else + SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a + fi AC_DEFINE(HAVE_MYSQL) AC_MSG_RESULT(yes) diff --git a/bacula/configure b/bacula/configure index a007d7bcc4..9ff994a1bb 100755 --- a/bacula/configure +++ b/bacula/configure @@ -28268,7 +28268,11 @@ _ACEOF fi SQL_BINDIR=$MYSQL_BINDIR - SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a + if test -f $MYSQL_LIBDIR/libmysqlclient_r.so; then + SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so + else + SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a + fi cat >>confdefs.h <<\_ACEOF #define HAVE_MYSQL 1 -- 2.39.5