From b6038f4ac646b52f0819724b344adcf04bc2a440 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 24 Jan 2010 14:34:47 -0500 Subject: Add --enable-static-(openssl|libevent) options These options only work when using --with-(openssl|libevent)-dir to explicitly pick a libevent or openssl location. --- src/or/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/or') diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 28d7e736dc..ad2476ff15 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -33,7 +33,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ tor_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ circuituse.c command.c config.c \ connection.c connection_edge.c connection_or.c control.c \ @@ -48,7 +48,7 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ test_LDADD = ../common/libor.a ../common/libor-crypto.a \ - -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@ + -lz @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i -- cgit v1.2.3-54-g00ecf