Only tor and test binaries need to link against openssl and zlib; tor-resolve can...

svn:r2629

diff --git a/configure.in b/configure.in
index 209eeee66068a36161f7b7eb9c5ba608ec5db7a8..d8fc5a63745bd7c4a6b1438b04ea0fc42513d07c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -135,7 +135,7 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
                 fi
         fi
 fi
-LIBS="$saved_LIBS -lssl -lcrypto"
+LIBS="$saved_LIBS"
 
 dnl The warning message here is no longer strictly accurate.
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index cf18c3fecdef993dd6d0c4036c143e17424a6988..c07f08355e87a12a98fddaf9878076a83a05c9b4 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,8 +1,9 @@
 
-noinst_LIBRARIES = libor.a
+noinst_LIBRARIES = libor.a libor-crypto.a
 
 #CFLAGS  = -Wall -Wpointer-arith -O2
 
-libor_a_SOURCES = log.c crypto.c fakepoll.c util.c aes.c tortls.c torgzip.c
+libor_a_SOURCES = log.c fakepoll.c util.c 
+libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
 
 noinst_HEADERS = log.h crypto.h fakepoll.h test.h util.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index a1b956b4aa5a90bca0663e7fa6d98ece2a9e440b..edbb4c8653fd8b4f35c71bee46694672d78e2d6f 100644 (file)
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -12,7 +12,7 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        rendservice.c rephist.c router.c routerlist.c routerparse.c \
        tor_main.c
 
-tor_LDADD = ../common/libor.a -lz
+tor_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto
 
 test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        circuituse.c command.c config.c \
@@ -22,7 +22,7 @@ test_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        rendservice.c rephist.c router.c routerlist.c routerparse.c \
        test.c
 
-test_LDADD = ../common/libor.a -lz
+test_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto
 
 noinst_HEADERS = or.h tree.h