diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 16:15:29 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 16:15:29 +0200 |
| commit | 3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f (patch) | |
| tree | da1a5b930a9e7b8eb4db170b6ad14478a3ff891a /erts | |
| parent | 524ad34276ef31fc5c306943539e3fe9bd19ad8c (diff) | |
| parent | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (diff) | |
| download | otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.tar.gz otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.tar.bz2 otp-3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f.zip | |
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
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], |