From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 Aug 2011 07:58:30 +0000 (-0400)
Subject: [Bug 1983] --without-sntp build breaks in sntp subdir
X-Git-Tag: NTP_4_2_7P202~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=204ca041cec240b42b83ce1596b4d8a69676dc12;p=thirdparty%2Fntp.git

[Bug 1983] --without-sntp build breaks in sntp subdir

bk: 4e40e8a69Z_z_5KBGj_N7LhWItZbSg
---

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 111108354..745d20f13 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -33,11 +33,9 @@ std_def_list =						\
 
 EXTRA_PROGRAMS = sntp
 
-if BUILD_SNTP
 bin_PROGRAMS =		@SNTP_DB@
 libexec_PROGRAMS =	@SNTP_DL@
 sbin_PROGRAMS =		@SNTP_DS@
-endif
 
 ##
 ## DIST_SUBDIRS is typically automatically derived by automake including
diff --git a/sntp/configure.ac b/sntp/configure.ac
index 038f657a9..66d1b2595 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -65,6 +65,14 @@ AC_SUBST([LIBTOOL_DEPS])
 
 NTP_WITHSNTP
 
+case "$SNTP" in
+ '')
+    SNTP_DB=
+    SNTP_DL=
+    SNTP_DS=
+    ;;
+esac
+
 ###
 
 # NTP has (so far) been relying on leading-edge autogen.