[pkg-bacula-commits] [bacula] 05/27: Removed debian/patches/fix-mysql-autoconf.patch, fixed in upstream 5.2.7

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit c135c4234b1d0fb2c98e9ed39dab4a4fb96e5c69
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 20 00:10:15 2015 +0200

    Removed debian/patches/fix-mysql-autoconf.patch, fixed in upstream 5.2.7
---
 debian/patches/fix-mysql-autoconf.patch | 79 ---------------------------------
 1 file changed, 79 deletions(-)

diff --git a/debian/patches/fix-mysql-autoconf.patch b/debian/patches/fix-mysql-autoconf.patch
deleted file mode 100644
index 8b81ecf..0000000
--- a/debian/patches/fix-mysql-autoconf.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Try using mysql_config to get MySQL compiler and linker flags
- The current hardcoded search path for MySQL headers and binaries
- does not work for multi-arch installations.
-Bug-Debian: 672765
-Bug: http://bugs.bacula.org/view.php?id=1829
-Author: Ben Hutchings <ben at decadent.org.uk>
-Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
-Reviewed-by: Luca Capello <luca at pca.it>
-Last-Update: 2012-06-02
-
---- a/autoconf/bacula-macros/db.m4
-+++ b/autoconf/bacula-macros/db.m4
-@@ -324,8 +324,16 @@ AC_ARG_WITH(mysql,
- AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files.]),
- [
-   if test "$withval" != "no"; then
-+        MYSQL_INCLUDE=
-+        MYSQL_LIBS=
-         if test "$withval" = "yes"; then
--           if test -f /usr/local/mysql/include/mysql/mysql.h; then
-+           MYSQL_CONFIG="$(which mysql_config 2>/dev/null)"
-+           if test -n "$MYSQL_CONFIG"; then
-+              MYSQL_INCLUDE="$(mysql_config --cflags)"
-+              MYSQL_LIBS="$(mysql_config --libs_r || mysql_config --libs)"
-+              DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}"
-+              MYSQL_BINDIR="$(dirname "$MYSQL_CONFIG")"
-+           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
-                    MYSQL_INCDIR=/usr/local/mysql/include/mysql
-                    if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
-                         -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
-@@ -410,18 +418,22 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
-               AC_MSG_ERROR(Invalid MySQL directory $withval - unable to find mysql.h under $withval)
-            fi
-         fi
--     MYSQL_INCLUDE=-I$MYSQL_INCDIR
--     if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
--          -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
--        if test x$use_libtool != xno; then
--           MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
--        else
--           MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-+     if test -z "${MYSQL_INCLUDE}"; then
-+        MYSQL_INCLUDE=-I$MYSQL_INCDIR
-+     fi
-+     if test -z "${MYSQL_LIBS}"; then
-+        if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
-+             -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
-+           if test x$use_libtool != xno; then
-+              MYSQL_LIBS="-R $MYSQL_LIBDIR -L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-+           else
-+              MYSQL_LIBS="-L$MYSQL_LIBDIR -lmysqlclient_r -lz"
-+           fi
-+           AC_DEFINE(HAVE_THREAD_SAFE_MYSQL, 1, [Set if Thread Safe MySQL can be checked using mysql_thread_safe])
-+           DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}"
-         fi
--        AC_DEFINE(HAVE_THREAD_SAFE_MYSQL, 1, [Set if Thread Safe MySQL can be checked using mysql_thread_safe])
--        DB_LIBS="${DB_LIBS} ${MYSQL_LIBS}"
-+        MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
-      fi
--     MYSQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a
- 
-      AC_DEFINE(HAVE_MYSQL, 1, [Set if you have an MySQL Database])
-      AC_MSG_RESULT(yes)
-@@ -443,12 +455,11 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My
-      if test "x$support_batch_insert" = "xyes"; then
-          dnl For mysql checking
-          saved_LDFLAGS="${LDFLAGS}"
--         LDFLAGS="${saved_LDFLAGS} -L$MYSQL_LIBDIR"
-          saved_LIBS="${LIBS}"
--         LIBS="${saved_LIBS} -lz"
-+         LIBS="${saved_LIBS} ${MYSQL_LIBS}"
- 
--         AC_CHECK_LIB(mysqlclient_r, mysql_thread_safe, AC_DEFINE(HAVE_MYSQL_THREAD_SAFE, 1, [Set if have mysql_thread_safe]))
--         if test "x$ac_cv_lib_mysqlclient_r_mysql_thread_safe" = "xyes"; then
-+         AC_CHECK_FUNC(mysql_thread_safe, AC_DEFINE(HAVE_MYSQL_THREAD_SAFE, 1, [Set if have mysql_thread_safe]))
-+         if test "x$ac_cv_func_mysql_thread_safe" = "xyes"; then
-              if test -z "${batch_insert_db_backends}"; then
-                  batch_insert_db_backends="MySQL"
-              else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git