<p>Richard Mudgett <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10167">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">install_prereq: Remove unpackaged version of jansson.<br><br>This is removed in favor of ./configure --with-jansson-bundled.  The<br>install-unpackaged command would only install jansson once, so once<br>installed it would never update, where the bundled copy will be kept up<br>to date.<br><br>Change-Id: Ideab1f65419608d3795aa608e9da873823cc42d3<br>---<br>M contrib/scripts/install_prereq<br>1 file changed, 0 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq</span><br><span>index dfeb36f..c321703 100755</span><br><span>--- a/contrib/scripts/install_prereq</span><br><span>+++ b/contrib/scripts/install_prereq</span><br><span>@@ -164,8 +164,6 @@</span><br><span> </span><br><span> KVERS=`uname -r`</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-JANSSON_VER=2.11</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> case "$1" in</span><br><span> test)</span><br><span>    testcmd=echo</span><br><span>@@ -349,22 +347,6 @@</span><br><span>          cd ..</span><br><span>        fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  # Only install Jansson if it wasn't installed via package</span><br><span style="color: hsl(0, 100%, 40%);">-   if ! test -f /usr/include/jansson.h; then</span><br><span style="color: hsl(0, 100%, 40%);">-               echo "*** Installing jansson ***"</span><br><span style="color: hsl(0, 100%, 40%);">-             wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf -</span><br><span style="color: hsl(0, 100%, 40%);">-                cd jansson-${JANSSON_VER}</span><br><span style="color: hsl(0, 100%, 40%);">-               ./configure</span><br><span style="color: hsl(0, 100%, 40%);">-             make all install</span><br><span style="color: hsl(0, 100%, 40%);">-                cd ..</span><br><span style="color: hsl(0, 100%, 40%);">-           if test -d /etc/ld.so.conf.d; then</span><br><span style="color: hsl(0, 100%, 40%);">-                      echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf</span><br><span style="color: hsl(0, 100%, 40%);">-           else # for example: Slackware 14.2</span><br><span style="color: hsl(0, 100%, 40%);">-                      echo "/usr/local/lib" > /etc/ld.so.conf</span><br><span style="color: hsl(0, 100%, 40%);">-            fi</span><br><span style="color: hsl(0, 100%, 40%);">-              /sbin/ldconfig</span><br><span style="color: hsl(0, 100%, 40%);">-  fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   # Only install libsrtp2 if it wasn't installed via package</span><br><span>       if ! test -f /usr/include/srtp/srtp.h; then</span><br><span>          if ! test -f /usr/include/srtp2/srtp.h; then</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10167">change 10167</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/10167"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ideab1f65419608d3795aa608e9da873823cc42d3 </div>
<div style="display:none"> Gerrit-Change-Number: 10167 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>