[pkg-bacula-commits] [bacula] 03/04: fix detection of mysql libdir, especially needed on GNU/kFreeBSD and probably on GNU/Hurd

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit 6fce0ae5a150dde3cc1ccd2f16cb96e0e05b4063
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Aug 18 22:44:39 2015 +0200

    fix detection of mysql libdir, especially needed on GNU/kFreeBSD and
    probably on GNU/Hurd
---
 debian/patches/fix-mysql-libdir.patch | 43 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/fix-mysql-libdir.patch b/debian/patches/fix-mysql-libdir.patch
new file mode 100644
index 0000000..2228205
--- /dev/null
+++ b/debian/patches/fix-mysql-libdir.patch
@@ -0,0 +1,43 @@
+Description: fix detection of mysql libdir
+ To support "older systems" the author disabled modern code to detect
+ where mysql libs should be found. We enable that to support
+ 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
+--- a/autoconf/bacula-macros/db.m4
++++ b/autoconf/bacula-macros/db.m4
+@@ -340,19 +340,20 @@
+ #
+ # This code is very broken on older systems
+ #
+-#           MYSQL_CONFIG=`which mysql_config 2>/dev/null`
+-#           if test "x${MYSQL_CONFIG}" != x; then
+-#              MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
+-#              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
+-#              if test $? = 0 ; then
+-#                 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_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%/*}"
++              ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
++              if test $? = 0 ; then
++                 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_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
++              fi
++           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
diff --git a/debian/patches/series b/debian/patches/series
index 1e01185..2f31ea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ fix-sql-bindir
 switch-nonfree-sha1-to-openssl.patch
 fix-mysql55-sql-syntax.patch
 remove-upstream-autoconf-log.patch
+fix-mysql-libdir.patch
 fix-libbaccats-rpath.patch
 fix-scriptdir-examples-devices.patch
 ppc64el-libtoolize.patch

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