set MDDS_CFLAGS in configure

Change-Id: Ib6be67c7a23e5b403e90f4f72578f7385e895f23

RepositoryExternal.mk

@@ -113,7 +113,13 @@ ifneq ($(SYSTEM_MDDS),)
 
 gb_ExternalProject__use_mdds_headers :=
 
-gb_LinkTarget__use_mdds_headers :=
+define gb_LinkTarget__use_mdds_headers
+$(call gb_LinkTarget_set_include,$(1),\
+	$(MDDS_CFLAGS) \
+	$$(INCLUDE) \
+)
+
+endef
 
 else # !SYSTEM_MDDS
 
@@ -125,7 +131,7 @@ endef
 define gb_LinkTarget__use_mdds_headers
 $(call gb_LinkTarget_use_unpacked,$(1),mdds)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,mdds/include) \
+	$(MDDS_CFLAGS) \
 	$$(INCLUDE) \
 )
 

config_host.mk.in

@@ -369,6 +369,7 @@ export LIBMARIADB=@LIBMARIADB@
 export LIBMARIADB_PATH=@LIBMARIADB_PATH@
 export BUNDLE_MARIADB=@BUNDLE_MARIADB@
 export MD5SUM=@MD5SUM@
+export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
 export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
 export MERGELIBS=@MERGELIBS@
 export MINGWCXX=@MINGWCXX@

configure.ac

@@ -8590,7 +8590,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===================================================================
 dnl Check for system mdds
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.2])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.2], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===================================================================
 dnl Determine which hash container mdds shall use