Skip to content

Commit

Permalink
Fix help for FAPI configure option
Browse files Browse the repository at this point in the history
FAPI support is controlled by --enable-fapi, not --with-fapi. Fix the
help in configure.ac and the associated documentation.

Signed-off-by: Jonathan McDowell <noodles@earth.li>
  • Loading branch information
u1f35c authored and williamcroberts committed Sep 5, 2024
1 parent fab3140 commit bb95e3a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ AS_IF([test "x$esapi_sf" = "xyes"],

AC_ARG_WITH(
[fapi],
[AS_HELP_STRING([--with-fapi],
[AS_HELP_STRING([--enable-fapi],
[enable or disable the fapi backend. Default is "auto" to autodetect])],
[enable_fapi=$withval],
[enable_fapi=auto])
Expand Down
6 changes: 3 additions & 3 deletions docs/FAPI.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `--with-fapi=yes|no`.
with `--enable-fapi=yes|no`.

## Run Time

Expand All @@ -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 `--with-fapi=no`:
- `./configure --with-fapi=no`
2. Reconfigure the package with `--enable-fapi=no`:
- `./configure --enable-fapi=no`

3. Provision FAPI using `tss2_provision`. See the tpm2-tools project for more information:
- <https://github.com/tpm2-software/tpm2-tools/blob/master/man/tss2_provision.1.md>
Expand Down

1 comment on commit bb95e3a

@williamcroberts
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverting.

Please sign in to comment.