Make the zip error message less confusing.
[Report directly when checking for zip, not after checking for unzip.]
This commit is contained in:
parent
276ba69ad2
commit
d78bb867f4
1 changed files with 3 additions and 2 deletions
|
@ -6283,12 +6283,13 @@ dnl We need zip and unzip
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
AC_PATH_PROG(ZIP, zip)
|
AC_PATH_PROG(ZIP, zip)
|
||||||
test -z "$ZIP" && AC_MSG_ERROR([zip is required])
|
test -z "$ZIP" && AC_MSG_ERROR([zip is required])
|
||||||
AC_PATH_PROG(UNZIP, unzip)
|
|
||||||
test -z "$UNZIP" && AC_MSG_ERROR([unzip is required])
|
|
||||||
if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
|
if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
|
||||||
AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
|
AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_PATH_PROG(UNZIP, unzip)
|
||||||
|
test -z "$UNZIP" && AC_MSG_ERROR([unzip is required])
|
||||||
|
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
dnl Zip must be a specific type for different build types.
|
dnl Zip must be a specific type for different build types.
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
|
|
Loading…
Reference in a new issue