diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-21 19:44:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-09-23 19:58:45 +0200 |
| commit | ec17d32dffaed75da4e6f1bb6d4e14ff40d59a7b (patch) | |
| tree | 010d529fe66c88a6197a90e668509f37c722e995 | |
| parent | b98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff) | |
| download | otp-ec17d32dffaed75da4e6f1bb6d4e14ff40d59a7b.tar.gz otp-ec17d32dffaed75da4e6f1bb6d4e14ff40d59a7b.tar.bz2 otp-ec17d32dffaed75da4e6f1bb6d4e14ff40d59a7b.zip | |
Remove static ssl linking in crypto for otp_build
| -rw-r--r-- | erts/configure.in | 2 | ||||
| -rwxr-xr-x | otp_build | 12 |
2 files changed, 7 insertions, 7 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], @@ -186,15 +186,15 @@ set_config_flags () if target_contains free_source; then CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET" fi - # Link SSL static for all binary distributions if not overridden - # Even for win32 starting with R14B03 - XX=`echo $* | grep -v dynamic-ssl-lib` - if [ "$*" = "$XX" ]; then - CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS" - fi + # Link SSL static for win32 binary distributions if not overridden if target_contains win32; then + XX=`echo $* | grep -v dynamic-ssl-lib` + if [ "$*" = "$XX" ]; then + CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS" + fi CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" fi + if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null" |