projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show hostname and port in error message when connecting to a running tincd.
[tinc]
/
m4
/
openssl.m4
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index
0bc9976
..
59f0d45
100644
(file)
--- a/
m4/openssl.m4
+++ b/
m4/openssl.m4
@@
-21,24
+21,20
@@
AC_DEFUN([tinc_OPENSSL],
LDFLAGS="$LDFLAGS -L$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]
)
[],
[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,