From 9f3620a5787c65a49d48f5bf4d67c293cd980831 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Tue, 24 Jul 2018 11:43:45 -0400 Subject: [PATCH] CI: Use bundled jansson if needed. Use pkg-config to determine if jansson is at least 2.11, enabled bundled version otherwise. Change-Id: Ib555a8b72ff6f6925f9280ef035caa0b91ca4bd2 --- tests/CI/buildAsterisk.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh index b48da23626..5cf7a4667d 100755 --- a/tests/CI/buildAsterisk.sh +++ b/tests/CI/buildAsterisk.sh @@ -58,9 +58,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 >= 2.11' || 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" export WGET_EXTRA_ARGS="--quiet"