Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1157-1158

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-1153-1157-1158

bk: 49e45a14wMYCS26jX7y58zeh7r6FRw

diff --cc ChangeLog
Simple merge

diff --cc configure.ac
index 739d3f458e71cb7f0b4c062f848c67d651d6c8a9,f9afae8019c4e71aec3db653af88df19f8e1b013..ea3eea3c229bcef6eafb362401a12c4ed86bc20a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2761,9 -2743,9 +2743,10 @@@ AC_ARG_ENABLE(TRUETIME
        ;;
       *)
        ntp_ok=$ntp_eac
 +      ntp_ok="disabled pps_sample() gone" # delete this line alone
        ;;
      esac])
+     
  if test "$ntp_ok" = "yes"; then
      ntp_refclock=yes
      AC_DEFINE(CLOCK_TRUETIME, 1, [Kinemetrics/TrueTime receivers])