From 99d32d9284fd5faf68b15499c4a97d55d66736fb Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Thu, 29 May 2014 12:04:46 +0200
Subject: [PATCH] Anroid_mySQL

---
 CHANGES   |  1 +
 configure | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES b/CHANGES
index 57152b9..e9cfe5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ Changelog for hydra
 -------------------
 
 Release 8.1-pre
+* Added patch by tux-mind for better MySQL compilation and an Android patches and Makefile. Thanks!
 * Added xhydra gtk patch by Petar Kaleychev to support -e r reverse login attempt, thanks!
 * Fixed a crash in the cisco module (thanks to Anatoly Mamaev for reporting)
 * Small fix for HTTP form module for redirect pages where a S= string match would not work (thanks to mkosmach for reporting)
diff --git a/configure b/configure
index 9ba9ebb..82fd22d 100755
--- a/configure
+++ b/configure
@@ -451,10 +451,15 @@ for i in $LIBDIRS ; do
         fi
     fi
 done
+MYSQLINSUBDIR=""
 for i in $INCDIRS ; do
     if [ "X" != "X$MYSQL_PATH" ]; then
         if [ -f "$i/mysql/mysql.h" ]; then
             MYSQL_IPATH="$i/mysql"
+            MYSQLINSUBDIR="mysql/"
+        fi
+        if [ -f "$i/mysql.h" ]; then
+            MYSQL_IPATH="$i"
         fi
     fi
 done
@@ -931,6 +936,11 @@ if [ -n "$SVN_IPATH" ]; then
 fi
 if [ -n "$MYSQL_IPATH" ]; then
     XIPATHS="$XIPATHS -I$MYSQL_IPATH"
+    if [ -n "$MYSQLINSUBDIR" ]; then
+       XDEFINES="$XDEFINES -DHAVE_MYSQL_MYSQL_H"
+    else
+       XDEFINES="$XDEFINES -DHAVE_MYSQL_H"
+    fi
 fi
 if [ -n "$AFP_IPATH" ]; then
     XIPATHS="$XIPATHS -I$AFP_IPATH"