OpenSSL 1.0.0 compiled for 64 bit Windows requires linking with -lcrypt32.

[oweals/tinc.git] / m4 / openssl.m4

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index f4415cc256025025e9f7e1f88d5a0b24bba4384d..f09130012c4110cefff92ebd37338a3f0c97e36f 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -1,27 +1,27 @@
 dnl Check to find the OpenSSL headers/libraries
 
-AC_DEFUN(tinc_OPENSSL,
+AC_DEFUN([tinc_OPENSSL],
 [
   AC_ARG_WITH(openssl,
-    AC_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
+    AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
     [openssl="$withval"
      CPPFLAGS="$CPPFLAGS -I$withval/include"
      LDFLAGS="$LDFLAGS -L$withval/lib"]
   )
 
   AC_ARG_WITH(openssl-include,
-    AC_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
+    AS_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),
     [openssl_include="$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(openssl-lib,
-    AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
+    AS_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),
     [openssl_lib="$withval"
      LDFLAGS="$LDFLAGS -L$withval"]
   )
 
-  AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
+  AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h openssl/engine.h,
     [],
     [AC_MSG_ERROR([OpenSSL header files not found.]); break]
   )
@@ -29,7 +29,7 @@ AC_DEFUN(tinc_OPENSSL,
 case $host_os in
   *mingw*)
     AC_CHECK_LIB(crypto, SHA1_version,
-      [LIBS="$LIBS -lcrypto -lgdi32"],
+      [LIBS="$LIBS -lcrypto -lgdi32 -lcrypt32"],
       [AC_MSG_ERROR([OpenSSL libraries not found.])]
     )
   ;;