nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: updated configure.ac to allow mingw builds with static openssl and libevent

Browse Source
This commit is contained in:
Richard Pospesel 2020-09-14 19:01:43 +02:00
parent 33380f6b27
commit 16412c698c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -873,6 +873,8 @@ if test "$bwin32" = "true"; then
# think it's actually necessary. # think it's actually necessary.
TOR_LIB_GDI=-lgdi32 TOR_LIB_GDI=-lgdi32
TOR_LIB_USERENV=-luserenv TOR_LIB_USERENV=-luserenv
TOR_LIB_BCRYPT=-lbcrypt
TOR_LIB_CRYPT32=-lcrypt32
else else
TOR_LIB_WS32= TOR_LIB_WS32=
TOR_LIB_GDI= TOR_LIB_GDI=
@ -881,6 +883,8 @@ fi
AC_SUBST(TOR_LIB_WS32) AC_SUBST(TOR_LIB_WS32)
AC_SUBST(TOR_LIB_GDI) AC_SUBST(TOR_LIB_GDI)
AC_SUBST(TOR_LIB_IPHLPAPI) AC_SUBST(TOR_LIB_IPHLPAPI)
AC_SUBST(TOR_LIB_BCRYPT)
AC_SUBST(TOR_LIB_CRYPT32)
AC_SUBST(TOR_LIB_SHLWAPI) AC_SUBST(TOR_LIB_SHLWAPI)
AC_SUBST(TOR_LIB_USERENV) AC_SUBST(TOR_LIB_USERENV)
@ -898,7 +902,7 @@ if test "$enable_static_libevent" = "yes"; then
fi fi
fi fi
TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32], [ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_IPHLPAPI $TOR_LIB_BCRYPT $TOR_LIB_WS32], [
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#endif #endif
@ -1029,7 +1033,7 @@ AC_ARG_WITH(ssl-dir,
]) ])
AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32], TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32],
[#include <openssl/ssl.h> [#include <openssl/ssl.h>
char *getenv(const char *);], char *getenv(const char *);],
[struct ssl_cipher_st; [struct ssl_cipher_st;
@ -1050,7 +1054,7 @@ if test "$enable_static_openssl" = "yes"; then
if test "$tor_cv_library_openssl_dir" = "(system)"; then if test "$tor_cv_library_openssl_dir" = "(system)"; then
AC_MSG_ERROR("You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl") AC_MSG_ERROR("You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl")
else else
TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a" TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT"
fi fi
else else
TOR_OPENSSL_LIBS="-lssl -lcrypto" TOR_OPENSSL_LIBS="-lssl -lcrypto"