diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-03-15 11:40:33 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-03-15 11:40:34 -0500 |
| commit | 2fc0c228a24096a0ca0285059d0172fcb7921fe3 (patch) | |
| tree | 1347bbc102e3cf5735a36ee81db0d14e75818a93 | |
| parent | 77334fcd6c647f7b30ef9d1af311c593ebe34ea9 (diff) | |
| parent | dfa689cf94077759f77260af7ec65739e0316f6b (diff) | |
Merge "configure: Don't use the progress bar with curl when downloading to stdout" into 14
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7976,7 +7976,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 9727fb9cb..d9a800ae2 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,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], [:]) |