6 files changed, 34 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 33facd89cf4a..f14d675cf980 100644
--- a/configure.in
+++ b/configure.in
@@ -389,6 +389,11 @@ AC_ARG_ENABLE(ext-barcode,
         [Enable the Barcode extension.])
 )
 
+AC_ARG_ENABLE(database-connectivity,
+    AS_HELP_STRING([--disable-database-connectivity],
+        [Disable various database connectivity.])
+)
+
 AC_ARG_ENABLE(ext-diagram,
     AS_HELP_STRING([--enable-ext-diagram],
         [Enable the SmART Gallery (Diagram) extension.])
@@ -1996,6 +2001,22 @@ if test $_os != iOS -a $_os != Android; then
     BUILD_TYPE="$BUILD_TYPE DESKTOP"
 fi
 
+dnl Decide whether to build database connectivity stuff (including
+dnl Base) or not. We probably don't want to on non-desktop OSes.
+
+if test -z "$enable_database_connectivity"; then
+    # Do enable database connectivity for Android for now as otherwise
+    # we presumably will get linking errors... We are not as far in
+    # the work for iOS, so we might as well disable it for iOS already.
+    if test $_os != iOS; then
+        enable_database_connectivity=yes
+    fi
+fi
+
+if test "$enable_database_connectivity" = yes; then
+    BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY"
+fi
+
 dnl ===================================================================
 dnl Extra check for Windows. Cygwin builds need gcc to build dmake
 dnl although MSVC is used to build other build-time tools and
@@ -6737,6 +6758,8 @@ if test "$with_system_odbc" = "yes"; then
 
     AC_CHECK_HEADER(sqlext.h, [],
       [AC_MSG_ERROR(odbc not found. install odbc)], [])
+elif test "$enable_database_connectivity" != yes; then
+    AC_MSG_RESULT([none])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_ODBC_HEADERS=NO
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index b7788c1eb5e1..88760ae8ec6c 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -28,6 +28,8 @@
 
 $(eval $(call gb_Module_Module,dbaccess))
 
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,dbaccess,\
     AllLangResTarget_dba \
     AllLangResTarget_dbmm \
@@ -48,4 +50,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
     JunitTest_dbaccess_unoapi \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index e72e4301bf77..854a822a1158 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Module_Module,reportdesign))
 
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,reportdesign,\
     AllLangResTarget_rpt \
     AllLangResTarget_rptui \
@@ -42,4 +44,6 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
 	JunitTest_reportdesign_complex \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 6bdebb6de997..915bcc58decf 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,2 +1,2 @@
-sx	svx	:	sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL
+sx	svx	:	sfx2 TRANSLATIONS:translations oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL
 sx	svx\prj								nmake	-	all	sx_prj NULL
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 42986b8e64d4..0ff450fc126e 100644
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,2 +1,2 @@
-sw      sw      :    filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL
+sw      sw      :    filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL
 sw sw\prj nmake - all sw_prj   NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index ea551d50a2c2..5861359d441d 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr DBCONNECTIVITY:connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL