diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-07-18 16:20:58 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2016-07-20 11:26:07 +0200 |
| commit | 0274163674fa822609c26b929c89278d28c318bc (patch) | |
| tree | 0f7b7a580120adb49e956fb21b305555808ae06f | |
| parent | 60d0f52fd6da3cb9ac379487344c4936e5f73882 (diff) | |
| download | strongswan-0274163674fa822609c26b929c89278d28c318bc.tar.bz2 strongswan-0274163674fa822609c26b929c89278d28c318bc.tar.xz | |
libtpmtss: Use pkconfig to configure TSS 2.0 includes and libraries
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/libtpmtss/Makefile.am | 5 | ||||
| -rw-r--r-- | src/libtpmtss/tpm_tss_tss2.c | 4 | ||||
| -rw-r--r-- | src/libtpmtss/tpm_tss_tss2_names.c | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3aa7d919e..875d98a5d 100644 --- a/configure.ac +++ b/configure.ac @@ -977,10 +977,11 @@ if test x$tss_trousers = xtrue; then fi if test x$tss_tss2 = xtrue; then - AC_CHECK_LIB([tss2],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([TTS 2.0 library libtss2 not found])],[]) - AC_CHECK_HEADER([tss2/tpm20.h],,[AC_MSG_ERROR([TSS 2.0 header tss2/tpm20.h not found!])]) - AC_DEFINE([TSS_TSS2], [], [use TSS 2.0 library libtss2]) + PKG_CHECK_MODULES(tss2, [tcti-socket], [AC_DEFINE([TSS_TSS2], [], [use TSS 2.0 libraries])]) + AC_SUBST(tss2_CFLAGS) + AC_SUBST(tss2_LIBS) fi + if test x$imv_swid = xtrue; then PKG_CHECK_MODULES(json, [json-c], [], [PKG_CHECK_MODULES(json, [json])]) diff --git a/src/libtpmtss/Makefile.am b/src/libtpmtss/Makefile.am index 8fcb44f6a..e2c159710 100644 --- a/src/libtpmtss/Makefile.am +++ b/src/libtpmtss/Makefile.am @@ -1,6 +1,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libstrongswan +AM_CFLAGS = \ + $(tss2_CFLAGS) + AM_LDFLAGS = \ -no-undefined @@ -16,7 +19,7 @@ libtpmtss_la_LIBADD = \ $(top_builddir)/src/libstrongswan/libstrongswan.la if USE_TSS2 -libtpmtss_la_LIBADD += -ltctisocket -ltss2 +libtpmtss_la_LIBADD += $(tss2_LIBS) endif if USE_TROUSERS diff --git a/src/libtpmtss/tpm_tss_tss2.c b/src/libtpmtss/tpm_tss_tss2.c index 39d9f2e4d..80c4388af 100644 --- a/src/libtpmtss/tpm_tss_tss2.c +++ b/src/libtpmtss/tpm_tss_tss2.c @@ -22,8 +22,8 @@ #include <asn1/oid.h> #include <bio/bio_reader.h> -#include <tss2/tpm20.h> -#include <tcti/tcti_socket.h> +#include <tpm20.h> +#include <tcti_socket.h> #define LABEL "TPM 2.0 -" diff --git a/src/libtpmtss/tpm_tss_tss2_names.c b/src/libtpmtss/tpm_tss_tss2_names.c index 9185aa374..a613ac566 100644 --- a/src/libtpmtss/tpm_tss_tss2_names.c +++ b/src/libtpmtss/tpm_tss_tss2_names.c @@ -17,7 +17,7 @@ #ifdef TSS_TSS2 -#include <tss2/tpm20.h> +#include <tpm20.h> #ifndef TPM_ALG_ECMQV #define TPM_ALG_ECMQV (TPM_ALG_ID)0x001D |