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

android: Use zlib provided by NDK

This commit is contained in:
Tatsuhiro Tsujikawa 2013-03-07 21:24:40 +09:00
parent add067ed7e
commit 11026a3eda
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -97,6 +97,7 @@ LIBS=$LIBS_OLD
case "$host" in case "$host" in
*android*) *android*)
android_build=yes
# android does not need -pthread, but needs followng 2 libs for C++ # android does not need -pthread, but needs followng 2 libs for C++
SRC_LIBS="$SRC_LIBS -lstdc++ -lsupc++" SRC_LIBS="$SRC_LIBS -lstdc++ -lsupc++"
;; ;;
@ -106,9 +107,14 @@ case "$host" in
esac esac
# zlib # zlib
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3]) if test "x$android_build" = "xyes"; then
LIBS="$ZLIB_LIBS $LIBS" # Use zlib provided by NDK
CFLAGS="$CFLAGS $ZLIB_CFLAGS" LIBS="-lz $LIBS"
else
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3])
LIBS="$ZLIB_LIBS $LIBS"
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
fi
# cunit # cunit
PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])