diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-12-15 22:34:49 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-12-15 22:34:49 +0900 |
| commit | 18a51ce3143266d30d3daf35cf25b146f425596b (patch) | |
| tree | e90f436786bf96c7759870489c3a7955edb53687 | |
| parent | 0ec2db9f34b662e1f9c0a3401210d541e95a5f35 (diff) | |
We are not bothered by NDK zlib anymore
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index dd45d386..207ac60a 100644 --- a/configure.ac +++ b/configure.ac @@ -226,19 +226,12 @@ if test "x$with_libz" = "xyes"; then fi if test "x$have_zlib" = "xyes"; then AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.]) - # Android NDK arch-mips contains gzbuffer symbol but it is missing - # in zlib.h - save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS save_LIBS=$LIBS - CFLAGS="$CFLAGS $ZLIB_CFLAGS" + CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" LIBS="$ZLIB_LIBS $LIBS" - AC_CHECK_DECL([gzbuffer], [have_decl_gzbuffer=yes], [], - [[#include <zlib.h>]]) - if test "x$have_decl_gzbuffer" = "xyes"; then - AC_CHECK_FUNC([gzbuffer]) - fi - AC_CHECK_FUNCS([gzsetparams]) - CFLAGS=$save_CFLAGS + AC_CHECK_FUNCS([gzbuffer gzsetparams]) + CPPFLAGS=$save_CPPFLAGS LIBS=$save_LIBS fi fi |