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

This commit is contained in:
Nick Mathewson 2011-09-16 09:47:14 -04:00
commit 2179d7359f
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ if OPENSSL
AM_CPPFLAGS += $(OPENSSL_INCS) AM_CPPFLAGS += $(OPENSSL_INCS)
noinst_PROGRAMS += le-proxy noinst_PROGRAMS += le-proxy
le_proxy_sources = le-proxy.c le_proxy_sources = le-proxy.c
le_proxy_LDADD = $(LDADD) ../libevent_openssl.la le_proxy_LDADD = $(LDADD) ../libevent_openssl.la -lssl -lcrypto
endif endif
verify: verify:

View File

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