<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9065">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject_bundled: Repair ./configure --with-ssl=PATH.<br><br>Previously, Asterisk did not tell its bundled PJProject about this configure<br>parameter. Therefore, PJProject used the platform provided OpenSSL always.<br><br>ASTERISK-27880<br><br>Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6<br>---<br>M configure<br>M third-party/pjproject/configure.m4<br>2 files changed, 34 insertions(+), 0 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 9307014..bde00f8 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -9234,6 +9234,23 @@</span><br><span> if test "$host" != "$this_host" ; then</span><br><span> PJPROJECT_CONFIGURE_OPTS+=" --host=$host"</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+ # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ case $with_ssl in</span><br><span style="color: hsl(120, 100%, 40%);">+ n|no)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ # This is the default value in PJProject and means "autodetect".</span><br><span style="color: hsl(120, 100%, 40%);">+ # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span> export NOISY_BUILD</span><br><span>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4</span><br><span>index 9b70e09..ecdd138 100644</span><br><span>--- a/third-party/pjproject/configure.m4</span><br><span>+++ b/third-party/pjproject/configure.m4</span><br><span>@@ -54,6 +54,23 @@</span><br><span> if test "$host" != "$this_host" ; then</span><br><span> PJPROJECT_CONFIGURE_OPTS+=" --host=$host"</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+ # This was a copy of the autoconf generated code from the root ./configure.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Hopefully, when you read this, the code is still the same.</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "${with_ssl+set}" = set; then :</span><br><span style="color: hsl(120, 100%, 40%);">+ case $with_ssl in</span><br><span style="color: hsl(120, 100%, 40%);">+ n|no)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ y|ye|yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ # This is the default value in PJProject and means "autodetect".</span><br><span style="color: hsl(120, 100%, 40%);">+ # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --enable-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ *)</span><br><span style="color: hsl(120, 100%, 40%);">+ PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span> export NOISY_BUILD</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9065">change 9065</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/9065"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6 </div>
<div style="display:none"> Gerrit-Change-Number: 9065 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>