diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-19 10:19:29 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-19 10:19:29 -0500 |
commit | e905b232f135d354c972b4e27f1205a3cd0848e8 (patch) | |
tree | 72710c60b9e0efe41f782ecd414ed9054824d6e2 /configure | |
parent | a12976e20ac5424ab2ad2a2cf7a47970542ee43c (diff) | |
parent | f697025ae5b9f4b04f2e38cda766e4d5e0058baf (diff) |
Merge "BuildSystem: When no download utility is available, display the explanation."
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -7816,6 +7816,9 @@ fi +DOWNLOAD=":" +DOWNLOAD_TO_STDOUT= +DOWNLOAD_TIMEOUT= if test "${WGET}" != ":" ; then DOWNLOAD=${WGET} DOWNLOAD_TO_STDOUT="${WGET} -q -O-" @@ -7866,16 +7869,17 @@ $as_echo "no" >&6; } fi - DOWNLOAD=${FETCH} - DOWNLOAD_TO_STDOUT="${FETCH} -o-" - DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)' + if test "${FETCH}" != ":" ; then + DOWNLOAD=${FETCH} + DOWNLOAD_TO_STDOUT="${FETCH} -o-" + DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)' + fi fi fi - # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -9204,7 +9208,7 @@ $as_echo_n "checking for embedded pjproject (may have to download)... " >&6; } $as_echo "configuring" >&6; } if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then - as_fn_error $? "A download utility (wget, curl or fetch) is required to download bundled pjproject" "$LINENO" 5 + as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled pjproject" "$LINENO" 5 fi if test "${BZIP2}" = ":" ; then as_fn_error $? "bzip2 is required to extract the pjproject tar file" "$LINENO" 5 |