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

Don't link zlib bundled with android NDK

This commit is contained in:
Tatsuhiro Tsujikawa 2015-05-21 00:15:04 +09:00
parent 2b450f26ba
commit c1a663b577
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -257,16 +257,10 @@ case "$host" in
esac esac
# zlib # zlib
if test "x$android_build" = "xyes"; then PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
# Use zlib provided by NDK
APPLDFLAGS="-lz $APPLDFLAGS"
have_zlib=yes
else
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
if test "x${have_zlib}" = "xno"; then if test "x${have_zlib}" = "xno"; then
AC_MSG_NOTICE($ZLIB_PKG_ERRORS) AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
fi
fi fi
# cunit # cunit
@ -743,6 +737,7 @@ AC_MSG_NOTICE([summary of build options:
Spdylay: ${have_spdylay} Spdylay: ${have_spdylay}
Jansson: ${have_jansson} Jansson: ${have_jansson}
Jemalloc: ${have_jemalloc} Jemalloc: ${have_jemalloc}
Zlib: ${have_zlib}
Boost CPPFLAGS: ${BOOST_CPPFLAGS} Boost CPPFLAGS: ${BOOST_CPPFLAGS}
Boost LDFLAGS: ${BOOST_LDFLAGS} Boost LDFLAGS: ${BOOST_LDFLAGS}
Boost::ASIO: ${BOOST_ASIO_LIB} Boost::ASIO: ${BOOST_ASIO_LIB}