aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-09-02 18:27:09 +0000
committerNick Mathewson <nickm@torproject.org>2004-09-02 18:27:09 +0000
commit4c799ae7311afa29dde472a0f84a56bac44333f1 (patch)
tree5f132cc01e1d75d895a08f6d85220dcad3127f64
parentf311206d1db3bb88f686cfb52a4c503e97cbe249 (diff)
downloadtor-4c799ae7311afa29dde472a0f84a56bac44333f1.tar
tor-4c799ae7311afa29dde472a0f84a56bac44333f1.tar.gz
Check for zlib; link with it.
svn:r2326
-rw-r--r--configure.in2
-rw-r--r--src/or/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 29815cb2d..cc73a62ae 100644
--- 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 a071bceba..a1b956b4a 100644
--- 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