diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2023-10-03 09:55:02 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-10-06 02:54:44 +0200 |
| commit | 0494ec8f4d6399336f3202a23144f4afe734aede (patch) | |
| tree | 1c8df741df59fd9f5c2389f0ecaa425c2ba3e200 /configure.ac | |
| parent | tools: Add TPM2DAEMON_SOCK_NAME for --remove-socketdir. (diff) | |
| download | gnupg2-0494ec8f4d6399336f3202a23144f4afe734aede.tar.xz gnupg2-0494ec8f4d6399336f3202a23144f4afe734aede.zip | |
build: Simplify detecting a TPM emulator.
* configure.ac (TPMSERVER): Don't supply hard-coded path.
(SWTPM, SWTPM_IOCTL, TSSSTARTUP): Likewise.
--
Cherry-picked from master commit of:
f2ca727978da5b1ed84f97bf37d604e8a4e60091
Having hard-coded path has bad side effect; It may not be detected
even if it's available with PATH.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6f544bf98..6536810f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1613,10 +1613,10 @@ if test "$build_tpm2d" = "yes"; then if test "$have_libtss" != no; then AC_DEFINE(HAVE_LIBTSS, 1, [Defined if we have TPM2 support library]) # look for a TPM emulator for testing - AC_PATH_PROG(TPMSERVER, tpm_server,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) - AC_PATH_PROG(SWTPM, swtpm,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) - AC_PATH_PROG(SWTPM_IOCTL, swtpm_ioctl,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) - AC_PATH_PROG(TSSSTARTUP, tssstartup,,/bin:/usr/bin:/usr/lib/ibmtss:/usr/libexec/ibmtss) + AC_PATH_PROG(TPMSERVER, tpm_server) + AC_PATH_PROG(SWTPM, swtpm) + AC_PATH_PROG(SWTPM_IOCTL, swtpm_ioctl) + AC_PATH_PROG(TSSSTARTUP, tssstartup) fi fi if test "$have_libtss" = no; then |