cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 04:19:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2011-05-04 16:23:02 -04:00
commit 7889c43ef8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -189,7 +189,7 @@ libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS)
if OPENSSL
libevent_openssl_la_SOURCES = bufferevent_openssl.c
libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lcrypto -lssl
libevent_openssl_la_LIBADD = $(MAYBE_CORE) -lssl -lcrypto
libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS)
endif

2
libevent_openssl.pc.in
View File

@ -11,6 +11,6 @@ Version: @VERSION@
Requires: libevent
Conflicts:
Libs: -L${libdir} -levent_openssl
Libs.private: @LIBS@ -lcrypto -lssl
Libs.private: @LIBS@ -lssl -lcrypto
Cflags: -I${includedir}

2
sample/Makefile.am
View File

@ -15,7 +15,7 @@ http_server_sources = http-server.c
if OPENSSL
noinst_PROGRAMS += le-proxy
le_proxy_sources = le-proxy.c
le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lcrypto -lssl
le_proxy_LDADD = $(LDADD) ../libevent_openssl.la
endif
verify:

2
test/Makefile.am
View File

@ -60,7 +60,7 @@ regress_LDFLAGS = $(PTHREAD_CFLAGS)
if OPENSSL
regress_SOURCES += regress_ssl.c
regress_LDADD += ../libevent_openssl.la -lcrypto -lssl
regress_LDADD += ../libevent_openssl.la
endif
bench_SOURCES = bench.c