X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fopenssl.m4;h=254ea4ff2424531ee06b430de374c22b1e063efe;hp=8d4a24bf6586854f7e18e3181b513f21767d0221;hb=80cd2ff73071941a5356555b85a00ee90dfd0e16;hpb=6e6b037ef4fd9877aeb1d947da7364409fa8cbb7

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 8d4a24bf..254ea4ff 100644
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -2,6 +2,20 @@ dnl Check to find the OpenSSL headers/libraries
 
 AC_DEFUN([tinc_OPENSSL],
 [
+  case $host_os in
+    *mingw*)
+    ;;
+    *)
+      AC_CHECK_FUNC(dlopen,
+        [],
+        [AC_CHECK_LIB(dl, dlopen,
+          [LIBS="$LIBS -ldl"],
+          [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+        )]
+      )
+    ;;
+  esac
+
   AC_ARG_WITH(openssl,
     AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
     [openssl="$withval"
@@ -26,28 +40,10 @@ AC_DEFUN([tinc_OPENSSL],
     [AC_MSG_ERROR([OpenSSL header files not found.]); break]
   )
 
-case $host_os in
-  *mingw*)
-    AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
-      [LIBS="$LIBS -lcrypto -lgdi32 -lcrypt32"],
-      [AC_MSG_ERROR([OpenSSL libraries not found.])]
-    )
-  ;;
-  *)
-    AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
-      [LIBS="$LIBS -lcrypto"],
-      [AC_MSG_ERROR([OpenSSL libraries not found.])]
-    )
-
-    AC_CHECK_FUNC(dlopen,
-      [],
-      [AC_CHECK_LIB(dl, dlopen,
-        [LIBS="$LIBS -ldl"],
-        [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
-      )]
-    )
-  ;;
-esac
+  AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
+    [LIBS="-lcrypto $LIBS"],
+    [AC_MSG_ERROR([OpenSSL libraries not found.])]
+  )
 
   AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],