SOURCES: bacula-mysql.patch - fix

[arekm]

Author: arekm                        Date: Sat Nov 24 18:04:02 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix

---- Files affected:
SOURCES:
   bacula-mysql.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/bacula-mysql.patch
diff -u SOURCES/bacula-mysql.patch:1.2 SOURCES/bacula-mysql.patch:1.3
--- SOURCES/bacula-mysql.patch:1.2	Sat Nov 24 18:57:55 2007
+++ SOURCES/bacula-mysql.patch	Sat Nov 24 19:03:57 2007
@@ -1,6 +1,6 @@
 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:53:10.171719209 +0100
++++ bacula-2.2.6/autoconf/bacula-macros/db.m4	2007-11-24 18:59:45.582166513 +0100
 @@ -21,12 +21,9 @@
                     MYSQL_BINDIR=/usr/local/mysql/bin
             elif test -f /usr/include/mysql/mysql.h; then
@@ -17,16 +17,16 @@
                     else
                             MYSQL_LIBDIR=/usr/lib
                     fi
-@@ -97,8 +94,10 @@
+@@ -97,7 +94,11 @@
         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.so; then
-+	SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so
-+    else
++    if test -f $MYSQL_LIBDIR/libmysqlclient_r.a; then
 +	SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
++    else
++	SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.so
++    fi
+ 
      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.2&r2=1.3&f=u