diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-23 15:12:49 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-23 15:12:49 +0200 |
| commit | 55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (patch) | |
| tree | b22a63ba9d1ae4ceef600916b41f5486a361e30d /erts | |
| parent | 12f3b441fc138a6e7a5bc09b8973bd55cba8b5be (diff) | |
| parent | 3a490638107f1fc559d1392920ace6553a3a17dd (diff) | |
| download | otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.gz otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.tar.bz2 otp-55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda.zip | |
Merge branch 'egil/fix-ei-cover-case' into dev
* egil/fix-ei-cover-case:
ei: Add gcc link flags to port_call_SUITE
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 03e27c9dad..3b9be41345 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3538,7 +3538,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], |