diff options
| author | Дилян Палаузов <git-dpa@aegee.org> | 2019-03-28 13:32:12 +0000 |
|---|---|---|
| committer | Tadeusz Struk <tadeusz.struk@intel.com> | 2019-03-29 15:04:17 -0700 |
| commit | c3fc89d0270884f27421b8f1d094ac6bf5016d69 (patch) | |
| tree | 3342fdbc2fe4ce45208a5f5900f1c9a363146912 /Makefile.am | |
| parent | 195073263398eda9735fd12fb6f2602d823602eb (diff) | |
| download | tpm2-tss-c3fc89d0270884f27421b8f1d094ac6bf5016d69.tar.gz | |
configure.ac: check for libcrypto/libssl with PKG_CHECK_MODULES
• Makefile.am: instead of linking libtss2-esys with -lssl -lcrypto, link with
$(LIBCRYPTO_LIBS) $(LIBSSL_LIBS). Use $(LIBSSL_CFLAGS) and
$(LIBCRYPTO_CFLAGS) as CFLAGS for the library.
• Makefile-test.am:
* likewise for the ESYS unit tests.
* NB: test/unit/esys_context_null uses $(esyscryLDFLAGS) but not $(esyscryCFLAGS)
test/integration/esys_policy_ticket.int uses $(esyscryCFLAGS) but not
$(esysLDFLAGS)
• Discontinue linking libtss2-sys.so, libtss2-mu.so, libtss2-tcti-mssim.so and
libtss2-tcti-device.so with -lcrypto, but on --with-crypto=gcrypt continue
linking them with -lgcrypt.
• configure.ac: When --with-crypto=ossl --enable-esapi --enable-integration is used,
don't check a second time for libcrypto.
Signed-Off-By: Дилян Палаузов <git-dpa@aegee.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 82370802..b981a7ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -278,8 +278,10 @@ src_tss2_esys_libtss2_esys_la_LIBADD = $(libtss2_sys) $(libtss2_mu) \ if ESYS_OSSL TSS2_ESYS_SRC += src/tss2-esys/esys_crypto_ossl.h src/tss2-esys/esys_crypto_ossl.c -src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-esys -DOSSL -src_tss2_esys_libtss2_esys_la_LDFLAGS = $(AM_LDFLAGS) $(LIBDL_LDFLAGS) $(LIBSOCKET_LDFLAGS) -lssl -lcrypto +src_tss2_esys_libtss2_esys_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/tss2-esys -DOSSL \ + $(LIBSSL_CFLAGS) $(LIBCRYPTO_CFLAGS) +src_tss2_esys_libtss2_esys_la_LDFLAGS = $(AM_LDFLAGS) $(LIBDL_LDFLAGS) $(LIBSOCKET_LDFLAGS) \ + $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) else if ESYS_GCRYPT TSS2_ESYS_SRC += src/tss2-esys/esys_crypto_gcrypt.h src/tss2-esys/esys_crypto_gcrypt.c |