From fbe505211cdbee2327ba3938bc1483ce78425c89 Mon Sep 17 00:00:00 2001 From: Bill Roberts Date: Thu, 5 Sep 2024 10:43:47 -0500 Subject: [PATCH] Revert "Fix help for FAPI configure option" --enable-fapi was left as a vestigil to not break packagers and conflicts with https://github.com/tpm2-software/tpm2-pkcs11/pull/824 We want folks to use `--with-fapi` everywhere, but keep supporting enable-fapi for backwards compat (for now, packagers can move over time). This reverts commit bb95e3a0dfc8aff7d206cb2d7d4b650a87b1aea9. --- configure.ac | 2 +- docs/FAPI.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3da4447e..1ec6eb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,7 @@ AS_IF([test "x$esapi_sf" = "xyes"], AC_ARG_WITH( [fapi], - [AS_HELP_STRING([--enable-fapi], + [AS_HELP_STRING([--with-fapi], [enable or disable the fapi backend. Default is "auto" to autodetect])], [enable_fapi=$withval], [enable_fapi=auto]) diff --git a/docs/FAPI.md b/docs/FAPI.md index 8dbd29bb..0a2ff2b0 100644 --- a/docs/FAPI.md +++ b/docs/FAPI.md @@ -11,7 +11,7 @@ code was implemented using the Enhanced System API (ESAPI) and for on disk stora ## Build Time At the time the package is built, it will detect tss2-fapi library and automatically configure it's inclusion into the tpm2-pkcs11 library. One can *explicitly* configure this -with `--enable-fapi=yes|no`. +with `--with-fapi=yes|no`. ## Run Time @@ -23,8 +23,8 @@ You can take a few actions if you run into this issue: 1. Ignore them, and optionally disable FAPI error logging: - `export TSS2_LOG=fapi+NONE` -2. Reconfigure the package with `--enable-fapi=no`: - - `./configure --enable-fapi=no` +2. Reconfigure the package with `--with-fapi=no`: + - `./configure --with-fapi=no` 3. Provision FAPI using `tss2_provision`. See the tpm2-tools project for more information: -