From 52230a417ad005711876132d144b3fe8a72d7e8e Mon Sep 17 00:00:00 2001
From: Dave Cottlehuber <dave@muse.net.nz>
Date: Thu, 11 Aug 2011 13:21:16 +1200
Subject: Fix win32 OpenSSL static linking broken in 20c9d6e

---
 erts/configure.in            | 4 ++--
 lib/crypto/c_src/Makefile.in | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/erts/configure.in b/erts/configure.in
index fac07f8b6a..ffa68cd296 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3722,7 +3722,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 				SSL_RUNTIME_LIBDIR="$rdir/lib"
 				SSL_LIBDIR="$dir/lib"
 				SSL_CRYPTO_LIBNAME=libeay32
-				SSL_CRYPTO_LIBNAME=ssleay32
+				SSL_SSL_LIBNAME=ssleay32
 			elif test -f "$dir/lib/openssl.lib"; then
 				SSL_RUNTIME_LIBDIR="$rdir/lib"
 				SSL_LIBDIR="$dir/lib"
@@ -3904,7 +3904,7 @@ dnl		so it is - be adoptable
 	elif test -f "$with_ssl/lib/libeay32.lib"; then
 	    SSL_LIBDIR="$with_ssl/lib"
 	    SSL_CRYPTO_LIBNAME=libeay32
-	    SSL_CRYPTO_LIBNAME=ssleay32
+	    SSL_SSL_LIBNAME=ssleay32
 	else
 	    # This probably wont work, but that's what the user said, so...
 	    SSL_LIBDIR="$with_ssl/lib"
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 276c84d601..c2a986c334 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -41,6 +41,7 @@ CFLAGS = $(DED_CFLAGS)
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
 SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
+SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
 
 
 INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES)
@@ -84,7 +85,7 @@ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
+CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 else
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 CRYPTO_LINK_LIB=$(SSL_LIBDIR)/lib$(SSL_CRYPTO_LIBNAME).a 
@@ -112,7 +113,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
 
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
-	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME)
+	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
 
 clean:
 ifeq ($(findstring win32,$(TARGET)), win32)
-- 
cgit v1.2.3