summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2020-03-31 08:21:12 -0400
committerteor <teor@torproject.org>2020-04-01 23:02:24 +1000
commit6c5c503a4ca892380a7ad26b8355faae6680bd47 (patch)
tree048fa1d92784f87e1069c160eb629b45cc944990
parent42e56f5bacc6ead39bfef790c6f9ca9be0419739 (diff)
downloadtor-6c5c503a4ca892380a7ad26b8355faae6680bd47.tar.gz
tor-6c5c503a4ca892380a7ad26b8355faae6680bd47.zip
configure: Fix enabled module variable expansion
Fixes #33646 Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r--changes/ticket336464
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket33646 b/changes/ticket33646
new file mode 100644
index 0000000000..751c5d5bf2
--- /dev/null
+++ b/changes/ticket33646
@@ -0,0 +1,4 @@
+ o Minor bugfixes (build system):
+ - Correctly output the enabled module in the configure summary. Before that,
+ the list shown was just plain wrong. Fixes bug 33646; bugfix on
+ 0.4.3.2-alpha.
diff --git a/configure.ac b/configure.ac
index b4bea277f6..27cfda1be3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2665,7 +2665,7 @@ PPRINT_SUBTITLE([Modules])
m4_foreach_w([mname], MODULES,
[
- test "xenable_module_mname" != "xno" && value=1 || value=0
+ AM_COND_IF(m4_join([], [BUILD_MODULE_], m4_toupper([]mname[])), value=1, value=0)
PPRINT_PROP_BOOL([mname (--disable-module-mname)], $value)
]
)