From a35c6426ab3c111dda0b24527e82600c0cf44847 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 19 Apr 2017 21:23:19 +0800 Subject: [PATCH] Specify lib requirement: zlib >= 1.2.5.2 --- configure | 18 +++++++++--------- configure.ac | 2 +- src/base/CMakeLists.txt | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 192dc9ed1..685aa7cff 100755 --- a/configure +++ b/configure @@ -5188,12 +5188,12 @@ if test -n "$zlib_CFLAGS"; then pkg_cv_zlib_CFLAGS="$zlib_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null` + pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5205,12 +5205,12 @@ if test -n "$zlib_LIBS"; then pkg_cv_zlib_LIBS="$zlib_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "zlib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.5.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null` + pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.5.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5231,14 +5231,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1` + zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1` else - zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1` + zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.5.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$zlib_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (zlib) were not met: + as_fn_error $? "Package requirements (zlib >= 1.2.5.2) were not met: $zlib_PKG_ERRORS diff --git a/configure.ac b/configure.ac index cc1347241..342d9550f 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,7 @@ PKG_CHECK_MODULES(libtorrent, LIBS="$libtorrent_LIBS $LIBS"]) PKG_CHECK_MODULES(zlib, - [zlib], + [zlib >= 1.2.5.2], [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS" LIBS="$zlib_LIBS $LIBS"]) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index a9eb2f5c8..1f30f5479 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(ZLIB REQUIRED) +find_package(ZLIB 1.2.5.2 REQUIRED) set(QBT_BASE_HEADERS bittorrent/cachestatus.h