Fix wording when minizip library isn't found.

This commit is contained in:
Brandon Wright 2016-11-28 14:01:18 -06:00
parent 1aae8f9235
commit c5965f897a
3 changed files with 10 additions and 10 deletions

View File

@ -331,9 +331,9 @@ if test no != "$with_system_zip" && test yes = "$with_zlib" ; then
LIBS="$LIBS $SYSTEM_ZIP_LIBS"
],[
if test check = "$with_system_zip"; then
AC_MSG_WARN(Cannot find SYSTEM_ZIP)
AC_MSG_WARN(Cannot find system minizip library)
else
AC_MSG_ERROR(--with-system-zip given but cannot find proper zlib)
AC_MSG_ERROR(--with-system-zip given but cannot find system minizip library)
fi
])
fi

12
unix/configure vendored
View File

@ -5046,20 +5046,20 @@ fi
echo "$SYSTEM_ZIP_PKG_ERRORS" >&5
if test "x${with_system_zip}" != "xcheck"; then
as_fn_error $? "--with-system-zip requested but no proper zlib found." "$LINENO" 5
as_fn_error $? "--with-system-zip requested but no proper minizip lib found." "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib not found. Build without SYSTEM_ZIP support." >&5
$as_echo "$as_me: WARNING: zlib not found. Build without SYSTEM_ZIP support." >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: minizip not found. Build without SYSTEM_ZIP support." >&5
$as_echo "$as_me: WARNING: minizip not found. Build without SYSTEM_ZIP support." >&2;}
fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "x${with_system_zip}" != "xcheck"; then
as_fn_error $? "--with-system-zip requested but no proper zlib found." "$LINENO" 5
as_fn_error $? "--with-system-zip requested but no proper minizip lib found." "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib not found. Build without SYSTEM_ZIP support." >&5
$as_echo "$as_me: WARNING: zlib not found. Build without SYSTEM_ZIP support." >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: minizip not found. Build without SYSTEM_ZIP support." >&5
$as_echo "$as_me: WARNING: minizip not found. Build without SYSTEM_ZIP support." >&2;}
fi
else

View File

@ -222,9 +222,9 @@ if test "x$enable_zip" = "xyes"; then
fi
S9XDEFS="$S9XDEFS -DSYSTEM_ZIP",
if test "x${with_system_zip}" != "xcheck"; then
AC_MSG_ERROR([--with-system-zip requested but no proper zlib found.])
AC_MSG_ERROR([--with-system-zip requested but no proper minizip lib found.])
else
AC_MSG_WARN([zlib not found. Build without SYSTEM_ZIP support.])
AC_MSG_WARN([minizip not found. Build without SYSTEM_ZIP support.])
fi
)
else