walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

cygwin build fix

This commit is contained in:
Tatsuhiro Tsujikawa 2013-03-28 01:25:42 +09:00
parent 04c13560de
commit bdade00e68
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -205,8 +205,12 @@ AC_CHECK_HEADERS([ \
unistd.h \ unistd.h \
]) ])
case "${host}" in
*mingw*)
# For ntohl, ntohs in Windows # For ntohl, ntohs in Windows
AC_CHECK_HEADERS([winsock2.h]) AC_CHECK_HEADERS([winsock2.h])
;;
esac
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
@ -239,6 +243,9 @@ AM_CONDITIONAL([HAVE_EPOLL], [ test "x${have_epoll}" = "xyes" ])
AC_CHECK_FUNCS([kqueue], [have_kqueue=yes]) AC_CHECK_FUNCS([kqueue], [have_kqueue=yes])
AM_CONDITIONAL([HAVE_KQUEUE], [ test "x${have_kqueue}" = "xyes" ]) AM_CONDITIONAL([HAVE_KQUEUE], [ test "x${have_kqueue}" = "xyes" ])
AM_CONDITIONAL([ENABLE_SPDYD],
[ test "x${have_epoll}" = "xyes" || test "x${have_kqueue}" = "xyes" ])
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_MSG_CHECKING([whether struct kevent.udata is intptr_t]) AC_MSG_CHECKING([whether struct kevent.udata is intptr_t])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

20
src/Makefile.am
View File

@ -21,6 +21,10 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bin_PROGRAMS =
check_PROGRAMS =
TESTS =
if ENABLE_SRC if ENABLE_SRC
AM_CFLAGS = -Wall AM_CFLAGS = -Wall
@ -30,9 +34,11 @@ AM_LDFLAGS = @OPENSSL_LIBS@ @XML_LIBS@ @LIBEVENT_OPENSSL_LIBS@ @SRC_LIBS@
LDADD = $(top_builddir)/lib/libspdylay.la LDADD = $(top_builddir)/lib/libspdylay.la
bin_PROGRAMS = spdycat spdyd bin_PROGRAMS += spdycat
check_PROGRAMS =
TESTS = if ENABLE_SPDYD
bin_PROGRAMS += spdyd
endif # ENABLE_SPDYD
if HAVE_LIBEVENT_OPENSSL if HAVE_LIBEVENT_OPENSSL
bin_PROGRAMS += shrpx bin_PROGRAMS += shrpx
@ -61,17 +67,19 @@ if HAVE_LIBXML2
HTML_PARSER_OBJECTS += HtmlParser.cc HTML_PARSER_OBJECTS += HtmlParser.cc
endif # HAVE_LIBXML2 endif # HAVE_LIBXML2
SPDY_SERVER_OBJECTS = SpdyServer.cc
SPDY_SERVER_HFILES = SpdyServer.h
spdycat_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} spdycat.cc \ spdycat_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} spdycat.cc \
${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \ ${HTML_PARSER_OBJECTS} ${HTML_PARSER_HFILES} \
http-parser/http_parser.c http-parser/http_parser.h http-parser/http_parser.c http-parser/http_parser.h
if ENABLE_SPDYD
SPDY_SERVER_OBJECTS = SpdyServer.cc
SPDY_SERVER_HFILES = SpdyServer.h
spdyd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} \ spdyd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} \
${EVENT_OBJECTS} ${EVENT_HFILES} \ ${EVENT_OBJECTS} ${EVENT_HFILES} \
${SPDY_SERVER_OBJECTS} ${SPDY_SERVER_HFILES} \ ${SPDY_SERVER_OBJECTS} ${SPDY_SERVER_HFILES} \
spdyd.cc spdyd.cc
endif # ENABLE_SPDYD
if HAVE_LIBEVENT_OPENSSL if HAVE_LIBEVENT_OPENSSL
SHRPX_SRCS = \ SHRPX_SRCS = \