diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-06 12:28:36 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-06 12:36:21 +0100 |
commit | 0b27253aff771e104a9fd5d17595b205b2fc39fd (patch) | |
tree | 56992237ca5e5f3dd774b880cd86c8392e9b4311 /RepositoryExternal.mk | |
parent | convert calc autoformat dialog to .ui (diff) | |
download | core-0b27253aff771e104a9fd5d17595b205b2fc39fd.tar.gz core-0b27253aff771e104a9fd5d17595b205b2fc39fd.zip |
Add apr and serf externals for alternative webdav implementation.
Change-Id: I5e93bb6fb53537b889c6ba9888f0f32a0d6f8050
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4ff67480f8fd..eec50bd83019 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1000,6 +1000,57 @@ gb_LinkTarget__use_liblangtag := endif # ENABLE_LIBLANGTAG +ifneq ($(DISABLE_NEON),) + +define gb_LinkTarget__use_apr +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(APR_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + $(APR_LIBS) \ +) + +ifeq ($(SYSTEM_APR),) +$(call gb_LinkTarget_use_system_win32_libs,$(1),\ + mswsock \ + rpcrt4 \ + shell32 \ +) +$(call gb_LinkTarget_add_defs,$(1),\ + -DAPR_DECLARE_STATIC \ + -DAPU_DECLARE_STATIC \ +) +$(call gb_LinkTarget_use_external_project,$(1),apr_util) +endif + +endef + +define gb_ExternalProject__use_apr +ifeq ($(SYSTEM_APR),) +$(call gb_ExternalProject_use_external_project,$(1),apr_util) +endif + +endef + +define gb_LinkTarget__use_serf +$(call gb_LinkTarget_set_include,$(1),\ + $(SERF_CFLAGS) \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),\ + $(SERF_LIBS) \ +) + +ifeq ($(SYSTEM_SERF),) +$(call gb_LinkTarget_use_external_project,$(1),serf) +endif + +endef + +else + +gb_ExternalProject__use_apr := ifneq ($(SYSTEM_NEON),) @@ -1037,6 +1088,7 @@ endef endif # SYSTEM_NEON +endif # DISABLE_NEON ifneq ($(SYSTEM_REDLAND),) |