Commit 4c799ae7 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Check for zlib; link with it. 


svn:r2326
parent f311206d

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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)

src/or/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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