projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67766d6
)
Ensure proper linking with OpenSSL with recent versions of MinGW.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 8 May 2011 21:12:06 +0000
(23:12 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 8 May 2011 21:12:06 +0000
(23:12 +0200)
configure.in
patch
|
blob
|
history
m4/openssl.m4
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
daeffef
..
a19b2aa
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-67,7
+67,7
@@
case $host_os in
*mingw*)
AC_DEFINE(HAVE_MINGW, 1, [MinGW])
[ rm -f src/device.c; cp -f src/mingw/device.c src/device.c ]
*mingw*)
AC_DEFINE(HAVE_MINGW, 1, [MinGW])
[ rm -f src/device.c; cp -f src/mingw/device.c src/device.c ]
- LIBS="$LIBS -lws2_32"
+ LIBS="$LIBS -lws2_32
-lgdi32 -lcrypt32
"
;;
*)
AC_MSG_ERROR("Unknown operating system.")
;;
*)
AC_MSG_ERROR("Unknown operating system.")
diff --git
a/m4/openssl.m4
b/m4/openssl.m4
index
8d4a24b
..
59f0d45
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, 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,
AC_CHECK_FUNC(dlopen,
[],
[AC_CHECK_LIB(dl, dlopen,