diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-03 17:21:20 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-03 17:24:43 +0200 |
| commit | 6744ccd78233a8d053fd2353a146eeba803a5b21 (patch) | |
| tree | 835408a9e3a3be0855963262cca224b3cb058d98 /libxmlsec | |
| parent | 64a25bc57a7897b8feb1ab974a9c344b23dbc26d (diff) | |
Don't bother with --with-openssl=no for Android then as we do use openssl
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index d51d7aec5430..caefaadb74c9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -151,7 +151,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF 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)" +CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) @@ -159,6 +159,8 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .IF "$(OS)" == "ANDROID" CONFIGURE_FLAGS+=--with-openssl=$(SOLARVER)/$(INPATH) +.ELSE +CONFIGURE_FLAGS+=--with-openssl=no .ENDIF # system-mozilla needs pkgconfig to get the information about nss |