Mandriva (at least in cooker) puts mysql includes in /usr/include/mysql,
but libraries in /usr/lib64 (or /usr/lib), while configure expects them
on /usr/lib64/mysql.
This patch searches also in /usr/lib64 and /usr/lib
Patch against 2.2 branch
BTW, I don't understand how the batch_insert check works.
Apparently is triggered only if you have the static library, because
SQL_LIB is always set to libmysqlclient_r.a
My dev machine has only the dynamic .so libraries, so batch_insert is
always disabled.
Is this the expected behavior ? I bet I'm missing something, but can't
see what.
Cheers,
Ric
Index: bacula/configure
===================================================================
--- bacula/configure (revision 6888)
+++ bacula/configure (working copy)
@@ -17440,6 +17440,9 @@
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
@@ -17487,12 +17490,14 @@
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
Index: bacula/autoconf/bacula-macros/db.m4
===================================================================
--- bacula/autoconf/bacula-macros/db.m4 (revision 6888)
+++ bacula/autoconf/bacula-macros/db.m4 (working copy)
@@ -24,6 +24,9 @@
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
@@ -68,12 +71,14 @@
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
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Bacula-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bacula-devel
