From: Dave Hart <hart@ntp.org>
Date: Tue, 14 Apr 2009 09:40:36 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1157-1158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d1cd3c8ebd2fc77fac43c5aa24ed5df9c6a27c;p=thirdparty%2Fntp.git

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
---

10d1cd3c8ebd2fc77fac43c5aa24ed5df9c6a27c
diff --cc configure.ac
index 739d3f458e,f9afae8019..ea3eea3c22
--- a/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])