summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-28 16:11:25 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-28 16:11:25 -0400
commitc8eb39d67f4ea5f913998ea4aae2d3ba3f3c8258 (patch)
tree37f38f030d4610641b0eee64b5d42439f8279a5f
parenta3f36bfd81726d25dde3c4841ae0324a2c72b481 (diff)
downloadtor-c8eb39d67f4ea5f913998ea4aae2d3ba3f3c8258.tar.gz
tor-c8eb39d67f4ea5f913998ea4aae2d3ba3f3c8258.zip
Remove a couple of redundant lines from the makefile
Fixes the last case of 17744.
-rw-r--r--changes/bug17744_redux5
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug17744_redux b/changes/bug17744_redux
new file mode 100644
index 0000000000..d61e17fec3
--- /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 ad71f7fdda..e4816fdbd7 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