diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-24 10:44:42 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-26 09:42:38 +0100 |
| commit | 7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9 (patch) | |
| tree | 4f852765599770c5f51509ef16c4864211f1aad5 /RepositoryExternal.mk | |
| parent | Add debug output operator<< for ScConditionMode (diff) | |
| download | core-7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9.tar.gz core-7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9.zip | |
move conditional stuff to RepositoryExternal.mk
Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b
Reviewed-on: https://gerrit.libreoffice.org/45211
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index bb3c9b6895e0..bdc5d65a2d81 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3451,6 +3451,8 @@ endef endif # ENABLE_BREAKPAD +ifeq ($(ENABLE_GPGMEPP),TRUE) + ifneq ($(SYSTEM_GPGMEPP),) gb_ExternalProject__use_gpgmepp:= @@ -3567,6 +3569,18 @@ endif endif +else # !ENABLE_GPGMEPP + +gb_ExternalProject__use_gpgmepp := +gb_ExternalProject__use_libassuan := +gb_ExternalProject__use_libgpg-error := + +gb_LinkTarget__use_gpgmepp := +gb_LinkTarget__use_libassuan := +gb_LinkTarget__use_libgpg-error := + +endif # ENABLE_GPGMEPP + define gb_LinkTarget__use_dconf $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS)) $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS)) |