|
|
@ -5188,12 +5188,12 @@ if test -n "$zlib_CFLAGS"; then |
|
|
|
pkg_cv_zlib_CFLAGS="$zlib_CFLAGS" |
|
|
|
pkg_cv_zlib_CFLAGS="$zlib_CFLAGS" |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&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") 2>&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5 |
|
|
|
ac_status=$? |
|
|
|
ac_status=$? |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
test $ac_status = 0; }; then |
|
|
|
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 |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
else |
|
|
|
else |
|
|
|
pkg_failed=yes |
|
|
|
pkg_failed=yes |
|
|
@ -5205,12 +5205,12 @@ if test -n "$zlib_LIBS"; then |
|
|
|
pkg_cv_zlib_LIBS="$zlib_LIBS" |
|
|
|
pkg_cv_zlib_LIBS="$zlib_LIBS" |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
elif test -n "$PKG_CONFIG"; then |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
if test -n "$PKG_CONFIG" && \ |
|
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&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") 2>&5 |
|
|
|
($PKG_CONFIG --exists --print-errors "zlib >= 1.2.5.2") 2>&5 |
|
|
|
ac_status=$? |
|
|
|
ac_status=$? |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
|
|
|
test $ac_status = 0; }; then |
|
|
|
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 |
|
|
|
test "x$?" != "x0" && pkg_failed=yes |
|
|
|
else |
|
|
|
else |
|
|
|
pkg_failed=yes |
|
|
|
pkg_failed=yes |
|
|
@ -5231,14 +5231,14 @@ else |
|
|
|
_pkg_short_errors_supported=no |
|
|
|
_pkg_short_errors_supported=no |
|
|
|
fi |
|
|
|
fi |
|
|
|
if test $_pkg_short_errors_supported = yes; then |
|
|
|
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 |
|
|
|
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 |
|
|
|
fi |
|
|
|
# Put the nasty error message in config.log where it belongs |
|
|
|
# Put the nasty error message in config.log where it belongs |
|
|
|
echo "$zlib_PKG_ERRORS" >&5 |
|
|
|
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 |
|
|
|
$zlib_PKG_ERRORS |
|
|
|
|
|
|
|
|
|
|
|