bacula-mysql.patch

   1 diff -ur bacula-2.2.6.org/autoconf/bacula-macros/db.m4 bacula-2.2.6/autoconf/bacula-macros/db.m4
   2 --- bacula-2.2.6.org/autoconf/bacula-macros/db.m4       2007-08-30 18:19:42.000000000 +0200
   3 +++ bacula-2.2.6/autoconf/bacula-macros/db.m4   2007-11-24 18:59:45.582166513 +0100
   4 @@ -21,12 +21,9 @@
   5                     MYSQL_BINDIR=/usr/local/mysql/bin
   6             elif test -f /usr/include/mysql/mysql.h; then
   7                     MYSQL_INCDIR=/usr/include/mysql
   8 -                   if test -f /usr/lib64/mysql/libmysqlclient_r.a \
   9 -                        -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
  10 -                           MYSQL_LIBDIR=/usr/lib64/mysql
  11 -                   elif test -f /usr/lib/mysql/libmysqlclient_r.a \
  12 -                          -o -f /usr/lib/mysql/libmysqlclient_r.so; then
  13 -                           MYSQL_LIBDIR=/usr/lib/mysql
  14 +                   if test -f /usr/lib64/libmysqlclient_r.a \
  15 +                        -o -f /usr/lib64/libmysqlclient_r.so; then
  16 +                           MYSQL_LIBDIR=/usr/lib64
  17                     else
  18                             MYSQL_LIBDIR=/usr/lib
  19                     fi
  20 @@ -97,7 +94,11 @@
  21         AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
  22      fi
  23      SQL_BINDIR=$MYSQL_BINDIR
  24 -    SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
  25 +    if test -f $MYSQL_LIBDIR/libmysqlclient_r.a; then
  26 +       SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
  27 +    else
  28 +       SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so
  29 +    fi
  30
  31      AC_DEFINE(HAVE_MYSQL)
  32      AC_MSG_RESULT(yes)