Kaydet (Commit) 91e6d9c7 authored tarafından Miklos Vajna's avatar Miklos Vajna Kaydeden (comit) Tor Lillqvist

Android: disable mariadb

Change-Id: I32502b6b412afbe4c46a6efe0ca49dc50913673d
Reviewed-on: https://gerrit.libreoffice.org/59651
Tested-by: Jenkins
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 966aa588
......@@ -8316,10 +8316,15 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR)
ENABLE_MARIADBC=TRUE
if test "$_os" = "Android"; then
ENABLE_MARIADBC=
fi
MARIADBC_MAJOR=1
MARIADBC_MINOR=0
MARIADBC_MICRO=2
BUILD_TYPE="$BUILD_TYPE MARIADBC"
if test "$ENABLE_MARIADBC" = "TRUE"; then
BUILD_TYPE="$BUILD_TYPE MARIADBC"
fi
AC_SUBST(ENABLE_MARIADBC)
AC_SUBST(MARIADBC_MAJOR)
......
......@@ -257,7 +257,9 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/firebird/firebird_sdbc \
) \
connectivity/source/drivers/flat/flat \
connectivity/source/drivers/mysqlc/mysqlc \
$(if $(ENABLE_MARIADBC), \
connectivity/source/drivers/mysqlc/mysqlc \
) \
$(if $(filter MACOSX,$(OS)), \
connectivity/source/drivers/macab/macab1 \
) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment