Author: arekm Date: Sat Nov 24 17:58:00 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- properly find mysql
---- Files affected:
SOURCES:
bacula-mysql.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/bacula-mysql.patch
diff -u SOURCES/bacula-mysql.patch:1.1 SOURCES/bacula-mysql.patch:1.2
--- SOURCES/bacula-mysql.patch:1.1 Sat Nov 24 18:37:49 2007
+++ SOURCES/bacula-mysql.patch Sat Nov 24 18:57:55 2007
@@ -1,17 +1,32 @@
-diff -urN bacula-2.2.6.org/autoconf/bacula-macros/db.m4
bacula-2.2.6/autoconf/bacula-macros/db.m4
+diff -ur bacula-2.2.6.org/autoconf/bacula-macros/db.m4
bacula-2.2.6/autoconf/bacula-macros/db.m4
--- bacula-2.2.6.org/autoconf/bacula-macros/db.m4 2007-08-30
18:19:42.000000000 +0200
-+++ bacula-2.2.6/autoconf/bacula-macros/db.m4 2007-11-24 18:15:52.629157615
+0100
-@@ -97,8 +97,11 @@
++++ bacula-2.2.6/autoconf/bacula-macros/db.m4 2007-11-24 18:53:10.171719209
+0100
+@@ -21,12 +21,9 @@
+ 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
+- 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
++ if test -f /usr/lib64/libmysqlclient_r.a \
++ -o -f /usr/lib64/libmysqlclient_r.so; then
++ MYSQL_LIBDIR=/usr/lib64
+ else
+ MYSQL_LIBDIR=/usr/lib
+ fi
+@@ -97,8 +94,10 @@
AC_DEFINE(HAVE_THREAD_SAFE_MYSQL)
fi
SQL_BINDIR=$MYSQL_BINDIR
- SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
-
-+ if test -f $MYSQL_LIBDIR/libmysqlclient_r.a; then
-+ SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
-+ else
++ if test -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
+ SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so
-+ fi
++ else
++ SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
AC_DEFINE(HAVE_MYSQL)
AC_MSG_RESULT(yes)
db_found=yes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bacula-mysql.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
