From 88dfea52cfc49fa2973f2c12ef14885e45e5baf6 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Mon, 24 Jul 2017 14:08:25 -0400 Subject: [PATCH] tpm2: Build libtpms with TPM 2 code now Now that patches for writing the state into files and extensions to their headers have all been applied we can build the TPM 2 code into the library. Signed-off-by: Stefan Berger --- .travis.yml | 6 ++++-- configure.ac | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93caa4e4..f8cbeb76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: c dist: trusty before_install: -- sudo apt-get install automake autoconf libtool libssl-dev sed make gawk sed bash dh-exec -script: "./bootstrap.sh && ./configure --with-openssl --prefix=/usr && +- sudo apt-get install automake autoconf libtool libssl-dev sed make gawk sed bash + dh-exec +script: "./bootstrap.sh && ./configure --with-openssl --prefix=/usr --with-tpm2 && make -j4 check" env: global: @@ -16,3 +17,4 @@ addons: build_command_prepend: "./bootstrap.sh; ./configure --with-openssl --with-tpm2; make clean" build_command: make -j4 branch_pattern: coverity_scan +script: ./bootstrap.sh && ./configure --with-openssl --prefix=/usr --with-tpm2 && make -j4 check diff --git a/configure.ac b/configure.ac index bceb5e2e..900de12a 100644 --- a/configure.ac +++ b/configure.ac @@ -196,12 +196,6 @@ fi if test -z "$with_tpm2"; then with_tpm2=no fi -if test "x$with_tpm2" = "xyes"; then - # remove the following to compile anyway; created vTPM state - # will not be compatible - AC_MSG_ERROR([Not compiling with TPM2 support]) - exit 1 -fi echo echo "CFLAGS=$CFLAGS"