diff -p -up bacula-3.0.0/autoconf/bacula-macros/db.m4.shared_backend bacula-3.0.0/autoconf/bacula-macros/db.m4
--- bacula-3.0.0/autoconf/bacula-macros/db.m4.shared_backend 2009-03-27 06:58:04.000000000 -0300
+++ bacula-3.0.0/autoconf/bacula-macros/db.m4 2009-04-09 18:09:35.000000000 -0300
@@ -322,8 +322,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
if test "$withval" = "yes"; then
if test -f /usr/local/mysql/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/mysql/include/mysql
- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
+ if test -f /usr/local/mysql/lib64/mysql/libmysqlclient.a; then
MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
@@ -331,15 +330,8 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
MYSQL_BINDIR=/usr/local/mysql/bin
elif test -f /usr/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/include/mysql
- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
+ if test -f /usr/lib64/mysql/libmysqlclient.a; then
MYSQL_LIBDIR=/usr/lib64/mysql
- elif test -f /usr/lib64/libmysqlclient_r.a \
- -o -f /usr/lib64/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib64
- elif test -f /usr/lib/mysql/libmysqlclient_r.a \
- -o -f /usr/lib/mysql/libmysqlclient_r.so; then
- MYSQL_LIBDIR=/usr/lib/mysql
else
MYSQL_LIBDIR=/usr/lib
fi
@@ -355,8 +347,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
MYSQL_BINDIR=/usr/bin
elif test -f /usr/local/include/mysql/mysql.h; then
MYSQL_INCDIR=/usr/local/include/mysql
- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
+ if test -f /usr/local/lib64/mysql/libmysqlclient.a; then
MYSQL_LIBDIR=/usr/local/lib64/mysql
else
MYSQL_LIBDIR=/usr/local/lib/mysql
@@ -364,8 +355,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
MYSQL_BINDIR=/usr/local/bin
elif test -f /usr/local/include/mysql.h; then
MYSQL_INCDIR=/usr/local/include
- if test -f /usr/local/lib64/libmysqlclient_r.a \
- -o -f /usr/local/lib64/libmysqlclient_r.so; then
+ if test -f /usr/local/lib64/libmysqlclient.a; then
MYSQL_LIBDIR=/usr/local/lib64
else
MYSQL_LIBDIR=/usr/local/lib
@@ -378,14 +368,9 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
else
if test -f $withval/include/mysql/mysql.h; then
MYSQL_INCDIR=$withval/include/mysql
- if test -f $withval/lib64/mysql/libmysqlclient_r.a \
- -o -f $withval/lib64/mysql/libmysqlclient_r.so; then
+ if test -f $withval/lib64/mysql/libmysqlclient.a; then
MYSQL_LIBDIR=$withval/lib64/mysql
- elif test -f $withval/lib64/libmysqlclient_r.a \
- -o -f $withval/lib64/libmysqlclient_r.so; then
- MYSQL_LIBDIR=$withval/lib64
- elif test -f $withval/lib/libmysqlclient_r.a \
- -o -f $withval/lib/libmysqlclient_r.so; then
+ elif test -f $withval/lib/libmysqlclient.so; then
MYSQL_LIBDIR=$withval/lib
else
MYSQL_LIBDIR=$withval/lib/mysql
@@ -393,8 +378,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
MYSQL_BINDIR=$withval/bin
elif test -f $withval/include/mysql.h; then
MYSQL_INCDIR=$withval/include
- if test -f $withval/lib64/libmysqlclient_r.a \
- -o -f $withval/lib64/libmysqlclient_r.so; then
+ if test -f "$withval/lib64/libmysqlclient.a"; then
MYSQL_LIBDIR=$withval/lib64
else
MYSQL_LIBDIR=$withval/lib
@@ -406,13 +390,13 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
fi
fi
SQL_INCLUDE=-I$MYSQL_INCDIR
- if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
- -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
+ if test -f "$MYSQL_LIBDIR/libmysqlclient_r.a"; then
SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
+ else
+ SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
fi
SQL_BINDIR=$MYSQL_BINDIR
- SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
AC_DEFINE(HAVE_MYSQL)
AC_MSG_RESULT(yes)
@@ -501,7 +485,6 @@ AC_HELP_STRING([--with-embedded-mysql@<:
SQL_INCLUDE=-I$MYSQL_INCDIR
SQL_LFLAGS="-L$MYSQL_LIBDIR -lmysqld -lz -lm -lcrypt"
SQL_BINDIR=$MYSQL_BINDIR
- SQL_LIB=$MYSQL_LIBDIR/libmysqld.a
AC_DEFINE(HAVE_MYSQL)
AC_DEFINE(HAVE_EMBEDDED_MYSQL)
@@ -583,7 +566,6 @@ AC_HELP_STRING([--with-sqlite@<:@=DIR@:>
SQL_INCLUDE=-I$SQLITE_INCDIR
SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite"
SQL_BINDIR=$SQLITE_BINDIR
- SQL_LIB=$SQLITE_LIBDIR/libsqlite.a
AC_DEFINE(HAVE_SQLITE)
AC_MSG_RESULT(yes)
@@ -662,7 +644,6 @@ AC_HELP_STRING([--with-sqlite3@<:@=DIR@:
SQL_INCLUDE=-I$SQLITE_INCDIR
SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite3"
SQL_BINDIR=$SQLITE_BINDIR
- SQL_LIB=$SQLITE_LIBDIR/libsqlite3.a
AC_DEFINE(HAVE_SQLITE3)
AC_MSG_RESULT(yes)
@@ -760,8 +741,6 @@ AC_HELP_STRING([--with-postgresql@<:@=DI
SQL_INCLUDE=-I$POSTGRESQL_INCDIR
SQL_LFLAGS=$POSTGRESQL_LFLAGS
SQL_BINDIR=$POSTGRESQL_BINDIR
- SQL_LIB=$POSTGRESQL_LIBDIR/libpq.a
-
AC_DEFINE(HAVE_POSTGRESQL)
AC_MSG_RESULT(yes)
db_found=yes
