Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-03-03 12:58:06 -05:00
commit 74bf57a63e

View File

@ -206,9 +206,15 @@ noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
WIN32-Code/tree.h \
compat/sys/queue.h
include_HEADERS = event.h evhttp.h evdns.h evrpc.h evutil.h
EVENT1_HDRs = event.h evhttp.h evdns.h evrpc.h evutil.h
INCLUDES = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
if INSTALL_LIBEVENT
include_HEADERS = $(EVENT1_HDRS)
else
noinst_HEADERS += $(EVENT1_HDRS)
endif
AM_CPPFLAGS = -I$(srcdir)/compat -I$(srcdir)/include -I./include $(SYS_INCLUDES)
verify: check