[Bug 1964] --without-sntp should not build sntp

bk: 4e21fdafceXBagHzB7DEiT8pgzZXsg

diff --git a/ChangeLog b/ChangeLog
index d3e8e183b8ae3fb09a46f0214a2cfd158887415c..3b004be2b978e99039f682f292eacf21af12bf71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1964] --without-sntp should not build sntp.
 (4.2.7p190) 2011/07/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1961] from 4.2.6p4: html2man update: distribute ntp-wait.html.
 * Require autogen-5.12.

diff --git a/sntp/configure.ac b/sntp/configure.ac
index d094bb0a26e5bd728fcef6143d8c3da57c2a815d..5b71d5a411589b2e426cbfeb07aebcc3813c4468 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -72,8 +72,8 @@ NTP_WITHSNTP
 # - which style of macros should be used {man.mdoc}
 #
 # When configure is invoked from the main NTP directory, we will have:
-# - SNTP_DB={bin,}
-# - SNTP_DS={,sbin}
+# - SNTP_DB=sntp (if we are installing sntp in bindir, empty otherwise)
+# - SNTP_DS=sntp (if we are installing sntp in sbindir, empty otherwise)
 # - SNTP_MS={1,1m,1M,8}
 # - MANTAGFMT={man,mdoc}
 
@@ -89,12 +89,12 @@ AC_ARG_WITH(
 )
 case "$use_binsubdir" in
  bin)
-    SNTP_DB=sntp
+    SNTP_DB=$SNTP
     SNTP_DS=
     ;;
  sbin)
     SNTP_DB=
-    SNTP_DS=sntp
+    SNTP_DS=$SNTP
     ;;
  *)
     AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" or "sbin"])