lets always have at least dbtools

Change-Id: I72f768ad760fd9fa1e3ec988e5217672bca9c824
Reviewed-on: https://gerrit.libreoffice.org/32175Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

RepositoryModule_host.mk

@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,DESKTOP,codemaker) \
 	comphelper \
 	configmgr \
-	$(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \
+	connectivity \
 	cppcanvas \
 	cppu \
 	cppuhelper \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -16,7 +16,7 @@ MERGE_LIBRARY_LIST := \
 	configmgr \
 	cppcanvas \
 	$(call gb_Helper_optional,BREAKPAD,crashreport) \
-	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+	dbtools \
 	deployment \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \