diff options
| author | teor <teor@torproject.org> | 2020-04-01 23:03:47 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-01 23:03:47 +1000 |
| commit | aa94f81add50f4afb6028d5b0c9a95950d95e252 (patch) | |
| tree | 7b61c19bc7d84346d992254bc677ae777fa1abd0 | |
| parent | 7d6e9d7d95be2d6ec8b4af8d7b6685508c7eda1c (diff) | |
| parent | 6c5c503a4ca892380a7ad26b8355faae6680bd47 (diff) | |
| download | tor-aa94f81add50f4afb6028d5b0c9a95950d95e252.tar.gz tor-aa94f81add50f4afb6028d5b0c9a95950d95e252.zip | |
Merge branch 'maint-0.4.3' into release-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 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) ] ) |