diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2017-03-15 12:45:21 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-03-15 12:45:21 -0500 |
| commit | aa5d108caa7aec38290224ea0bd8284354d97bfa (patch) | |
| tree | 10403619929237424ad8d7545f06fb1dfa29c71f | |
| parent | 947f1ebf861254c2544d6f1956ca7f31d1d393f7 (diff) | |
| parent | 658d59c683ff127a37b1be4635b38c360b74b46e (diff) | |
Merge "configure: Don't use the progress bar with curl when downloading to stdout" into 13
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7901,7 +7901,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" + DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' else # Extract the first word of "fetch", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 039648a43..12f4a34dd 100644 --- a/configure.ac +++ b/configure.ac @@ -319,7 +319,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" + DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' else AC_PATH_PROG([FETCH], [fetch], [:]) |