Update libevent --disable-libevent-regress handling to work when

  building libevent using mingw.

bk: 4db30341kuzCmaJC_-_0pIMlq8412g

diff --git a/ChangeLog b/ChangeLog
index ed7aeb0e7e4ec31214c342c00407d51f20af1a21..e3b4bc2b632a2922786e84396652f7da9386e623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Update libevent --disable-libevent-regress handling to work when
+  building libevent using mingw.
 (4.2.7p157) 2011/04/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1890] 4.2.7p156 segfault in duplicate freeaddrinfo().
 (4.2.7p156) 2011/04/19 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/sntp/libevent/configure.in b/sntp/libevent/configure.in
index 786ff64b49a53bd7c34555dcc0b3d6a6934af28b..d8ccf4e987563b352271285429f6af82163722e7 100644 (file)
--- a/sntp/libevent/configure.in
+++ b/sntp/libevent/configure.in
@@ -88,12 +88,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
-else
-    CHECK_REGRESS=
-fi
-AC_SUBST([CHECK_REGRESS])
 
 dnl Checks for libraries.
 AC_SEARCH_LIBS([inet_ntoa], [nsl])

diff --git a/sntp/libevent/test/Makefile.am b/sntp/libevent/test/Makefile.am
index b3474ec10f0fe3ee79b513b4f0765d4649a84a44..64bca7205b973b8716d9c752d96a60302b1225d2 100644 (file)
--- a/sntp/libevent/test/Makefile.am
+++ b/sntp/libevent/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