<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8562">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: When no download utility is available, display the explanation.<br><br>./configure --with-pjproject-bundled<br>did not display an explanation, when no download utility like wget, curl, or<br>fetch was installed beforehand, although an explanation existed in code. This<br>happened because the code expected the variable DOWNLOAD_TO_STDOUT to be empty.<br>However, the script ./configure set that variable always.<br><br>Change-Id: I64c99b76a03525c69471e5055bf124b36a51bbd4<br>---<br>M configure<br>M configure.ac<br>M sounds/Makefile<br>M third-party/pjproject/configure.m4<br>4 files changed, 21 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/62/8562/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index eeb7467..d9f3e8c 100755<br>--- a/configure<br>+++ b/configure<br>@@ -7773,6 +7773,9 @@<br> <br> <br> <br>+DOWNLOAD=":"<br>+DOWNLOAD_TO_STDOUT=<br>+DOWNLOAD_TIMEOUT=<br> if test "${WGET}" != ":" ; then<br>   DOWNLOAD=${WGET}<br>   DOWNLOAD_TO_STDOUT="${WGET} -q -O-"<br>@@ -7823,12 +7826,13 @@<br> fi<br> <br> <br>-  DOWNLOAD=${FETCH}<br>-  DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br>-  DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br>+  if test "${FETCH}" != ":" ; then<br>+    DOWNLOAD=${FETCH}<br>+    DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br>+    DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br>+  fi<br> fi<br> fi<br>-<br> <br> <br> <br>@@ -9161,7 +9165,7 @@<br> $as_echo "configuring" >&6; }<br> <br>         if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then<br>-            as_fn_error $? "A download utility (wget, curl or fetch) is required to download bundled pjproject" "$LINENO" 5<br>+          as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled pjproject" "$LINENO" 5<br>  fi<br>    if test "${BZIP2}" = ":" ; then<br>           as_fn_error $? "bzip2 is required to extract the pjproject tar file" "$LINENO" 5<br>diff --git a/configure.ac b/configure.ac<br>index c920bae..903f3fd 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -287,6 +287,9 @@<br> AC_PATH_PROG([SED], [sed], :)<br> AC_PATH_PROG([NM], [nm], :)<br> <br>+DOWNLOAD=":"<br>+DOWNLOAD_TO_STDOUT=<br>+DOWNLOAD_TIMEOUT=<br> if test "${WGET}" != ":" ; then<br>   DOWNLOAD=${WGET}<br>   DOWNLOAD_TO_STDOUT="${WGET} -q -O-"<br>@@ -297,12 +300,13 @@<br>   DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'<br> else<br>   AC_PATH_PROG([FETCH], [fetch], [:])<br>-  DOWNLOAD=${FETCH}<br>-  DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br>-  DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br>+  if test "${FETCH}" != ":" ; then<br>+    DOWNLOAD=${FETCH}<br>+    DOWNLOAD_TO_STDOUT="${FETCH} -o-"<br>+    DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'<br>+  fi<br> fi<br> fi<br>-<br> AC_SUBST(DOWNLOAD)<br> AC_SUBST(DOWNLOAD_TO_STDOUT)<br> AC_SUBST(DOWNLOAD_TIMEOUT)<br>diff --git a/sounds/Makefile b/sounds/Makefile<br>index 779d52a..606bbdc 100644<br>--- a/sounds/Makefile<br>+++ b/sounds/Makefile<br>@@ -127,9 +127,9 @@<br>   @if test "$(DOWNLOAD)" = ":" ; then \<br>             echo "**************************************************"; \<br>                echo "***                                            ***"; \<br>-               echo "*** You must have either wget or fetch to be   ***"; \<br>-               echo "*** able to automatically download and install ***"; \<br>-               echo "*** the requested sound packages.              ***"; \<br>+               echo "*** You must have either wget, curl, or fetch  ***"; \<br>+               echo "*** to be able to automatically download and   ***"; \<br>+               echo "*** install the requested sound packages.      ***"; \<br>                echo "***                                            ***"; \<br>                echo "*** Please install one of these, or remove any ***"; \<br>                echo "*** extra sound package selections in          ***"; \<br>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4<br>index c1edaf9..42482b2 100644<br>--- a/third-party/pjproject/configure.m4<br>+++ b/third-party/pjproject/configure.m4<br>@@ -16,7 +16,7 @@<br>    AC_MSG_RESULT(configuring)<br> <br>         if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then<br>-            AC_MSG_ERROR(A download utility (wget, curl or fetch) is required to download bundled pjproject)<br>+             AC_MSG_ERROR(A download utility (wget, curl, or fetch) is required to download bundled pjproject)<br>     fi<br>    if test "${BZIP2}" = ":" ; then<br>           AC_MSG_ERROR(bzip2 is required to extract the pjproject tar file)<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8562">change 8562</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8562"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I64c99b76a03525c69471e5055bf124b36a51bbd4 </div>
<div style="display:none"> Gerrit-Change-Number: 8562 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>