From 48da64a735a2e2b12d1857f882faf272b497d626 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Fri, 14 Nov 2008 08:19:28 +0000 Subject: [PATCH] ebl Apply Riccardo's patch to compile bacula+mysql on mandriva git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8047 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/bacula-macros/db.m4 | 13 +++++++++---- bacula/autoconf/configure.in | 1 + bacula/configure | 13 +++++++++---- bacula/technotes-2.5 | 2 ++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index 5d2c414224..58f3ca6393 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -318,6 +318,9 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My if test -f /usr/lib64/mysql/libmysqlclient_r.a \ -o -f /usr/lib64/mysql/libmysqlclient_r.so; 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 @@ -362,12 +365,14 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My if test -f $withval/lib64/mysql/libmysqlclient_r.a \ -o -f $withval/lib64/mysql/libmysqlclient_r.so; 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 + MYSQL_LIBDIR=$withval/lib else MYSQL_LIBDIR=$withval/lib/mysql - # Solaris ... - if test -f $withval/lib/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib - fi fi MYSQL_BINDIR=$withval/bin elif test -f $withval/include/mysql.h; then diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 02ce81690a..2a9b5fb4bf 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -2730,6 +2730,7 @@ AC_OUTPUT([autoconf/Make.common \ src/findlib/Makefile \ src/tools/Makefile \ src/plugins/fd/Makefile \ + src/plugins/dir/Makefile \ po/Makefile.in \ updatedb/update_mysql_tables_10_to_11 \ updatedb/update_sqlite3_tables_10_to_11 \ diff --git a/bacula/configure b/bacula/configure index 1916b30fab..250ae1e9ba 100755 --- a/bacula/configure +++ b/bacula/configure @@ -27971,6 +27971,9 @@ if test "${with_mysql+set}" = set; then if test -f /usr/lib64/mysql/libmysqlclient_r.a \ -o -f /usr/lib64/mysql/libmysqlclient_r.so; 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 @@ -28018,12 +28021,14 @@ echo "$as_me: error: Unable to find mysql.h in standard locations" >&2;} if test -f $withval/lib64/mysql/libmysqlclient_r.a \ -o -f $withval/lib64/mysql/libmysqlclient_r.so; 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 + MYSQL_LIBDIR=$withval/lib else MYSQL_LIBDIR=$withval/lib/mysql - # Solaris ... - if test -f $withval/lib/libmysqlclient_r.so; then - MYSQL_LIBDIR=$withval/lib - fi fi MYSQL_BINDIR=$withval/bin elif test -f $withval/include/mysql.h; then diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 70df1e0bd2..9201c7845a 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,8 @@ filepattern (restore with regex in bsr) mixed priorities General: +14Nov08 +ebl Apply Riccardo's patch to compile bacula+mysql on mandriva 13Nov08 ebl Add more variables accessible through the director plugin interface. -- 2.39.5