[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Sat Apr 23 20:12:36 UTC 2011


#### ChangeSet ####
2011-04-23 16:50:09+00:00, davehart at shiny.ad.hartbrothers.com
  Update libevent --disable-libevent-regress handling to work when
    building libevent using mingw.

==== ChangeLog ====
2011-04-23 16:50:08+00:00, davehart at shiny.ad.hartbrothers.com +2 -0
  Update libevent --disable-libevent-regress handling to work when
    building libevent using mingw.

--- 1.861/ChangeLog	2011-04-21 02:16:23 -04:00
+++ 1.862/ChangeLog	2011-04-23 12:50:08 -04:00
@@ -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 at ntp.org>
 * [Bug 1890] 4.2.7p156 segfault in duplicate freeaddrinfo().
 (4.2.7p156) 2011/04/19 Released by Harlan Stenn <stenn at ntp.org>

==== sntp/libevent/configure.in ====
2011-04-23 16:50:08+00:00, davehart at shiny.ad.hartbrothers.com +0 -6
  Update libevent --disable-libevent-regress handling to work when
    building libevent using mingw.

--- 1.5/sntp/libevent/configure.in	2011-04-14 16:32:08 -04:00
+++ 1.6/sntp/libevent/configure.in	2011-04-23 12:50:08 -04:00
@@ -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])

==== sntp/libevent/test/Makefile.am ====
2011-04-23 16:50:08+00:00, davehart at shiny.ad.hartbrothers.com +4 -1
  Update libevent --disable-libevent-regress handling to work when
    building libevent using mingw.

--- 1.4/sntp/libevent/test/Makefile.am	2011-04-14 16:32:08 -04:00
+++ 1.5/sntp/libevent/test/Makefile.am	2011-04-23 12:50:08 -04:00
@@ -4,9 +4,12 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_sr
 
 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
 


More information about the bk-ntp-dev-send mailing list