From ea0d019b7161e0f990b6a6c1e537b0a1b6d08afa Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 23 Apr 2011 02:35:17 -0400
Subject: [PATCH] Use AM_CONDITIONAL, not AC_SUBST, to tell automake to build
 regress

For some reason, this makes mingw much happier about building
regress.exe by default.  No, I'm afraid I don't know why.
---
 configure.in     | 6 ------
 test/Makefile.am | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index 2d5214cb..fd5cc9dc 100644
--- a/configure.in
+++ b/configure.in
@@ -76,12 +76,6 @@ dnl AC_DISABLE_SHARED
 AC_SUBST(LIBTOOL_DEPS)
 
 AM_CONDITIONAL([BUILD_REGRESS], [test "$enable_libevent_regress" = "yes"])
-if test "$enable_libevent_regress" = "yes" ; then
-    CHECK_REGRESS='regress$(EXEENT)'
-else
-    CHECK_REGRESS=
-fi
-AC_SUBST([CHECK_REGRESS])
 
 dnl Checks for libraries.
 AC_SEARCH_LIBS([inet_ntoa], [nsl])
diff --git a/test/Makefile.am b/test/Makefile.am
index b3474ec1..64bca720 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,9 +4,12 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I.
 
 EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c test.sh
 
-noinst_PROGRAMS = test-init test-eof test-weof test-time @CHECK_REGRESS@ \
+noinst_PROGRAMS = test-init test-eof test-weof test-time \
 	bench bench_cascade bench_http bench_httpclient test-ratelim \
 	test-changelist
+if BUILD_REGRESS
+noinst_PROGRAMS += regress
+endif
 EXTRA_PROGRAMS = regress
 noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
 
-- 
2.40.0