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

1 files changed, 6 insertions, 6 deletions

diff --git a/otp_build b/otp_build
index aed34b76a8..44bbab22b5 100755
--- a/otp_build
+++ b/otp_build
@@ -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"