X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=m4%2Fax_check_openssl.m4;h=7846fb071aa401a7cd013f141553ee8458ef51b7;hb=cf06c2e944306a0bfa37813882d2b59dc6122b09;hp=2d543e64640508be7f5779256fcce11a28d93f26;hpb=b1705c56f366d7dd47c60fed13229db022ce3198;p=sliver-openvswitch.git

diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 2d543e646..7846fb071 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -79,7 +79,11 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             if test -f "$ssldir/include/openssl/ssl.h"; then
                 SSL_INCLUDES="-I$ssldir/include"
                 SSL_LDFLAGS="-L$ssldir/lib"
-                SSL_LIBS="-lssl -lcrypto"
+                if test "$WIN32" = "yes"; then
+                    SSL_LIBS="-lssleay32 -llibeay32"
+                else
+                    SSL_LIBS="-lssl -lcrypto"
+                fi
                 found=true
                 AC_MSG_RESULT([yes])
                 break
@@ -106,7 +110,8 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
     LIBS="$SSL_LIBS $LIBS"
     CPPFLAGS="$SSL_INCLUDES $CPPFLAGS"
     AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
+        [AC_LANG_PROGRAM([#include <openssl/ssl.h>],
+            [SSL_CTX *ctx=NULL;SSL_new(ctx)])],
         [
             AC_MSG_RESULT([yes])
             $1