From: Corey Farrell <git@cfware.com>
Date: Tue, 24 Jul 2018 15:43:45 +0000 (-0400)
Subject: CI: Use bundled jansson if needed.
X-Git-Tag: 13.24.0-rc1~56^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be3d4a7302214f1982797f8b8571983c1cf3ed7;p=thirdparty%2Fasterisk.git

CI: Use bundled jansson if needed.

Use pkg-config to determine if jansson is installed, enabled bundled
version otherwise.

Change-Id: Ib555a8b72ff6f6925f9280ef035caa0b91ca4bd2
---

diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh
index d9c8678434..65afe786b9 100755
--- a/tests/CI/buildAsterisk.sh
+++ b/tests/CI/buildAsterisk.sh
@@ -73,9 +73,11 @@ runner ccache -s
 runner ulimit -a
 
 MAKE=`which make`
+PKGCONFIG=`which pkg-config`
 [ -d /usr/lib64 ] && _libdir=/usr/lib64
 
 common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
+$PKGCONFIG 'jansson' || common_config_args+=" --with-jansson-bundled"
 common_config_args+=" ${CACHE_DIR:+--with-sounds-cache=${CACHE_DIR}/sounds --with-externals-cache=${CACHE_DIR}/externals}"
 common_config_args+=" --enable-dev-mode"
 if [ $COVERAGE -eq 1 ] ; then