diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
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" |