summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-01-20 16:22:36 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-01-20 16:22:36 -0500
commit61803775e8b1439b01dbd37ebf4f6105fb19d2f8 (patch)
treeb92a4475f2f6402d88e348a19f9e983d44108922
parent9a0a91dc23ac465d8e834c0c200eea46db3cdf02 (diff)
parent07f37c64f8124c59927b86a6770c488bf22f707f (diff)
downloadtor-61803775e8b1439b01dbd37ebf4f6105fb19d2f8.tar.gz
tor-61803775e8b1439b01dbd37ebf4f6105fb19d2f8.zip
Merge branch 'tor-gitlab/mr/264'
-rw-r--r--changes/bug402362
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 2 deletions
diff --git a/changes/bug40236 b/changes/bug40236
new file mode 100644
index 0000000000..bb2b9a9558
--- /dev/null
+++ b/changes/bug40236
@@ -0,0 +1,2 @@
+ o Minor bugfixes (build):
+ - Mini-report in the configure script now shows whether or not lzma and zstd have been used, not just if enable flag passed in. Fixes bug 40236; bugfix on 0.4.3.1-alpha.
diff --git a/configure.ac b/configure.ac
index 0ec813658c..07cdb26442 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2816,10 +2816,10 @@ 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
+test "x$have_lzma" = "xyes" && value=1 || value=0
PPRINT_PROP_BOOL([liblzma (--enable-lzma)], $value)
-test "x$enable_zstd" = "xyes" && value=1 || value=0
+test "x$have_zstd" = "xyes" && value=1 || value=0
PPRINT_PROP_BOOL([libzstd (--enable-zstd)], $value)
AS_ECHO