commit 9c33d36113447d38decd22d177e62fb225826d78 Author: David Goulet <dgoulet@torproject.org> Date: Thu Jan 30 11:18:34 2020 -0500 configure: Fix and improve summary pretty printing Fixes #32230 Signed-off-by: David Goulet <dgoulet@torproject.org> --- changes/ticket32230 | 3 +++ configure.ac | 36 +++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/changes/ticket32230 b/changes/ticket32230 new file mode 100644 index 000000000..781ba8087 --- /dev/null +++ b/changes/ticket32230 @@ -0,0 +1,3 @@ + o Minor bugfixes (build system): + - Some configure options were either missing or incorrect in the configure + summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha. diff --git a/configure.ac b/configure.ac index 63e13d00b..ec5ac4408 100644 --- a/configure.ac +++ b/configure.ac @@ -2591,21 +2591,18 @@ PPRINT_PROP_STRING([Compiler], [$CC]) PPRINT_PROP_STRING([Host OS], [$host_os]) AS_ECHO -test "x$enable_gcc_warnings" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Verbose Warnings (--enable-gcc-warnings)], $value) - test "x$enable_fatal_warnings" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Warnings are fatal (--enable-fatal-warnings)], $value) test "x$enable_rust" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Rust support (--enable-rust)], $value) +test "x$enable_cargo_online_mode" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Cargo Online Fetch (--enable-cargo-online-mode)], $value) + test "x$enable_android" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Android support (--enable-android)], $value) -test "x$enable_systemd" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Systemd support (--enable-systemd)], $value) - AS_ECHO PPRINT_SUBTITLE([Static Build]) @@ -2642,6 +2639,15 @@ PPRINT_PROP_BOOL([libseccomp (--disable-seccomp)], $value) test "x$enable_libscrypt" != "xno" && value=1 || value=0 PPRINT_PROP_BOOL([libscrypt (--disable-libscrypt)], $value) +test "x$enable_systemd" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([Systemd support (--enable-systemd)], $value) + +test "x$enable_lzma" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([liblzma (--enable-lzma)], $value) + +test "x$enable_zstd" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([libzstd (--enable-zstd)], $value) + AS_ECHO PPRINT_SUBTITLE([Hardening]) @@ -2651,21 +2657,25 @@ PPRINT_PROP_BOOL([Compiler Hardening (--disable-gcc-hardening)], $value) test "x$enable_linker_hardening" != "xno" && value=1 || value=0 PPRINT_PROP_BOOL([Linker Hardening (--disable-linker-hardening)], $value) -test "x$enable_fragile_hardening" = "xyes" && value=1 || value=0 +test "x$fragile_hardening" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Fragile Hardening (--enable-fragile-hardening, dev only)], $value) AS_ECHO PPRINT_SUBTITLE([Modules]) -test "x$enable_module_dirauth" != "xno" && value=1 || value=0 -PPRINT_PROP_BOOL([Directory Authority (--disable-module-dirauth)], $value) - -test "x$enable_module_relay" != "xno" && value=1 || value=0 -PPRINT_PROP_BOOL([Relay (--disable-module-relay)], $value) +m4_foreach_w([mname], MODULES, + [ + test "xenable_module_mname" != "xno" && value=1 || value=0 + PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value) + ] +) AS_ECHO PPRINT_SUBTITLE([Documentation]) +test "x$enable_asciidoc" != "xno" && value=1 || value=0 +PPRINT_PROP_BOOL([AsciiDoc (--disable-asciidoc)], $value) + test "x$enable_manpage" != "xno" && value=1 || value=0 PPRINT_PROP_BOOL([Man Pages (--disable-manpage)], $value) @@ -2679,7 +2689,7 @@ test "x$enable_unittests" != "xno" && value=1 || value=0 PPRINT_PROP_BOOL([Unit tests (--disable-unittests)], $value) test "x$enable_asserts_in_tests" = "xno" && value=1 || value=0 -PPRINT_PROP_BOOL([assert()s disabled (--disable-asserts-in-tests, dev only)], $value) +PPRINT_PROP_BOOL([assert()s enabled (--enable-asserts-in-tests, dev only)], $value) test "x$enable_coverage" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([Code Coverage (--enable-coverage)], $value)