[tango] 06/08: fix mysql detection

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit b06343bc0b6960ae4e56d9220a487203853504a7
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Oct 28 21:48:46 2016 +0200

    fix mysql detection
---
 debian/changelog                              |  1 +
 debian/patches/0005-fix-mysql-detection.patch | 43 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcdb2c5..ee4d31c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ tango (9.2.5~rc1-1~exp1) experimental; urgency=medium
   * d/patches
     - 0004-p922_1.patch (useless)
     - 0011-link-against-libmysqlclient-Closes-825081.patch (useless)
+    - 0005-fix-mysql-detection.patch (added)
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Fri, 28 Oct 2016 13:03:23 +0200
 
diff --git a/debian/patches/0005-fix-mysql-detection.patch b/debian/patches/0005-fix-mysql-detection.patch
new file mode 100644
index 0000000..c77af76
--- /dev/null
+++ b/debian/patches/0005-fix-mysql-detection.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Fri, 28 Oct 2016 21:47:05 +0200
+Subject: fix mysql detection
+
+---
+ configure.ac | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6f1e0cb..28ff0b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -302,11 +302,15 @@ if test "x$enable_mariadb" != "xyes" ; then
+   		 		AC_MSG_WARN(No libmysqlclient libs found)
+ 				enable_dbserver=no
+ 			fi
+-	
++
++		DB_LDFLAGS=${MYSQLCLIENT_LDFLAGS}
++		DB_LDLIBS=${MYSQLCLIENT_LIBS}
++		DB_CFLAGS=${MYSQLCLIENT_CFLAGS}
++
+ 		AC_PATH_PROG(MYSQL, mysql, nocommand)
+ 		MYSQL_VERSION=not_found
+ 	
+-		if test "$MYSQL" != nocommand; then
++		if test "x$MYSQL" != "xnocommand"; then
+ 			mysql_AC_HAVE_MYSQL_VERSION($MYSQL,5,5)
+ 			if test "x$ac_cv_mysql_version_5_5" = "xno"; then
+ 			 	AC_MSG_WARN([Not supported mysql release. Should be 5.5.x or above. Please update !],-1)
+@@ -335,11 +339,8 @@ if test "x$enable_mariadb" != "xyes" ; then
+ 			])
+ 		])
+ 	])
+-	if test $MYSQL_VERSION != not_found; then
++	if test "x$MYSQL_VERSION" != "xnot_found"; then
+ 		DB_VERSION=${MYSQL_VERSION}
+-		DB_LDFLAGS=${MYSQLCLIENT_LDFLAGS}
+-		DB_LDLIBS=${MYSQLCLIENT_LIBS}
+-		DB_CFLAGS=${MYSQLCLIENT_CFLAGS}
+ 	fi
+ else
+ 	DB_NAME=MARIADB
diff --git a/debian/patches/series b/debian/patches/series
index 5b896b9..6f614f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-debian-my.cnf.in.patch
 0003-fix-doc.patch
 0005-fix-FTBF-due-to-missing-cmath-include.patch
+0005-fix-mysql-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git