diff options
| author | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
| commit | 9fce6b663d7183caaeed09cdb25d036d29c35215 (patch) | |
| tree | bb8bd0acad9da39a49b4aef2072d59dbbb30f3a9 /erts | |
| parent | b98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff) | |
| parent | edb449fc7f7ea9861b322edb6c00da907cec8c9c (diff) | |
| download | otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.gz otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.bz2 otp-9fce6b663d7183caaeed09cdb25d036d29c35215.zip | |
Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14
* sverker/remove-static-ssl-linking/OTP-9566:
crypto: touch Makefile to provoke patch release
Change static link test of ssl to dynamic
Remove static ssl linking in crypto for otp_build
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index fac07f8b6a..9dce264e2d 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3535,7 +3535,7 @@ AC_SUBST(STATIC_KERBEROS_LIBS) AC_SUBST(SSL_LINK_WITH_ZLIB) AC_SUBST(STATIC_ZLIB_LIBS) -std_ssl_locations="/usr/local /usr/sfw /opt/local /usr /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl" +std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl" AC_ARG_WITH(ssl-zlib, AS_HELP_STRING([--with-ssl-zlib=PATH], |