diff options
| -rw-r--r-- | RepositoryExternal.mk | 10 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c23a879e89ca..463db2bbe455 100644 --- a/RepositoryExternal.mk +++ b/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) \ ) diff --git a/config_host.mk.in b/config_host.mk.in index 260367823e7e..4477ebca2c71 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/configure.ac b/configure.ac index 59919d797c1f..e2198dc43396 100644 --- a/configure.ac +++ b/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 |