diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-03 16:52:46 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-03 17:24:42 +0200 |
| commit | c163a614997f3967581ead98b5135787b473235a (patch) | |
| tree | 905012030715915fb8a50a852fe5d615f68a0874 /libxmlsec | |
| parent | 3433ac9b0f350d5cfa86d92239cd41e6c75dbeb1 (diff) | |
Use our openssl build as crypto lib for xmlsec1 for Android
Seems to build that way; no idea if it works of course.
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 5388580fd960..0c83fbb8c4c4 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -68,7 +68,8 @@ PATCH_FILES=\ xmlsec1-mingw32.patch \ xmlsec1-mingw-keymgr-mscrypto.patch \ xmlsec1-vc10.patch \ - xmlsec1-1.2.14_fix_extern_c.patch + xmlsec1-1.2.14_fix_extern_c.patch \ + xmlsec1-android.patch ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ @@ -151,6 +152,11 @@ LDFLAGS:=$(xmlsec_LDFLAGS) CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" + +.IF "$(OS)" == "ANDROID" +CONFIGURE_FLAGS+=--with-openssl=$(SOLARVER)/$(INPATH) +.ENDIF + # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but.... @@ -178,6 +184,8 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/msc OUT2LIB+=win32$/binaries$/*.lib OUT2BIN+=win32$/binaries$/*.dll .ENDIF +.ELIF "$(OS)" == "ANDROID" +OUT2LIB+=src$/.libs$/libxmlsec1.a src$/openssl/.libs$/libxmlsec1-openssl.a .ELSE OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a .ENDIF |