[apr-util] 06/09: Fix mysql/mariadb header detection

[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 3b8869f90885f74f671aaa7982a4b8a4dc4f0d6e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Feb 25 11:00:48 2018 +0100

    Fix mysql/mariadb header detection
---
 debian/changelog                     | 1 +
 debian/patches/support_mariadb.patch | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b2be0b..ece2227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apr-util (1.6.1-2) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 11 and drop deprecated autotools-dev
     sequence. Thanks to Niels Thykier for the patch.
   * Bump Standards-Version (no changes)
+  * Fix mysql/mariadb header detection, broken since 1.5.3-3.
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 25 Feb 2018 10:19:21 +0100
 
diff --git a/debian/patches/support_mariadb.patch b/debian/patches/support_mariadb.patch
index 6a084d9..6b8a5ea 100644
--- a/debian/patches/support_mariadb.patch
+++ b/debian/patches/support_mariadb.patch
@@ -16,7 +16,7 @@
        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, mysql_init, [apu_have_mysql=1]),
-@@ -207,11 +212,16 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+@@ -207,11 +212,17 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
        APR_ADDTO(LIBS, [$mysql_LIBS])
  
        AC_MSG_NOTICE(checking for mysql in $withval)
@@ -28,12 +28,14 @@
                         AC_CHECK_LIB(mysqlclient, mysql_init, [apu_have_mysql=1]),
                         [apu_have_mysql=0; break],
                         [#include <my_global.h>])
- 
+-
++      else
++      AC_CHECK_HEADERS([mysql.h my_global.h my_sys.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, mysql_init, [apu_have_mysql=1]),
-@@ -229,7 +239,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
+@@ -229,7 +240,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

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