[apr-util] 01/02: Allow building with libmariadbclient-dev

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr-util.

commit a91dedd884cf22071d92b6b8cd20c1f651f568e7
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 25 22:10:34 2014 +0200

    Allow building with libmariadbclient-dev
---
 debian/changelog                     |  2 ++
 debian/patches/series                |  1 +
 debian/patches/support_mariadb.patch | 44 ++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 84d36eb..d84bb73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 apr-util (1.5.3-3) UNRELEASED; urgency=medium
 
+  * Allow building with libmariadbclient-dev instead of
+    libmysqlclient-dev. Closes: #759158
   * Update Vcs-Git URL in control file.
 
  -- Stefan Fritsch <sf at debian.org>  Tue, 22 Jul 2014 23:07:54 +0200
diff --git a/debian/patches/series b/debian/patches/series
index c649784..ff91036 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ disable_expat_buildconf.patch
 avoid_db_by-default.patch
 test_verbose
 fix_doxygen_inputdir
+support_mariadb.patch
diff --git a/debian/patches/support_mariadb.patch b/debian/patches/support_mariadb.patch
new file mode 100644
index 0000000..ab1bb61
--- /dev/null
+++ b/debian/patches/support_mariadb.patch
@@ -0,0 +1,44 @@
+--- apr-util.orig/build/dbd.m4
++++ apr-util/build/dbd.m4
+@@ -176,10 +176,15 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+         APR_ADDTO(LIBS, [$mysql_LIBS])
+       fi
+ 
++      AC_LINK_IFELSE([#include <my_global.h>
++                      int main(int a, char **b) { mysql_init(); return 0; }],
++                     [apu_have_mysql=1], [apu_have_mysql=0])
++      if test "$apu_have_mysql" = "0"; then
+       AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
+                        AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+                        [apu_have_mysql=0; break],
+                        [#include <my_global.h>])
++      fi
+       if test "$apu_have_mysql" = "0"; then
+         AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
+                          AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+@@ -207,11 +212,16 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+       APR_ADDTO(LIBS, [$mysql_LIBS])
+ 
+       AC_MSG_NOTICE(checking for mysql in $withval)
++      AC_LINK_IFELSE([#include <my_global.h>
++                      int main(int a, char **b) { mysql_init(); return 0; }],
++                     [apu_have_mysql=1], [apu_have_mysql=0])
++      if test "$apu_have_mysql" != "1"; then
+       AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h],
+                        AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+                        [apu_have_mysql=0; break],
+                        [#include <my_global.h>])
+ 
++      fi
+       if test "$apu_have_mysql" != "1"; then
+         AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h],
+                          AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]),
+@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
+   dnl we know the library is there.
+   if test "$apu_have_mysql" = "1"; then
+-    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS])
++    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS $mysql_LIBS])
+   fi
+   AC_SUBST(LDADD_dbd_mysql)
+ 

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