Skip to content

Commit 6a7ac3d

Browse files
committed
zlib >= 1.2.0
1 parent a066d5b commit 6a7ac3d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

configure

+8-8
Original file line numberDiff line numberDiff line change
@@ -13744,12 +13744,12 @@ if test -n "$ZLIB_CFLAGS"; then
1374413744
pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
1374513745
elif test -n "$PKG_CONFIG"; then
1374613746
if test -n "$PKG_CONFIG" && \
13747-
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib > 1.2.0\""; } >&5
13748-
($PKG_CONFIG --exists --print-errors "zlib > 1.2.0") 2>&5
13747+
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0\""; } >&5
13748+
($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0") 2>&5
1374913749
ac_status=$?
1375013750
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1375113751
test $ac_status = 0; }; then
13752-
pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib > 1.2.0" 2>/dev/null`
13752+
pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.0" 2>/dev/null`
1375313753
test "x$?" != "x0" && pkg_failed=yes
1375413754
else
1375513755
pkg_failed=yes
@@ -13761,12 +13761,12 @@ if test -n "$ZLIB_LIBS"; then
1376113761
pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
1376213762
elif test -n "$PKG_CONFIG"; then
1376313763
if test -n "$PKG_CONFIG" && \
13764-
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib > 1.2.0\""; } >&5
13765-
($PKG_CONFIG --exists --print-errors "zlib > 1.2.0") 2>&5
13764+
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0\""; } >&5
13765+
($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0") 2>&5
1376613766
ac_status=$?
1376713767
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1376813768
test $ac_status = 0; }; then
13769-
pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib > 1.2.0" 2>/dev/null`
13769+
pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.0" 2>/dev/null`
1377013770
test "x$?" != "x0" && pkg_failed=yes
1377113771
else
1377213772
pkg_failed=yes
@@ -13787,9 +13787,9 @@ else
1378713787
_pkg_short_errors_supported=no
1378813788
fi
1378913789
if test $_pkg_short_errors_supported = yes; then
13790-
ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib > 1.2.0" 2>&1`
13790+
ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib >= 1.2.0" 2>&1`
1379113791
else
13792-
ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib > 1.2.0" 2>&1`
13792+
ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib >= 1.2.0" 2>&1`
1379313793
fi
1379413794
# Put the nasty error message in config.log where it belongs
1379513795
echo "$ZLIB_PKG_ERRORS" >&5

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -4056,9 +4056,9 @@ fi
40564056
dnl Check for compression libraries
40574057
AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy])
40584058

4059-
PKG_CHECK_MODULES([ZLIB], [zlib > 1.2.0], [
4059+
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
40604060
have_zlib=yes
4061-
dnl zlib > 1.2.0 (2003) has inflateCopy
4061+
dnl zlib 1.2.0 (2003) added inflateCopy
40624062
AC_DEFINE([HAVE_ZLIB_COPY], [1])
40634063
], [
40644064
AC_CHECK_HEADERS([zlib.h], [

0 commit comments

Comments
 (0)