Skip to content
Snippets Groups Projects
Unverified Commit 246c39e4 authored by Corey Farrell's avatar Corey Farrell
Browse files

install_prereq: Remove unpackaged version of jansson.

This is removed in favor of ./configure --with-jansson-bundled.  The
install-unpackaged command would only install jansson once, so once
installed it would never update, where the bundled copy will be kept up
to date.

Change-Id: Ideab1f65419608d3795aa608e9da873823cc42d3
parent ad602bb2
No related branches found
No related tags found
No related merge requests found
......@@ -164,8 +164,6 @@ PACKAGES_DBSD="$PACKAGES_DBSD bzip2 patch python"
KVERS=`uname -r`
JANSSON_VER=2.11
case "$1" in
test)
testcmd=echo
......@@ -349,22 +347,6 @@ install_unpackaged() {
cd ..
fi
# Only install Jansson if it wasn't installed via package
if ! test -f /usr/include/jansson.h; then
echo "*** Installing jansson ***"
wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf -
cd jansson-${JANSSON_VER}
./configure
make all install
cd ..
if test -d /etc/ld.so.conf.d; then
echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
else # for example: Slackware 14.2
echo "/usr/local/lib" > /etc/ld.so.conf
fi
/sbin/ldconfig
fi
# Only install libsrtp2 if it wasn't installed via package
if ! test -f /usr/include/srtp/srtp.h; then
if ! test -f /usr/include/srtp2/srtp.h; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment