From: Dave Hart Date: Sat, 23 Apr 2011 16:50:09 +0000 (+0000) Subject: Update libevent --disable-libevent-regress handling to work when X-Git-Tag: NTP_4_2_7P158~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b6e8674c766d896d427acdae41c2d7faef1f471;p=thirdparty%2Fntp.git Update libevent --disable-libevent-regress handling to work when building libevent using mingw. bk: 4db30341kuzCmaJC_-_0pIMlq8412g --- diff --git a/ChangeLog b/ChangeLog index ed7aeb0e7..e3b4bc2b6 100644 --- 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 * [Bug 1890] 4.2.7p156 segfault in duplicate freeaddrinfo(). (4.2.7p156) 2011/04/19 Released by Harlan Stenn diff --git a/sntp/libevent/configure.in b/sntp/libevent/configure.in index 786ff64b4..d8ccf4e98 100644 --- 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 b3474ec10..64bca7205 100644 --- 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