Check for zlib; link with it.

svn:r2326

diff --git a/configure.in b/configure.in
index 29815cb2d95f29d8e5471c3df77c85d429e1b8a2..cc73a62ae0a39476a24c884f6377249cef7d32b4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -143,7 +143,7 @@ AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/stat.h sy
 
 dnl These headers are not essential
 
-AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h)
+AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h zlib.h)
 
 AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime)
 AC_REPLACE_FUNCS(strlcat strlcpy)

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index a071bceba6c4bde3a40d9024738b5eb0ec9bc83b..a1b956b4aa5a90bca0663e7fa6d98ece2a9e440b 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
+tor_LDADD = ../common/libor.a -lz
 
 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
+test_LDADD = ../common/libor.a -lz
 
 noinst_HEADERS = or.h tree.h