From fc71b7c9623e0a642f6b976ad9bbdc9beb3d2573 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Fri, 13 Jun 2008 07:53:51 +0000
Subject: [PATCH] Version 2.1_rc8

On Windows, use -leay32 and -lssl32 to link with OpenSSL.

On Windows, bundle pkcs11-helper-1.06-beta1.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2997 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 configure.ac                         | 14 +++++++++++---
 install-win32/build-pkcs11-helper.sh |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9ca2c4e1..357e1a63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,7 +611,7 @@ fi
 dnl
 dnl Check if LoadLibrary exists on Windows
 dnl
-if test "${WIN32}" == "yes"; then
+if test "${WIN32}" = "yes"; then
    if test "$PLUGINS" = "yes"; then
 	AC_TRY_LINK([
 	    #include <windows.h>
@@ -683,7 +683,11 @@ if test "$CRYPTO" = "yes"; then
 		     ],
 		     [
                        AC_DEFINE(USE_CRYPTO, 1, [Use OpenSSL crypto library])
-                       OPENVPN_ADD_LIBS(-lcrypto)
+                       if test "${WIN32}" = "yes"; then
+                         OPENVPN_ADD_LIBS(-leay32)
+                       else
+                         OPENVPN_ADD_LIBS(-lcrypto)
+                       fi
                        AC_CHECK_FUNCS(EVP_CIPHER_CTX_set_key_length)
 
 		       dnl check for OpenSSL crypto acceleration capability
@@ -725,7 +729,11 @@ dnl
 	   [AC_MSG_ERROR([OpenSSL SSL headers not found.])]
       )
       AC_DEFINE(USE_SSL, 1, [Use OpenSSL SSL library])
-      OPENVPN_ADD_LIBS(-lssl)
+      if test "${WIN32}" = "yes"; then
+        OPENVPN_ADD_LIBS(-lssl32)
+      else
+        OPENVPN_ADD_LIBS(-lssl)
+      fi
    fi
 fi
 
diff --git a/install-win32/build-pkcs11-helper.sh b/install-win32/build-pkcs11-helper.sh
index ca139f5d..fd336dff 100644
--- a/install-win32/build-pkcs11-helper.sh
+++ b/install-win32/build-pkcs11-helper.sh
@@ -1,4 +1,4 @@
-F=pkcs11-helper-1.05
+F=pkcs11-helper-1.06-beta1
 OPENSSL_DIR=`pwd`/openssl-0.9.8h
 
 PKCS11_HELPER_DIR=`pwd`/pkcs11-helper
@@ -16,7 +16,7 @@ cd $F
         --disable-crypto-engine-nss \
         PKG_CONFIG=true \
         OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include" \
-        OPENSSL_LIBS="-L${OPENSSL_DIR}/out -lcrypto"
+        OPENSSL_LIBS="-L${OPENSSL_DIR}/out -leay32"
 
 make
 make install DESTDIR="${PKCS11_HELPER_DIR}"