Merge "pjproject-bundled: Fix checksum verification when using cURL"
This commit is contained in:
commit
0d9cfff45e
2 changed files with 2 additions and 2 deletions
2
configure
vendored
2
configure
vendored
|
@ -7966,7 +7966,7 @@ if test "${WGET}" != ":" ; then
|
|||
DOWNLOAD_TIMEOUT='--timeout=$1'
|
||||
else if test "${CURL}" != ":" ; then
|
||||
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
|
||||
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar -w \"%{url_effective}\n\""
|
||||
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar"
|
||||
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
|
||||
else
|
||||
# Extract the first word of "fetch", so it can be a program name with args.
|
||||
|
|
|
@ -297,7 +297,7 @@ if test "${WGET}" != ":" ; then
|
|||
DOWNLOAD_TIMEOUT='--timeout=$1'
|
||||
else if test "${CURL}" != ":" ; then
|
||||
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
|
||||
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar -w \"%{url_effective}\n\""
|
||||
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar"
|
||||
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
|
||||
else
|
||||
AC_PATH_PROG([FETCH], [fetch], [:])
|
||||
|
|
Loading…
Reference in a new issue