[pkg-bacula-commits] [bacula] 17/17: refreshed debian/patches/fix-mysql-libdir.patch

[Carsten Leonhardt]

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

leo pushed a commit to branch experimental
in repository bacula.

commit a6e58e1d4c298eb3ad37c8be1f0c9aa18597805b
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Dec 8 15:30:22 2015 +0100

    refreshed debian/patches/fix-mysql-libdir.patch
---
 debian/patches/fix-mysql-libdir.patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/patches/fix-mysql-libdir.patch b/debian/patches/fix-mysql-libdir.patch
index 2228205..d7c75a8 100644
--- a/debian/patches/fix-mysql-libdir.patch
+++ b/debian/patches/fix-mysql-libdir.patch
@@ -4,10 +4,10 @@ Description: fix detection of mysql libdir
  GNU/kFreeBSD and GNU/Hurd.
 Author: Carsten Leonhardt <leo at debian.org>
 Bug: http://bugs.bacula.org/view.php?id=2156
-Last-Update: 2015-08-18
+Last-Update: 2015-12-08
 --- a/autoconf/bacula-macros/db.m4
 +++ b/autoconf/bacula-macros/db.m4
-@@ -340,19 +340,20 @@
+@@ -344,20 +344,20 @@
  #
  # This code is very broken on older systems
  #
@@ -19,11 +19,9 @@ Last-Update: 2015-08-18
 -#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
 -#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
 -#              else
--#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
+-#                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r | sed -e 's/.*-L//' -e 's/ .*//'`
 -#                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
 -#              fi
--#           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
--           if test -f /usr/local/mysql/include/mysql/mysql.h; then
 +           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
 +           if test "x${MYSQL_CONFIG}" != x; then
 +              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
@@ -32,12 +30,13 @@ Last-Update: 2015-08-18
 +                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
 +                 MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
 +              else
-+                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
++                 MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs_r | sed -e 's/.*-L//' -e 's/ .*//'`
 +                 MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
 +              fi
+ #           fi
+ #           if [ "x${MYSQL_LIB}" = x -o "x${MYSQL_INCDIR}" = x ]; then
+-           if test -f /usr/local/mysql/include/mysql/mysql.h; then
 +           elif test -f /usr/local/mysql/include/mysql/mysql.h; then
-+# end of "very broken code on older systems"
-+#           if 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

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