[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/maint-0.4.3] configure: Fix enabled module variable expansion



commit 6c5c503a4ca892380a7ad26b8355faae6680bd47
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Tue Mar 31 08:21:12 2020 -0400

    configure: Fix enabled module variable expansion
    
    Fixes #33646
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
 changes/ticket33646 | 4 ++++
 configure.ac        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket33646 b/changes/ticket33646
new file mode 100644
index 000000000..751c5d5bf
--- /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 b4bea277f..27cfda1be 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)
   ]
 )

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits