commit c8eb39d67f4ea5f913998ea4aae2d3ba3f3c8258 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 28 16:11:25 2016 -0400

Remove a couple of redundant lines from the makefile

Fixes the last case of 17744. --- changes/bug17744_redux | 5 +++++ configure.ac | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug17744_redux b/changes/bug17744_redux new file mode 100644 index 0000000..d61e17f --- /dev/null +++ b/changes/bug17744_redux @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Remove a pair of redundant AM_CONDITIONAL declarations from + configure.ac. Fixes one final case of bug 17744; bugfix on + 0.2.8.2-alpha. + diff --git a/configure.ac b/configure.ac index ad71f7f..e4816fd 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,6 @@ fi

AM_CONDITIONAL(UNITTESTS_ENABLED, test "x$enable_unittests" != "xno") AM_CONDITIONAL(COVERAGE_ENABLED, test "x$enable_coverage" = "xyes") -AM_CONDITIONAL(UNITTESTS_ENABLED, test x$enable_unittests != xno) -AM_CONDITIONAL(COVERAGE_ENABLED, test x$enable_coverage = xyes) AM_CONDITIONAL(DISABLE_ASSERTS_IN_UNIT_TESTS, test "x$enable_asserts_in_tests" = "xno")

if test "$enable_static_tor" = "yes"; then