]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
CI: Use bundled jansson if needed.
authorCorey Farrell <git@cfware.com>
Tue, 24 Jul 2018 15:43:45 +0000 (11:43 -0400)
committerCorey Farrell <git@cfware.com>
Tue, 9 Oct 2018 07:32:06 +0000 (02:32 -0500)
Use pkg-config to determine if jansson is installed, enabled bundled
version otherwise.

Change-Id: Ib555a8b72ff6f6925f9280ef035caa0b91ca4bd2

tests/CI/buildAsterisk.sh

index d9c86784340336af859b288c7cefea7119cf1ab3..65afe786b943f1b4e46db4f9bb83be77f77220ab 100755 (executable)
@@ -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