Fix include MySQL libs to use shared object. Fixes bug #1427

diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4
index ac27d5f034853ced29e6eb8de8a3f9b92edc85cf..da18207543400e871fb610500bc53e6847f3f436 100644 (file)
--- 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 a007d7bcc4fbb6e3e771ce97574c11ee733e81a1..9ff994a1bbce3096018ae5aeb400a5043475b7f1 100755 (executable)
--- 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