diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-06-14 16:19:03 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-06-14 16:19:03 -0700 |
| commit | 3956dbc4dabbd3ec88bb7beed476f18006c04075 (patch) | |
| tree | 356e13e4f0f791ebec4523cf5b9fc286a4f93fa1 | |
| parent | 11cb75716fcb7dc17be05087f136ec1cf1d015aa (diff) | |
| download | openssl_tpm2_engine-3956dbc4dabbd3ec88bb7beed476f18006c04075.tar.gz | |
configure.ac: Update for ibmtss2 changes
As of version 1234, the ibmtss2 is now in libibmtss not in libtss and
also requires -DTPM_POSIX or -DTPM_WINDOWS to be provided on the
command line. Fix for this by adding libibmtss to the path check for
the TSS library and unconditionally adding -DTPM_POSIX.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9883df0..4d382de 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,10 @@ if test "$test_CFLAGS" != set; then fi fi +## +# ibmtss >= 1234 now requires TPM_POSIX be set +CFLAGS="$CFLAGS -DTPM_POSIX" + #if test "${OPENSSL_LIB_DIR+set}" != set; then # OPENSSL_LIB_DIR="/usr/local/ssl/lib" #fi @@ -69,8 +73,8 @@ AC_SUBST(enginesdir) PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES([DEPS], [libcrypto]) -AC_SEARCH_LIBS([TSS_Create], [tss], [], [ - AC_MSG_ERROR([Unable to find libtss]) +AC_SEARCH_LIBS([TSS_Create], [tss ibmtss], [], [ + AC_MSG_ERROR([Unable to find the TSS2 library]) ]) AC_DISABLE_STATIC |