[asterisk-commits] install prereq: Remove unpackaged version of jansson. (asterisk[master])

[SVN commits to the Asterisk project]

Richard Mudgett has submitted this change and it was merged. ( https://gerrit.asterisk.org/10167 )

Change subject: install_prereq: Remove unpackaged version of jansson.
......................................................................

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
---
M contrib/scripts/install_prereq
1 file changed, 0 insertions(+), 18 deletions(-)

Approvals:
  Sean Bright: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved; Approved for Submit



diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index dfeb36f..c321703 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -164,8 +164,6 @@
 
 KVERS=`uname -r`
 
-JANSSON_VER=2.11
-
 case "$1" in
 test)
 	testcmd=echo
@@ -349,22 +347,6 @@
 		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

-- 
To view, visit https://gerrit.asterisk.org/10167
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ideab1f65419608d3795aa608e9da873823cc42d3
Gerrit-Change-Number: 10167
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20180919/8fddb080/attachment.html>