--- autoconf/bacula-macros/db.m4 2007-08-30 18:19:42.000000000 +0200 +++ autoconf/bacula-macros/db.m4.oden 2007-09-03 16:06:10.000000000 +0200 @@ -12,8 +12,7 @@ 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 @@ -21,20 +20,15 @@ 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/lib/mysql/libmysqlclient_r.a \ - -o -f /usr/lib/mysql/libmysqlclient_r.so; then - MYSQL_LIBDIR=/usr/lib/mysql else - MYSQL_LIBDIR=/usr/lib + MYSQL_LIBDIR=/usr/lib/mysql fi MYSQL_BINDIR=/usr/bin elif test -f /usr/include/mysql.h; then MYSQL_INCDIR=/usr/include - if test -f /usr/lib64/libmysqlclient_r.a \ - -o -f /usr/lib64/libmysqlclient_r.so; then + if test -f /usr/lib64/libmysqlclient.a; then MYSQL_LIBDIR=/usr/lib64 else MYSQL_LIBDIR=/usr/lib @@ -42,8 +36,7 @@ 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 @@ -51,8 +44,7 @@ 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 @@ -65,21 +57,19 @@ 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 else MYSQL_LIBDIR=$withval/lib/mysql # Solaris ... - if test -f $withval/lib/libmysqlclient_r.so; then + if test -f $withval/lib/libmysqlclient.so; then MYSQL_LIBDIR=$withval/lib fi fi 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 @@ -91,13 +81,13 @@ 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) @@ -189,7 +179,6 @@ 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) @@ -274,7 +263,6 @@ 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) @@ -356,7 +344,6 @@ 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) @@ -455,8 +442,6 @@ 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