diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-13 19:37:07 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-13 19:37:07 -0400 |
| commit | 7d77b8880d571447825bb6b0d61683d2e9d58895 (patch) | |
| tree | c8e5a0bdc1faee5d4f614a12790da714c4e6c01f | |
| parent | 303608c1bcf9568371625fbbd9442946cadba422 (diff) | |
| download | systemd-7d77b8880d571447825bb6b0d61683d2e9d58895.tar.gz | |
build-sys: enable tpm by default
It's been on in Fedora for ages, and it seems strange to have
a feature that's off by default.
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index c7537aafc0..eafe77e635 100644 --- a/configure.ac +++ b/configure.ac @@ -1431,16 +1431,10 @@ AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes]) # ------------------------------------------------------------------------------ have_tpm=no -AC_ARG_ENABLE([tpm], AS_HELP_STRING([--enable-tpm], [enable optional TPM support]), - [case "${enableval}" in - yes) have_tpm=yes ;; - no) have_tpm=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-tpm) ;; - esac], - [have_tpm=no]) - -if test "x${have_tpm}" != xno ; then +AC_ARG_ENABLE(tpm, AS_HELP_STRING([--disable-tpm], [disable optional support])) +if test "x${enable_tpm}" != xno ; then AC_DEFINE(SD_BOOT_LOG_TPM, 1, [Define if TPM should be used to log events and extend the registers]) + have_tpm=yes fi AC_ARG_WITH(tpm-pcrindex, diff --git a/meson_options.txt b/meson_options.txt index 1594fec41f..0cd8fb02e7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,7 +47,7 @@ option('resolve', type : 'boolean', description : 'systemd-resolved stack') option('efi', type : 'boolean', description : 'enable systemd-boot and bootctl') -option('tpm', type : 'boolean', value : false, +option('tpm', type : 'boolean', value : true, description : 'TPM should be used to log events and extend the registers') option('environment-d', type : 'boolean', description : 'support for environment.d') |