aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorwsnipex <wsnipex@a1.net>2016-11-04 11:55:57 +0100
committerwsnipex <wsnipex@a1.net>2016-11-04 11:55:57 +0100
commit94bc6797318c4bbc8e40fe5d007572519eb532fb (patch)
treeb68422f8d0932bd33c4e787ad2ccc33204d48b55 /tools
parent7f6abd1dd6d1aefcb4303083f34aaa90a8df9fce (diff)
[depends] all platform but darwin: always use our own zlib
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index a0bc386284..f438e5d830 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -385,6 +385,7 @@ case $host in
platform_includes="-isysroot $use_sdk_path"
deps_dir=$sdk_name"_"$use_cpu-target
tool_dir=buildtools-native;
+ AC_CHECK_LIB([z], [main], has_zlib=1, AC_MSG_WARN("No zlib support in toolchain. Will build libz."); has_zlib=0)
;;
*)
AC_MSG_ERROR(unsupported host ($use_host))
@@ -476,7 +477,6 @@ AC_PATH_PROG([OBJDUMP_FOR_BUILD], [objdump], objdump, $PATH_FOR_BUILD)
AC_PATH_PROG([CC_FOR_BUILD],[gcc llvm-gcc $platform_cc], gcc, $PATH_FOR_BUILD)
AC_PATH_PROG([CXX_FOR_BUILD],[g++ llvm-g++ $platform_cxx], g++, $PATH_FOR_BUILD)
-AC_CHECK_LIB([z], [main], has_zlib=1, AC_MSG_WARN("No zlib support in toolchain. Will build libz."); has_zlib=0)
AC_SEARCH_LIBS([iconv_open],iconv, link_iconv=$ac_cv_search_iconv_open, link_iconv=-liconv; AC_MSG_WARN("No iconv support in toolchain. Will build libiconv."); need_libiconv=1)
AC_TRY_LINK([#include <locale.h>],[struct lconv* test=localeconv();], has_localeconv=yes, AC_MSG_WARN("No localeconv support in toolchain. Using replacement."); has_localeconv=no)
AC_CHECK_LIB([crystax], [main], has_libcrystax=1, has_libcrystax=0)