From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Dec 2014 06:57:50 +0000 (+0000)
Subject: [Bug 2714] libevent may need to be built independently of any build of sntp
X-Git-Tag: NTP_4_2_8P1_BETA3~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8efa2d1c5a877926e08639caab5432178b045458;p=thirdparty%2Fntp.git

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

bk: 54a0fb6edcZaA6KhWq_8ynjvxzv7Gg
---

diff --git a/ChangeLog b/ChangeLog
index e14e94155..918890d7b 100644
--- 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 811d5909e..8694ed3e7 100644
--- 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 =		\