diff options
| author | teor <teor@torproject.org> | 2020-04-01 23:03:51 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-01 23:03:51 +1000 |
| commit | a8a92b94568bac8efee1f3d736569226ac82fced (patch) | |
| tree | 96789e15f2220774674052c5b6692218ebb9f87f | |
| parent | b5412d12f9eb4ef7ad5265ac441cd63b3f100ef3 (diff) | |
| parent | 6c5c503a4ca892380a7ad26b8355faae6680bd47 (diff) | |
| download | tor-a8a92b94568bac8efee1f3d736569226ac82fced.tar.gz tor-a8a92b94568bac8efee1f3d736569226ac82fced.zip | |
Merge branch 'maint-0.4.3'
| -rw-r--r-- | changes/ticket33646 | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
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 87e7ea0cad..7e2645a11e 100644 --- a/configure.ac +++ b/configure.ac @@ -2673,7 +2673,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) ] ) |