mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 08:09:01 +08:00
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From 2fa43ece9ec7564e1fbb9867bb5852b834643aa4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Long Nguyen <nguyen.long.908132@gmail.com>
|
||
|
|
Date: Sat, 8 May 2021 19:36:11 +0700
|
||
|
|
Subject: [PATCH 02/14] Change zlib lib name to match CMake output
|
||
|
|
|
||
|
|
---
|
||
|
|
configure.ac | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index b05c334..dd4063c 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -173,7 +173,7 @@ AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r
|
||
|
|
|
||
|
|
dnl Checks for libraries
|
||
|
|
if test "$enable_zlib" != "no"; then
|
||
|
|
- AC_CHECK_LIB(z, gzopen)
|
||
|
|
+ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib = "yes", have_zlib = "no")
|
||
|
|
fi
|
||
|
|
if test "$enable_bzlib" != "no"; then
|
||
|
|
AC_CHECK_LIB(bz2, BZ2_bzCompressInit)
|
||
|
|
@@ -193,11 +193,11 @@ AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes)
|
||
|
|
|
||
|
|
dnl Final sanity checks
|
||
|
|
if test "$enable_zlib" = "yes"; then
|
||
|
|
- if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" != "yesyes"; then
|
||
|
|
+ if test "$ac_cv_header_zlib_h$have_zlib" != "yesyes"; then
|
||
|
|
AC_MSG_ERROR([zlib support requested but not found])
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
-if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
|
||
|
|
+if test "$ac_cv_header_zlib_h$have_zlib" = "yesyes"; then
|
||
|
|
AC_DEFINE([ZLIBSUPPORT], 1, [Enable zlib compression support])
|
||
|
|
fi
|
||
|
|
if test "$enable_bzlib" = "yes"; then
|
||
|
|
--
|
||
|
|
2.29.2.windows.2
|
||
|
|
|