mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build of xmlsecurity with system mozilla

Browse Source
This commit is contained in:
David Tardon 2011-08-11 13:10:14 +02:00
parent 590e2e2f9b
commit b6aa48432d
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Repository.mk
View File

@ -153,9 +153,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
fileacc \ fileacc \
mcnttype \ mcnttype \
neon \ neon \
nspr4 \
nss3 \
plc4 \
test \ test \
xmlsecurity \ xmlsecurity \
xsec_fw \ xsec_fw \

29
RepositoryExternal.mk
View File

@ -658,4 +658,33 @@ $(call gb_LinkTarget_add_libs,$(1), \
endef endef
ifeq ($(SYSTEM_MOZILLA),YES)
define gb_LinkTarget__use_plc4
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(MOZ_NSS_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),\
$(MOZ_NSS_LIBS) \
)
endef
else
define gb_LinkTarget__use_plc4
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
nspr4 \
nss3 \
plc4 \
))
$(call gb_LinkTarget_add_linked_libs,$(1),\
plc4 \
)
endef
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
xmlsecurity/Library_xsec_xmlsec.mk
View File

@ -124,7 +124,7 @@ $(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
xmlsec1-nss \ xmlsec1-nss \
)) ))
$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
plc4 \ plc4 \
)) ))