diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
| commit | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (patch) | |
| tree | b5324d56ca67a1f427b876f03536d98025f31945 /erts | |
| parent | 92657321ac647f343c6b88985d66a2d611fd982d (diff) | |
| parent | 55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (diff) | |
| download | otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.gz otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.bz2 otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.zip | |
Merge branch 'dev' into major
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/httpc_cookie_SUITE.erl
lib/inets/vsn.mk
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 88337e79fd..450c4d7a83 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], |