Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure: Fix enabled module variable expansion #1847

Closed

Conversation

Labels
None yet
Projects
None yet
3 participants
@dgoulet-tor
Copy link
Contributor

@dgoulet-tor dgoulet-tor commented Mar 31, 2020

Fixes #33646

Signed-off-by: David Goulet dgoulet@torproject.org

Fixes #33646

Signed-off-by: David Goulet <dgoulet@torproject.org>
@coveralls
Copy link

@coveralls coveralls commented Mar 31, 2020

Pull Request Test Coverage Report for Build 8618

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 63.6%

Totals Coverage Status
Change from base Build 8598: 0.0%
Covered Lines: 50216
Relevant Lines: 78956

💛 - Coveralls

configure.ac Outdated
@@ -2665,7 +2665,7 @@ PPRINT_SUBTITLE([Modules])

m4_foreach_w([mname], MODULES,
[
test "xenable_module_mname" != "xno" && value=1 || value=0
test "x$enable_module_[]mname[]" != "xno" && value=1 || value=0
Copy link
Contributor

@teor2345 teor2345 Mar 31, 2020

That still doesn't work, all modules should be "no" when relay is disabled:
https://travis-ci.org/github/torproject/tor/jobs/669204177#L2324

Looks like you're using the input variable, rather than the module variable?

Maybe try something like this:

Suggested change
test "x$enable_module_[]mname[]" != "xno" && value=1 || value=0
MODULE=m4_toupper([]mname[])
AM_COND_IF(BUILD_MODULE_[]MODULE[], value=1, value=0)

@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Apr 1, 2020

Squashed and merged to 0.4.3 and later.

@teor2345 teor2345 closed this Apr 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment