summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-09-09 17:03:56 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2014-09-09 17:31:15 +0200
commit2e01b87378e78945791b09318135b36b16edf0aa (patch)
tree9f933f36f70326d7c976eef9264ec78227f761b1 /configure.ac
parentddffb797904c5ae1a5ab3bc66eeb9bfc168a0148 (diff)
fdo#83656 mariadb C client library incompatible with newer MySQL Connector/C++
Change-Id: I0d9cc98070c0b9379b1fd828ac65c2d32f83a93f
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b7d2fe035cbb..d2a9e821bc0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8224,11 +8224,12 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
if test "$with_system_mariadb" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_MARIADB=TRUE
- AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+ #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
if test -z "$MARIADBCONFIG"; then
AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
if test -z "$MARIADBCONFIG"; then
- AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL development package.])
+ AC_MSG_ERROR([mysql_config is missing. Install MySQL client library development package.])
+ #AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL client library development package.])
fi
fi
AC_MSG_CHECKING([MariaDB version])
@@ -8285,6 +8286,7 @@ 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"