Merge "install_prereq: For PJProject, point users to configure script."

This commit is contained in:
Jenkins2
2018-01-25 07:46:31 -06:00
committed by Gerrit Code Review

View File

@@ -147,7 +147,7 @@ install_unpackaged() {
echo "*** Installing NBS (Network Broadcast Sound) ***" echo "*** Installing NBS (Network Broadcast Sound) ***"
svn co http://svn.digium.com/svn/nbs/trunk nbs-trunk svn co http://svn.digium.com/svn/nbs/trunk nbs-trunk
cd nbs-trunk cd nbs-trunk
make && make install make all install
cd .. cd ..
# Only install libresample if it wasn't installed via package # Only install libresample if it wasn't installed via package
@@ -155,7 +155,8 @@ install_unpackaged() {
echo "*** Installing libresample ***" echo "*** Installing libresample ***"
svn co http://svn.digium.com/svn/thirdparty/libresample/trunk libresample-trunk svn co http://svn.digium.com/svn/thirdparty/libresample/trunk libresample-trunk
cd libresample-trunk cd libresample-trunk
./configure && make && make install ./configure
make all install
cd .. cd ..
fi fi
@@ -164,7 +165,8 @@ install_unpackaged() {
echo "*** Installing jansson ***" echo "*** Installing jansson ***"
wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf - wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf -
cd jansson-${JANSSON_VER} cd jansson-${JANSSON_VER}
./configure && make all && make install ./configure
make all install
cd .. cd ..
echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
/sbin/ldconfig /sbin/ldconfig
@@ -177,27 +179,16 @@ install_unpackaged() {
wget -O - http://github.com/cisco/libsrtp/archive/v2.tar.gz | zcat | tar -xf - wget -O - http://github.com/cisco/libsrtp/archive/v2.tar.gz | zcat | tar -xf -
cd libsrtp-2 cd libsrtp-2
./configure --enable-openssl ./configure --enable-openssl
make shared_library uninstall install make shared_library install
cd .. cd ..
echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
/sbin/ldconfig /sbin/ldconfig
fi fi
fi fi
# Only install pjproject if it wasn't installed via package
if ! test -f /usr/include/pjlib.h; then if ! test -f /usr/include/pjlib.h; then
echo "*** Installing pjproject ***" echo "PJProject not installed, yet. Therefore, please, run"
if [ ! -d pjproject ]; then echo "./configure --with-pjproject-bundled"
git clone https://github.com/asterisk/pjproject.git
cd pjproject
else
cd pjproject
git pull
fi
./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
cd ..
echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
/sbin/ldconfig
fi fi
} }