summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-08-14 10:38:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-08-14 12:47:27 +0100
commitee93dfafddd0f14b9a1ac3c82b967bf3a65f64aa (patch)
treea9355cbefa61d79010b1d2523c0e1dd735721d11 /xmlsecurity
parent3ccb8dac1405dc4ffa0ca3c45bd0724cc339d8ad (diff)
drop disable-xmlsec, it's core functionality, have to live with it
we basically need this functionality, the idea of it being optional isn't really logical anymore with nss split out from mozilla. for iOS and Android where they doesn't build yet spit out lame fixme nag warnings Change-Id: I4b16c62553b12d3dcd340a0b5c5a4cbd807c2f02
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/Module_xmlsecurity.mk4
-rw-r--r--xmlsecurity/prj/build.lst2
2 files changed, 4 insertions, 2 deletions
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index ea5f5aa42059..46646b048a88 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -32,9 +32,11 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
AllLangResTarget_xsec \
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
+ $(ifneq ($(filter-out IOS ANDROID,$(OS)),),Library_xsec_xmlsec) \
))
+#FIXME: ^^^, get nss&libxmlsec building on ios and android
+
# failing
#$(eval $(call gb_Module_add_check_targets,xmlsecurity,\
CppunitTest_qa_certext \
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index d70a6dbb9500..9dfe04cc5c81 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,2 +1,2 @@
-xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
+xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL
xs xmlsecurity\prj nmake - all xs_prj NULL