premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

don't link against sha1.cpp when using libcrypto's implementation (#1040)

This commit is contained in:
Arvid Norberg 2016-08-30 08:25:07 -04:00 committed by GitHub
parent 3a665a1040
commit 88fe6ae8c3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.am
View File

@ -32,6 +32,11 @@ KADEMLIA_SOURCES = \
../ed25519/src/verify.cpp
endif
if ! WITH_OPENSSL
BUILTIN_CRYPTO_SOURCES = \
sha1.cpp
endif
libtorrent_rasterbar_la_SOURCES = \
web_connection_base.cpp \
alert.cpp \
@ -115,7 +120,6 @@ libtorrent_rasterbar_la_SOURCES = \
session_settings.cpp \
proxy_settings.cpp \
settings_pack.cpp \
sha1.cpp \
smart_ban.cpp \
socket_io.cpp \
socket_type.cpp \
@ -148,7 +152,9 @@ libtorrent_rasterbar_la_SOURCES = \
version.cpp \
file_progress.cpp \
\
$(KADEMLIA_SOURCES)
$(KADEMLIA_SOURCES) \
\
$(BUILTIN_CRYPTO_SOURCES)
libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO)
libtorrent_rasterbar_la_LIBADD = @BOOST_SYSTEM_LIB@ @OPENSSL_LIBS@