projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure proper linking with OpenSSL with recent versions of MinGW.
[oweals/tinc.git]
/
m4
/
openssl.m4
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index a5cd0394dbafd3a5dccf3306c5fba75f834caf15..59f0d4504fb3b1ac71e30029588473138bcd8c61 100644
(file)
--- a/
m4/openssl.m4
+++ b/
m4/openssl.m4
@@
-26,19
+26,15
@@
AC_DEFUN([tinc_OPENSSL],
[AC_MSG_ERROR([OpenSSL header files not found.]); break]
)
[AC_MSG_ERROR([OpenSSL header files not found.]); break]
)
+ AC_CHECK_LIB(crypto, EVP_EncryptInit_ex,
+ [LIBS="-lcrypto $LIBS"],
+ [AC_MSG_ERROR([OpenSSL libraries not found.])]
+ )
+
case $host_os in
*mingw*)
case $host_os in
*mingw*)
- AC_CHECK_LIB(crypto, SHA1_version,
- [LIBS="$LIBS -lcrypto -lgdi32"],
- [AC_MSG_ERROR([OpenSSL libraries not found.])]
- )
;;
*)
;;
*)
- AC_CHECK_LIB(crypto, SHA1_version,
- [LIBS="$LIBS -lcrypto"],
- [AC_MSG_ERROR([OpenSSL libraries not found.])]
- )
-
AC_CHECK_FUNC(dlopen,
[],
[AC_CHECK_LIB(dl, dlopen,
AC_CHECK_FUNC(dlopen,
[],
[AC_CHECK_LIB(dl, dlopen,