[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 1111083544cb1db60d8f42af28c7edc02a71e63d..745d20f13479562ccb3120801ad32250e97597b4 100644 (file)
--- 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 038f657a941fc02c770bfa8c6d5336d22619b75f..66d1b2595c7fe9602330c078c08af08806de1550 100644 (file)
--- 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.