<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7834">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">install_prereq: For PJProject, point users to configure script.<br><br>The installation script and the new configure option --with-pjproject-bundled<br>aimed to accomplish the same. However, the installation script was out of<br>date. Users should go for the maintained configure option, or the Wiki.<br><br>ASTERISK-24598<br><br>Change-Id: Icbf4b562f81f7c05bd24a3805bd46c0beb4ebd44<br>---<br>M contrib/scripts/install_prereq<br>1 file changed, 8 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq<br>index e3b217c..cd2c3b6 100755<br>--- a/contrib/scripts/install_prereq<br>+++ b/contrib/scripts/install_prereq<br>@@ -147,7 +147,7 @@<br> echo "*** Installing NBS (Network Broadcast Sound) ***"<br> svn co http://svn.digium.com/svn/nbs/trunk nbs-trunk<br> cd nbs-trunk<br>- make && make install<br>+ make all install<br> cd ..<br> <br> # Only install libresample if it wasn't installed via package<br>@@ -155,7 +155,8 @@<br> echo "*** Installing libresample ***"<br> svn co http://svn.digium.com/svn/thirdparty/libresample/trunk libresample-trunk<br> cd libresample-trunk<br>- ./configure && make && make install<br>+ ./configure<br>+ make all install<br> cd ..<br> fi<br> <br>@@ -164,7 +165,8 @@<br> echo "*** Installing jansson ***"<br> wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf -<br> cd jansson-${JANSSON_VER}<br>- ./configure && make all && make install<br>+ ./configure<br>+ make all install<br> cd ..<br> echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf<br> /sbin/ldconfig<br>@@ -177,27 +179,16 @@<br> wget -O - http://github.com/cisco/libsrtp/archive/v2.tar.gz | zcat | tar -xf -<br> cd libsrtp-2<br> ./configure --enable-openssl<br>- make shared_library uninstall install<br>+ make shared_library install<br> cd ..<br> echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf<br> /sbin/ldconfig<br> fi<br> fi<br> <br>- # Only install pjproject if it wasn't installed via package<br> if ! test -f /usr/include/pjlib.h; then<br>- echo "*** Installing pjproject ***"<br>- if [ ! -d pjproject ]; then<br>- git clone https://github.com/asterisk/pjproject.git<br>- cd pjproject<br>- else<br>- cd pjproject<br>- git pull<br>- fi<br>- ./configure CFLAGS="-DNDEBUG -DPJ_HAS_IPV6=1" --enable-shared --with-external-speex --with-external-gsm --with-external-srtp --disable-sound --disable-resample && make && make install<br>- cd ..<br>- echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf<br>- /sbin/ldconfig<br>+ echo "PJProject not installed, yet. Therefore, please, run"<br>+ echo "./configure --with-pjproject-bundled"<br> fi<br> }<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7834">change 7834</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/7834"/><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: Icbf4b562f81f7c05bd24a3805bd46c0beb4ebd44 </div>
<div style="display:none"> Gerrit-Change-Number: 7834 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: 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>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>