More --disable-database-connectivity work, still experimental

RepositoryFixes.mk

@@ -137,4 +137,8 @@ gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAM
 
 endif
 
+ifeq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+gb_Library_FILENAMES := $(patsubst dbtools:libdbtools%,,$(gb_Library_FILENAMES))
+endif
+
 # vim: set noet sw=4 ts=4:

config_host.mk.in

@@ -78,6 +78,7 @@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
 export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
 export DISABLE_ATL=@DISABLE_ATL@
+export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
 export DISABLE_LINKOO=@DISABLE_LINKOO@
 export DISABLE_NEON=@DISABLE_NEON@
 export DISABLE_PYTHON=@DISABLE_PYTHON@

configure.in

@@ -384,7 +384,7 @@ AC_ARG_ENABLE(ext-barcode,
 
 AC_ARG_ENABLE(database-connectivity,
     AS_HELP_STRING([--disable-database-connectivity],
-        [Disable various database connectivity.])
+        [Disable various database connectivity. Work in progress, don't use.])
 )
 
 AC_ARG_ENABLE(ext-diagram,
@@ -2040,9 +2040,13 @@ if test -z "$enable_database_connectivity"; then
     fi
 fi
 
+DISABLE_DBCONNECTIVITY=''
 if test "$enable_database_connectivity" = yes; then
     BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY"
+else
+    DISABLE_DBCONNECTIVITY='TRUE'
 fi
+AC_SUBST(DISABLE_DBCONNECTIVITY)
 
 dnl ===================================================================
 dnl Extra check for Windows. Cygwin builds need gcc to build dmake

connectivity/inc/connectivity/sqlparse.hxx

@@ -31,6 +31,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
 #include <connectivity/sqlnode.hxx>
+#ifndef DISABLE_DBCONNECTIVITY
 #ifndef YYBISON
 #ifndef FLEX_SCANNER
 #ifndef BISON_INCLUDED
@@ -39,6 +40,7 @@
 #endif
 #endif
 #endif
+#endif
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XLocaleData.hpp>

solenv/gbuild/gbuild.mk

@@ -241,6 +241,10 @@ ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
 gb_GLOBALDEFS += -DLIBO_HEADLESS
 endif
 
+ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE)
+gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY
+endif
+
 ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif