diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-08-29 09:48:00 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-08-29 09:50:34 +0200 |
| commit | 02f6e55231c8b1646cbafc0e3e591da8122e2bf1 (patch) | |
| tree | 4ff1cefbd2e92e28df20e0369adb5ce54ba17d2b /xmlsecurity | |
| parent | dcc140204a65d3e7075b0e67ac3ffa0a5737d4ea (diff) | |
Fix MinGW build - libxmlsec builds now.
This also removes patching of the generated 'configure' in libxmlsec; instead,
autoreconf is called.
Change-Id: I28c1cc38432d195dd0219fb5a0ab0ea1a35f7a32
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index a6beb3513a94..e2048f60454a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -89,7 +89,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/nss/xsec_nss \ )) -ifeq ($(GUI),WNT) +ifeq ($(GUI)$(CROSS_COMPILING),WNT) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_MSCRYPTO \ @@ -121,9 +121,15 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_NSS \ )) +ifeq ($(GUI)$(CROSS_COMPILING),WNTYES) +$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ + xmlsec1-nss \ +)) +else $(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\ xmlsec1-nss \ )) +endif $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ plc4 \ @@ -140,7 +146,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \ )) -endif # ifeq ($(GUI),WNT) +endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT) ifeq ($(SYSTEM_NSS),YES) |