kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "configure: Don't use the progress bar with curl when downloading to stdout" into 13

Browse Source
This commit is contained in:
zuul
2017-03-15 12:45:21 -05:00
committed by Gerrit Code Review
parent 947f1ebf86 658d59c683
commit aa5d108caa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -7901,7 +7901,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar" DOWNLOAD_TO_STDOUT="${CURL} -Ls"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
# Extract the first word of "fetch", so it can be a program name with args. # Extract the first word of "fetch", so it can be a program name with args.

2
configure.ac
View File

@@ -319,7 +319,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -L --progress-bar" DOWNLOAD_TO_STDOUT="${CURL} -Ls"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
else else
AC_PATH_PROG([FETCH], [fetch], [:]) AC_PATH_PROG([FETCH], [fetch], [:])