summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorRobert Antoni Buj i Gelonch <robert.buj@gmail.com>2014-09-17 18:05:43 +0200
committerCaolán McNamara <caolanm@redhat.com>2014-09-25 16:14:27 +0000
commit5c6d26753d758c2173f21a14283bdafa54063b63 (patch)
treeae111e7e4b8df854baa55e418813abf65067fb37 /configure.ac
parent81055f589fc2de92e37dbe29f59b5da80728b28a (diff)
Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option
http://bazaar.launchpad.net/~maria-captains/mariadb-native-client/trunk/revision/149 Change-Id: I273f355b9fc922fdb9d9692e0057cfccfdcbcde1 Reviewed-on: https://gerrit.libreoffice.org/11492 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index ee434df950e2..f9c04e84e143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8070,7 +8070,6 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
fi
else
AC_MSG_RESULT([internal])
- AC_MSG_ERROR([libmariadb is known to be incompatible as of 2014-09; use libmysqlclient])
SYSTEM_MARIADB=
MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"