[Bug 2714] libevent may need to be built independently of any build of sntp

bk: 54a0fb6edcZaA6KhWq_8ynjvxzv7Gg

diff --git a/ChangeLog b/ChangeLog
index e14e9415592ffc36f371ec1b9ab5b43678050e83..918890d7b34733b6bdaaeeedda6ab3121c16e6df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 * [Bug 2706] libparse/info_trimble.c build dependencies are broken.
 * [Bug 2713] variable type/cast, parameter name, general cleanup from NetBSD.
+* [Bug 2714] libevent may need to be built independently of any build of sntp.
 ---
 (4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 811d5909e98996e8a98ff398ee561134f12e9003..8694ed3e75ca754ea49f2071c20623ee5b865eb3 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -56,13 +56,6 @@ sbin_PROGRAMS =              @SNTP_DS@
 SUBDIRS = include scripts
 DIST_SUBDIRS = include scripts
 
-if BUILD_SNTP
-noinst_LIBRARIES = libsntp.a
-if GTEST_AVAILABLE
-SUBDIRS += tests
-endif
-endif
-
 if BUILD_LIBEVENT
 SUBDIRS += libevent
 DIST_SUBDIRS += libevent
@@ -72,6 +65,13 @@ if NEED_LIBOPTS
 SUBDIRS += libopts
 endif
 
+if BUILD_SNTP
+noinst_LIBRARIES = libsntp.a
+if GTEST_AVAILABLE
+SUBDIRS += tests
+endif
+endif
+
 DIST_SUBDIRS += libopts tests
 
 libsntp_a_SOURCES =            \