Use separately built "system" OpenSSL for iOS

The configury in the bundled obsolete version of OpenSSL is just too
horrible to even bother patching up to work for cross-compiling to
iOS. There are several ways to build OpenSSL for iOS described on the
net, let's just use one of them.
This commit is contained in:
Tor Lillqvist
2011-05-26 02:03:50 +03:00
parent bcf04a28cc
commit 1f8ffa754e
2 changed files with 17 additions and 5 deletions

View File

@@ -5729,12 +5729,23 @@ AC_MSG_CHECKING([which libssl to use])
if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
test "$with_system_openssl" != "no"; then
AC_MSG_RESULT([external])
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
dnl Mac OS (and BSD, apparently) builds should get out without
dnl extra stuff is the Mac porters' wish. And pkg-config is
dnl although Xcode ships a .pc for OpenSSL
dnl For iOS we don't want to even try compiling bundled (outdated
dnl version of) OpenSSL with its ultra-weird configury. But on the
dnl other hand there is no system OpenSSL either. But let's just
dnl build a current OpenSSL separately using some of the ways
dnl found on the net and pretend it is a "system" OpenSSL.
dnl In either case pass OPENSSL_CFLAGS and OPENSSL_LIBS if
dnl necessary in the environment.
if test "$_os" = "Darwin" -o "$_os" = "iOS" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \
"$_os" = "DragonFly"; then
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
OPENSSL_LIBS=${OPENSSL_LIBS:--lssl -lcrypto}
else
PKG_CHECK_MODULES( OPENSSL, openssl )
fi

View File

@@ -15,6 +15,7 @@
--disable-randr
--disable-randr-link
--disable-systray
--with-system-openssl
--without-fonts
--without-java
--without-junit