Problem: Travis does not build with NORM

Solution: install package and enable the build on some Linux jobs
This commit is contained in:
Luca Boccassi 2017-10-17 11:17:13 +01:00
parent 189b551b40
commit 5311aa9cd9
2 changed files with 8 additions and 2 deletions

View File

@ -41,7 +41,7 @@ matrix:
apt: apt:
packages: packages:
- valgrind - valgrind
- env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled PGM=enabled - env: BUILD_TYPE=default CURVE=libsodium GSSAPI=enabled PGM=enabled NORM=enabled
os: linux os: linux
addons: addons:
apt: apt:
@ -50,11 +50,12 @@ matrix:
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages: packages:
- libkrb5-dev - libkrb5-dev
- libnorm-dev
- libpgm-dev - libpgm-dev
- libsodium-dev - libsodium-dev
- asciidoc - asciidoc
- xmlto - xmlto
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled PGM=enabled - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled GSSAPI=enabled PGM=enabled NORM=enabled
os: linux os: linux
addons: addons:
apt: apt:
@ -63,6 +64,7 @@ matrix:
key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
packages: packages:
- libkrb5-dev - libkrb5-dev
- libnorm-dev
- libpgm-dev - libpgm-dev
- libsodium-dev - libsodium-dev
- env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled

View File

@ -44,6 +44,10 @@ if [ $BUILD_TYPE == "default" ]; then
CONFIG_OPTS+=("--with-pgm=yes") CONFIG_OPTS+=("--with-pgm=yes")
fi fi
if [ -n "$NORM" ] && [ "$NORM" == "enabled" ]; then
CONFIG_OPTS+=("--with-norm=yes")
fi
if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then
CONFIG_OPTS+=("--enable-drafts=no") CONFIG_OPTS+=("--enable-drafts=no")
elif [ $DRAFT == "enabled" ]; then elif [ $DRAFT == "enabled" ]; then