Merge "BuildSystem: When no download utility is available, display the explanation."
This commit is contained in:
commit
e905b232f1
|
@ -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
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -286,6 +286,9 @@ AC_PATH_PROG([PATCH], [patch], :)
|
|||
AC_PATH_PROG([SED], [sed], :)
|
||||
AC_PATH_PROG([NM], [nm], :)
|
||||
|
||||
DOWNLOAD=":"
|
||||
DOWNLOAD_TO_STDOUT=
|
||||
DOWNLOAD_TIMEOUT=
|
||||
if test "${WGET}" != ":" ; then
|
||||
DOWNLOAD=${WGET}
|
||||
DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
|
||||
|
@ -295,13 +298,14 @@ else if test "${CURL}" != ":" ; then
|
|||
DOWNLOAD_TO_STDOUT="${CURL} -Ls"
|
||||
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
|
||||
else
|
||||
AC_PATH_PROG([FETCH], [fetch], [:])
|
||||
DOWNLOAD=${FETCH}
|
||||
DOWNLOAD_TO_STDOUT="${FETCH} -o-"
|
||||
DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
|
||||
AC_PATH_PROG([FETCH], [fetch], :)
|
||||
if test "${FETCH}" != ":" ; then
|
||||
DOWNLOAD=${FETCH}
|
||||
DOWNLOAD_TO_STDOUT="${FETCH} -o-"
|
||||
DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(DOWNLOAD)
|
||||
AC_SUBST(DOWNLOAD_TO_STDOUT)
|
||||
AC_SUBST(DOWNLOAD_TIMEOUT)
|
||||
|
|
|
@ -127,9 +127,9 @@ have_download:
|
|||
@if test "$(DOWNLOAD)" = ":" ; then \
|
||||
echo "**************************************************"; \
|
||||
echo "*** ***"; \
|
||||
echo "*** You must have either wget or fetch to be ***"; \
|
||||
echo "*** able to automatically download and install ***"; \
|
||||
echo "*** the requested sound packages. ***"; \
|
||||
echo "*** You must have either wget, curl, or fetch ***"; \
|
||||
echo "*** to be able to automatically download and ***"; \
|
||||
echo "*** install the requested sound packages. ***"; \
|
||||
echo "*** ***"; \
|
||||
echo "*** Please install one of these, or remove any ***"; \
|
||||
echo "*** extra sound package selections in ***"; \
|
||||
|
|
|
@ -16,7 +16,7 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
|
|||
AC_MSG_RESULT(configuring)
|
||||
|
||||
if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then
|
||||
AC_MSG_ERROR(A download utility (wget, curl or fetch) is required to download bundled pjproject)
|
||||
AC_MSG_ERROR(A download utility (wget, curl, or fetch) is required to download bundled pjproject)
|
||||
fi
|
||||
if test "${BZIP2}" = ":" ; then
|
||||
AC_MSG_ERROR(bzip2 is required to extract the pjproject tar file)
|
||||
|
|
Loading…
Reference in New Issue