<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14379">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject: Remove bashism from configure.m4 script<br><br>The configure.m4 script for pjproject contains some += syntax, which<br>is specific to bash, replacing it with string substitutions makes<br>the script compatible with traditional Bourne shells.<br><br>ASTERISK-28866 #close<br>Reported-by: Christoph Moench-Tegeder <cmt@FreeBSD.org><br><br>Change-Id: I382a78160e028044598b7da83ec7e1ff42b91c05<br>---<br>M configure<br>M third-party/pjproject/configure.m4<br>2 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 81de6e0..f794797 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -9238,25 +9238,25 @@</span><br><span> </span><br><span> this_host=$(./config.sub $(./config.guess))</span><br><span> if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"</span><br><span> fi</span><br><span> if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"</span><br><span> fi</span><br><span> # This was a copy of the autoconf generated code from the root ./configure.</span><br><span> # Hopefully, when you read this, the code is still the same.</span><br><span> if test "${with_ssl+set}" = set; then :</span><br><span> case $with_ssl in</span><br><span> n|no)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"</span><br><span> ;;</span><br><span> y|ye|yes)</span><br><span> # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span> # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"</span><br><span> ;;</span><br><span> *)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"</span><br><span> ;;</span><br><span> esac</span><br><span> fi</span><br><span>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4</span><br><span>index 7cbb307..485e4f1 100644</span><br><span>--- a/third-party/pjproject/configure.m4</span><br><span>+++ b/third-party/pjproject/configure.m4</span><br><span>@@ -51,25 +51,25 @@</span><br><span> AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])</span><br><span> this_host=$(./config.sub $(./config.guess))</span><br><span> if test "$build" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"</span><br><span> fi</span><br><span> if test "$host" != "$this_host" ; then</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"</span><br><span> fi</span><br><span> # This was a copy of the autoconf generated code from the root ./configure.</span><br><span> # Hopefully, when you read this, the code is still the same.</span><br><span> if test "${with_ssl+set}" = set; then :</span><br><span> case $with_ssl in</span><br><span> n|no)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"</span><br><span> ;;</span><br><span> y|ye|yes)</span><br><span> # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span> # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=""</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"</span><br><span> ;;</span><br><span> *)</span><br><span style="color: hsl(0, 100%, 40%);">- PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"</span><br><span> ;;</span><br><span> esac</span><br><span> fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14379">change 14379</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/14379"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I382a78160e028044598b7da83ec7e1ff42b91c05 </div>
<div style="display:none"> Gerrit-Change-Number: 14379 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Guido Falsi <madpilot@freebsd.org> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>