diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5a89cd9aa..23ce6caff 100644 --- a/configure.ac +++ b/configure.ac @@ -1427,7 +1427,7 @@ fi AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>]) # Dirmngr requires mmap on Unix systems. -if test $ac_cv_func_mmap != yes -a $mmap_needed = yes; then +if test $ac_cv_func_mmap != yes && test $mmap_needed = yes; then AC_MSG_ERROR([[Sorry, the current implementation requires mmap.]]) fi @@ -1611,7 +1611,8 @@ fi AC_SUBST(LIBTSS_LIBS) AC_SUBST(LIBTSS_CFLAGS) AM_CONDITIONAL(HAVE_LIBTSS, test "$have_libtss" != no) -AM_CONDITIONAL(TEST_LIBTSS, test -n "$SWTPM" -o -n "$TPMSERVER" -a -n "$TSSSTARTUP") +AM_CONDITIONAL(TEST_LIBTSS, [test -n "$SWTPM" \ + || { test -n "$TPMSERVER" && test -n "$TSSSTARTUP; }"]) AC_SUBST(HAVE_LIBTSS) # @@ -2146,7 +2147,7 @@ echo " TOFU support: $use_tofu Tor support: $show_tor_support " -if test "$have_libtss" != no -a -z "$TPMSERVER" -a -z "$SWTPM"; then +if test "$have_libtss" != no && test -z "$TPMSERVER" && test -z "$SWTPM"; then cat <<G10EOF Warning: TPM support is compiled in but no software TPM for testing was discovered. TPM tests are disabled |