From 44280a1901d01844008983b9ac91bbce3a20acb7 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 20 Sep 2016 11:51:59 +0200 Subject: travis: Don't disable connmark and forecast plugins anymore They build fine on Ubuntu 14.04. --- scripts/test.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 68ad1d664..3a7c9d1a9 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -37,11 +37,7 @@ all) --disable-systemd --disable-soup --disable-unwind-backtraces --disable-svc --disable-dbghelp-backtraces --disable-socket-win --disable-kernel-wfp --disable-kernel-iph --disable-winhttp" - if test "$MONOLITHIC" = "yes"; then - # Ubuntu 12.04 does not provide a proper -liptc pkg-config - CONFIG="$CONFIG --disable-forecast --disable-connmark" - fi - # Ubuntu 12.04 does not provide libtss2-dev + # Ubuntu 14.04 does provide a too old libtss2-dev CONFIG="$CONFIG --disable-aikpub2 --disable-tss-tss2" # not enabled on the build server CONFIG="$CONFIG --disable-af-alg" -- cgit v1.2.3