From f77146900e35a78aaabf5f88d47b7675304c8445 Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 29 Oct 2002 19:58:12 +0000 Subject: Virgin import of ntpd 4.1.1a --- contrib/ntp/COPYRIGHT | 2 +- contrib/ntp/ChangeLog | 8416 +++++++++++++--------------------- contrib/ntp/ChangeLog-4.1.0 | 6152 +++++++++++++++++++++++++ contrib/ntp/Makefile.am | 52 +- contrib/ntp/Makefile.in | 179 +- contrib/ntp/NEWS | 16 + contrib/ntp/README.bk | 62 + contrib/ntp/README.cvs | 4 + contrib/ntp/README.rsa | 6 +- contrib/ntp/README.versions | 35 + contrib/ntp/acconfig.h | 6 + contrib/ntp/acinclude.m4 | 2 +- contrib/ntp/aclocal.m4 | 381 +- contrib/ntp/adjtimed/Makefile.in | 165 +- contrib/ntp/clockstuff/Makefile.am | 4 +- contrib/ntp/clockstuff/Makefile.in | 167 +- contrib/ntp/config.h.in | 33 +- contrib/ntp/configure | 4495 +++++++++--------- contrib/ntp/configure.in | 116 +- contrib/ntp/html/driver40.htm | 141 + contrib/ntp/html/driver42.html | 39 + contrib/ntp/html/hints/mpeix | 50 + contrib/ntp/html/hints/vxworks.html | 6 +- contrib/ntp/html/qth.htm | 12 + contrib/ntp/html/refclock.htm | 12 +- contrib/ntp/include/Makefile.in | 77 +- contrib/ntp/include/ntp.h | 4 +- contrib/ntp/include/ntp_machine.h | 42 + contrib/ntp/include/ntp_request.h | 35 +- contrib/ntp/include/ntpd.h | 2 +- contrib/ntp/kernel/Makefile.in | 90 +- contrib/ntp/kernel/sys/Makefile.in | 75 +- contrib/ntp/libntp/Makefile.am | 25 +- contrib/ntp/libntp/Makefile.in | 589 ++- contrib/ntp/libntp/adjtime.c | 97 + contrib/ntp/libntp/clocktypes.c | 4 + contrib/ntp/libntp/iosignal.c | 119 +- contrib/ntp/libntp/machines.c | 341 +- contrib/ntp/libntp/mktime.c | 5 + contrib/ntp/libntp/snprintf.c | 4 + contrib/ntp/libntp/strdup.c | 8 + contrib/ntp/libntp/strerror.c | 6 + contrib/ntp/libparse/Makefile.in | 300 +- contrib/ntp/librsaref/Makefile.am | 5 +- contrib/ntp/librsaref/Makefile.in | 187 +- contrib/ntp/mkinstalldirs | 2 +- contrib/ntp/ntpd/Makefile.am | 30 +- contrib/ntp/ntpd/Makefile.in | 605 +-- contrib/ntp/ntpd/jupiter.h | 2 +- contrib/ntp/ntpd/ntp_config.c | 14 +- contrib/ntp/ntpd/ntp_control.c | 3 + contrib/ntp/ntpd/ntp_crypto.c | 4 +- contrib/ntp/ntpd/ntp_intres.c | 3 +- contrib/ntp/ntpd/ntp_io.c | 34 +- contrib/ntp/ntpd/ntp_loopfilter.c | 85 +- contrib/ntp/ntpd/ntp_proto.c | 9 +- contrib/ntp/ntpd/ntp_request.c | 99 +- contrib/ntp/ntpd/ntp_timer.c | 4 +- contrib/ntp/ntpd/ntpd.c | 46 +- contrib/ntp/ntpd/refclock_chu.c | 3 + contrib/ntp/ntpd/refclock_conf.c | 31 +- contrib/ntp/ntpd/refclock_jjy.c | 712 +++ contrib/ntp/ntpd/refclock_local.c | 2 + contrib/ntp/ntpd/refclock_oncore.c | 2 +- contrib/ntp/ntpd/refclock_palisade.c | 2 + contrib/ntp/ntpd/refclock_true.c | 2 +- contrib/ntp/ntpd/refclock_tt560.c | 274 ++ contrib/ntp/ntpd/refclock_zyfer.c | 346 ++ contrib/ntp/ntpdate/Makefile.am | 2 +- contrib/ntp/ntpdate/Makefile.in | 185 +- contrib/ntp/ntpdate/ntpdate.c | 58 +- contrib/ntp/ntpdate/ntptimeset.c | 7 +- contrib/ntp/ntpdc/Makefile.am | 2 +- contrib/ntp/ntpdc/Makefile.in | 169 +- contrib/ntp/ntpdc/ntpdc.c | 41 +- contrib/ntp/ntpdc/ntpdc_ops.c | 37 +- contrib/ntp/ntpq/Makefile.am | 2 +- contrib/ntp/ntpq/Makefile.in | 169 +- contrib/ntp/ntpq/ntpq.c | 42 +- contrib/ntp/ntptrace/Makefile.am | 2 +- contrib/ntp/ntptrace/Makefile.in | 165 +- contrib/ntp/ntptrace/ntptrace.c | 10 +- contrib/ntp/parseutil/Makefile.in | 164 +- contrib/ntp/scripts/Makefile.in | 69 +- contrib/ntp/scripts/mkver.in | 5 + contrib/ntp/scripts/ntpsweep.in | 2 +- contrib/ntp/scripts/plot_summary.in | 2 +- contrib/ntp/scripts/summary.in | 2 +- contrib/ntp/util/Makefile.in | 319 +- contrib/ntp/util/ansi2knr.c | 2 +- contrib/ntp/util/ntp-genkeys.c | 18 +- contrib/ntp/version | 1 + 92 files changed, 16578 insertions(+), 9779 deletions(-) create mode 100644 contrib/ntp/ChangeLog-4.1.0 create mode 100644 contrib/ntp/README.bk create mode 100644 contrib/ntp/README.versions create mode 100644 contrib/ntp/html/driver40.htm create mode 100644 contrib/ntp/html/driver42.html create mode 100644 contrib/ntp/html/hints/mpeix create mode 100644 contrib/ntp/ntpd/refclock_jjy.c create mode 100644 contrib/ntp/ntpd/refclock_tt560.c create mode 100644 contrib/ntp/ntpd/refclock_zyfer.c create mode 100644 contrib/ntp/version diff --git a/contrib/ntp/COPYRIGHT b/contrib/ntp/COPYRIGHT index 72d07a8..8ee6eab 100644 --- a/contrib/ntp/COPYRIGHT +++ b/contrib/ntp/COPYRIGHT @@ -169,5 +169,5 @@ References 50. mailto:tsuruoka@nc.fukuoka-u.ac.jp 51. mailto:vixie@vix.com 52. mailto:Ulrich.Windl@rz.uni-regensburg.de - 53. file://localhost/backroom/ntp4/html/index.htm + 53. file://localhost/backroom/ntp-stable/html/index.htm 54. mailto:mills@udel.edu diff --git a/contrib/ntp/ChangeLog b/contrib/ntp/ChangeLog index 69b566e..0693482 100644 --- a/contrib/ntp/ChangeLog +++ b/contrib/ntp/ChangeLog @@ -1,6152 +1,3978 @@ -2001-08-01 Harlan Stenn +ChangeSet@1.786, 2002-02-26 22:44:34-05:00, stenn@whimsy.udel.edu + ntp-4.1.1 + TAG: NTP_4_1_1 + + configure.in + 1.235 02/02/26 22:44:33 stenn@whimsy.udel.edu +1 -1 + ntp-4.1.1 + + NEWS + 1.38 02/02/26 22:44:32 stenn@whimsy.udel.edu +1 -0 + Update the NEWS file. + +ChangeSet@1.785, 2002-02-22 21:10:08-05:00, stenn@whimsy.udel.edu + LEAP_DELSECOND support for CHU. + + From: Ralph Siemsen + + ntpd/refclock_chu.c + 1.22 02/02/22 21:10:07 stenn@whimsy.udel.edu +3 -0 + LEAP_DELSECOND support. + + From: Ralph Siemsen + +ChangeSet@1.784, 2002-02-19 19:07:29-05:00, stenn@whimsy.udel.edu + Trigger improvements. + + BitKeeper/triggers/delta-changelog + 1.4 02/02/19 19:07:28 stenn@whimsy.udel.edu +3 -2 + Don't use this to update ChangeLog, but use it only to send the + checkin log email. + + BitKeeper/triggers/trigger.cfg + 1.9 02/02/19 19:07:28 stenn@whimsy.udel.edu +2 -2 + Enable the email-related log messages. + +ChangeSet@1.783, 2002-02-18 23:27:09-05:00, stenn@whimsy.udel.edu + ntp_adjtime() call cleanup. + From: John Hay + + ntpd/ntp_crypto.c + 1.45 02/02/18 23:27:08 stenn@whimsy.udel.edu +1 -3 + ntp_adjtime() call cleanup. + From John Hay. + +ChangeSet@1.782, 2002-01-25 18:51:26-05:00, stenn@whimsy.udel.edu + mu can be 0, and the (old) debug info would divide sys_jitter by mu. + Lose the division. + From: Dave Mills. + + ntpd/ntp_loopfilter.c + 1.56 02/01/25 18:51:25 stenn@whimsy.udel.edu +2 -2 + mu can be 0, and the (old) debug info would divide sys_jitter by mu. + Lose the division. + From: Dave Mills. + +ChangeSet@1.781, 2002-01-22 18:16:09-05:00, stenn@whimsy.udel.edu + Lint cleanup. + From Marc.Brett@westerngeco.com + + ntpd/ntp_intres.c + 1.20 02/01/22 18:16:08 stenn@whimsy.udel.edu +1 -1 + Lint. + + util/ntp-genkeys.c + 1.60 02/01/22 18:16:08 stenn@whimsy.udel.edu +0 -1 + Lint. + +ChangeSet@1.780, 2002-01-17 17:52:47-05:00, stenn@whimsy.udel.edu + Lose the source port check. Too many folks are going thru Port and + Address Translators, and present wisdom says that one should not + trust source ports anyway. + + ntpd/ntp_proto.c + 1.96 02/01/17 17:52:46 stenn@whimsy.udel.edu +1 -5 + Lose the source port check. Too many folks are going thru Port and + Address Translators, and present wisdom says that one should not + trust source ports anyway. + +ChangeSet@1.779, 2002-01-17 16:02:37-05:00, stenn@whimsy.udel.edu + Lint cleanup from Marc.Brett@westerngeco.com . + + ntpd/refclock_jjy.c + 1.4 02/01/17 16:02:36 stenn@whimsy.udel.edu +1 -4 + Lint. + + ntpd/refclock_local.c + 1.7 02/01/17 16:02:36 stenn@whimsy.udel.edu +2 -0 + Lint. + + ntpd/refclock_palisade.c + 1.10 02/01/17 16:02:36 stenn@whimsy.udel.edu +2 -0 + Lint. + +ChangeSet@1.778, 2002-01-13 11:52:50-05:00, stenn@whimsy.udel.edu + Disable the delta-changelog and related scripts. + + BitKeeper/triggers/trigger.cfg + 1.8 02/01/13 11:52:49 stenn@whimsy.udel.edu +2 -2 + Disable the delta-changelog and related scripts. + +ChangeSet@1.777, 2002-01-12 23:36:13-05:00, stenn@whimsy.udel.edu + 4.1.0b-rc3 + TAG: ntp-stable + TAG: NTP_4_1_0B_RC3 + + configure.in + 1.234 02/01/12 23:36:12 stenn@whimsy.udel.edu +1 -1 + 4.1.0b-rc3 + +ChangeSet@1.776, 2002-01-10 20:43:25-05:00, stenn@whimsy.udel.edu + Update the NEWS file. + + NEWS + 1.37 02/01/10 20:43:25 stenn@whimsy.udel.edu +5 -0 + Update the NEWS file. + +ChangeSet@1.775, 2002-01-06 18:35:45-05:00, stenn@whimsy.udel.edu + Disable the refclock_report(peer, CEVNT_BADREPLY) if the GOES + clock reports !(lon > 7000 && lon < 14000). + From: Paul Vixie. + + ntpd/refclock_true.c + 1.8 02/01/06 18:35:45 stenn@whimsy.udel.edu +1 -1 + Disable the refclock_report(peer, CEVNT_BADREPLY) if the GOES + clock reports !(lon > 7000 && lon < 14000). + From: Paul Vixie. + +ChangeSet@1.774, 2002-01-04 04:03:26-05:00, stenn@whimsy.udel.edu + Lose some implementation debug output. + From: John Hay + + ntpd/ntp_request.c + 1.28 02/01/04 04:03:25 stenn@whimsy.udel.edu +0 -7 + Lose some implementation debug output. + +ChangeSet@1.773, 2002-01-04 00:37:40-05:00, stenn@whimsy.udel.edu + From: John Hay + Subject: [ntp:hackers] (x)ntpdc compatibility patch + + And there was much rejoicing... + + include/ntp_request.h + 1.13 02/01/04 00:37:39 stenn@whimsy.udel.edu +23 -0 + Added struct req_pkt_tail, REQ_LEN_HDR, and struct old_conf_peer. + + ntpd/ntp_request.c + 1.27 02/01/04 00:37:39 stenn@whimsy.udel.edu +48 -11 + Deal with both short and long packets. REQ_CONFIG can have two + sizes, too. Count old_conf_peer packets. Lose keystr - it's no + longer used. + + ntpdc/ntpdc.c + 1.10 02/01/04 00:37:39 stenn@whimsy.udel.edu +36 -5 + Handle sending packets of both size. We might need to send along + a req_pkt_tail. If we send the request and get back INFO_ERR_FMT, + try again with a req_pkt_size of 48. + + ntpdc/ntpdc_ops.c + 1.13 02/01/04 00:37:39 stenn@whimsy.udel.edu +7 -0 + If we get back INFO_ERR_FMT, try again with the old conf_peer size. + +ChangeSet@1.772, 2002-01-02 23:52:46-05:00, stenn@whimsy.udel.edu + The loopback is OK if we're listening to virtual IPs. + Show candidate interface addresses during debug. + From: Paul Vixie + + ntpd/ntp_io.c + 1.23 02/01/02 23:52:46 stenn@whimsy.udel.edu +14 -8 + The loopback is OK if we're listening to virtual IPs. + Show candidate interface addresses during debug. + +ChangeSet@1.771, 2002-01-02 22:36:34-05:00, stenn@whimsy.udel.edu + F_SETOWN bsdi typo fix + From: Paul Vixie + + configure.in + 1.233 02/01/02 22:36:33 stenn@whimsy.udel.edu +1 -1 + F_SETOWN bsdi typo fix + From: Paul Vixie + +ChangeSet@1.770, 2002-01-02 22:26:22-05:00, stenn@whimsy.udel.edu + Boring documentation cleanup. + + README.cvs + 1.11 02/01/02 22:26:22 stenn@whimsy.udel.edu +4 -0 + Note that the CVS repo is dormant. + + README.versions + 1.2 02/01/02 22:26:22 stenn@whimsy.udel.edu +1 -1 + Bit-o-cleanup... + +ChangeSet@1.769, 2001-12-31 00:53:29-05:00, stenn@whimsy.udel.edu + Later verisons of FreeBSD need the PARENB IGNPAR thing. + Backport ntp_loopfilter fixes. + + configure.in + 1.232 01/12/31 00:53:28 stenn@whimsy.udel.edu +5 -0 + Later verisons of FreeBSD need the PARENB IGNPAR thing. + + include/ntpd.h + 1.29 01/12/31 00:53:28 stenn@whimsy.udel.edu +1 -1 + Backport ntp_loopfilter fixes. + + ntpd/ntp_loopfilter.c + 1.55 01/12/31 00:53:28 stenn@whimsy.udel.edu +55 -26 + Backport ntp_loopfilter fixes. + +ChangeSet@1.768, 2001-12-19 15:57:09-05:00, stenn@whimsy.udel.edu + Distribute README.versions . + + Makefile.am + 1.25 01/12/19 15:57:07 stenn@whimsy.udel.edu +1 -0 + Distribute README.versions . + +ChangeSet@1.767, 2001-12-18 19:27:29-05:00, stenn@whimsy.udel.edu + 4.1.0b-rc2 + TAG: NTP_4_1_0B_RC2 + TAG: ntp-stable + + configure.in + 1.231 01/12/18 19:27:28 stenn@whimsy.udel.edu +1 -1 + 4.1.0b-rc2 + +ChangeSet@1.766, 2001-12-17 23:25:13-05:00, stenn@whimsy.udel.edu + Be more verbose/descriptive of problems in debug mode. + From: Todd MacDermid + + ntpdate/ntpdate.c + 1.27 01/12/17 23:25:12 stenn@whimsy.udel.edu +30 -9 + Be more verbose/descriptive of problems in debug mode. + From: Todd MacDermid + +ChangeSet@1.765, 2001-12-17 00:26:09-05:00, stenn@whimsy.udel.edu + Make the ntp_set_tod() debug messages less confusing/chatty. + + libntp/machines.c + 1.13 01/12/17 00:26:09 stenn@whimsy.udel.edu +16 -16 + Make the ntp_set_tod() debug messages less confusing/chatty. + +ChangeSet@1.764, 2001-12-14 02:43:08-05:00, stenn@whimsy.udel.edu + This patch fixes a bug in NTP which appears if NTP is built on a system + where signaled I/O is used, i.e. HAVE_SIGNALED_IO is defined in + config.h. The bug has been found in ntp-4.1.71 but seems to last in the + NTP code since the xntp3 days. + + The symptom: + If a radio clock is connected via the serial port using the parse driver + (driver 8) then there are lots of messages in the syslog saying: + > 31 Oct 09:13:42 ntpd[6708]: input_handler: handler_count is 2! + > 31 Oct 09:13:42 ntpd[6708]: input_handler: handler_count is 2! + + This has been observed under AIX 4.3.2 and Solaris 8, and the patch + works in both cases. This effect is very obvious if a radio clock is + connected via a serial interface, and a SIGIO signal is raised whenever + a character has been received. It's a common problem, however, but the + probability that a signal is raised again while the handler for the + previous signal is still executing is much less if there + are only signals if network packets are received. + + The fix: + The patch below is used to take care that the SIGIO signal is not + unintentionally unblocked inside the sigio_handler() if the handler + executes a piece of code that is bracketed by BLOCKIO()/UNBLOCKIO() + calls. + + From: Martin Burnicki + + libntp/iosignal.c + 1.9 01/12/14 02:43:08 stenn@whimsy.udel.edu +72 -39 + This patch fixes a bug in NTP which appears if NTP is built on a system + where signaled I/O is used, i.e. HAVE_SIGNALED_IO is defined in + config.h. The bug has been found in ntp-4.1.71 but seems to last in the + NTP code since the xntp3 days. + + The symptom: + If a radio clock is connected via the serial port using the parse driver + (driver 8) then there are lots of messages in the syslog saying: + > 31 Oct 09:13:42 ntpd[6708]: input_handler: handler_count is 2! + > 31 Oct 09:13:42 ntpd[6708]: input_handler: handler_count is 2! + + This has been observed under AIX 4.3.2 and Solaris 8, and the patch + works in both cases. This effect is very obvious if a radio clock is + connected via a serial interface, and a SIGIO signal is raised whenever + a character has been received. It's a common problem, however, but the + probability that a signal is raised again while the handler for the + previous signal is still executing is much less if there + are only signals if network packets are received. + + The fix: + The patch below is used to take care that the SIGIO signal is not + unintentionally unblocked inside the sigio_handler() if the handler + executes a piece of code that is bracketed by BLOCKIO()/UNBLOCKIO() + calls. + + From: Martin Burnicki + +ChangeSet@1.763, 2001-12-12 21:46:20-05:00, stenn@whimsy.udel.edu + Alter the "ci" calculation to reduce the chance of overflow. + From: Michael Andres + + ntpdate/ntpdate.c + 1.26 01/12/12 21:46:19 stenn@whimsy.udel.edu +8 -2 + Alter the "ci" calculation to reduce the chance of overflow. + From: Michael Andres + +ChangeSet@1.762, 2001-12-10 22:02:24-05:00, stenn@whimsy.udel.edu + Properly check the pps_device variable. + From: "David G. Andersen" + + ntpd/refclock_oncore.c + 1.38 01/12/10 22:02:23 stenn@whimsy.udel.edu +1 -1 + Properly check the pps_device variable. + From: "David G. Andersen" + +ChangeSet@1.761, 2001-12-05 01:24:04-05:00, stenn@whimsy.udel.edu + C-DEX patch. + From: Masaki Fukushima + + ntpd/refclock_jjy.c + 1.3 01/12/05 01:24:03 stenn@whimsy.udel.edu +3 -1 + C-DEX patch. + From: Masaki Fukushima + +ChangeSet@1.760, 2001-12-02 23:02:32-05:00, stenn@whimsy.udel.edu + Added README.versions, which describes the version numbering scheme + we are using. Suggested by Ulrich Windl. + + README.versions + 1.1 01/12/02 23:02:32 stenn@whimsy.udel.edu +35 -0 + + README.versions + 1.0 01/12/02 23:02:32 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/README.versions + +ChangeSet@1.759, 2001-12-02 04:12:13-05:00, stenn@whimsy.udel.edu + settimeofday() fix in configure, do a better job tracking and + reporting progress in ntp_set_tod(). + + configure.in + 1.230 01/12/02 04:12:12 stenn@whimsy.udel.edu +1 -1 + Use AC_CHECK_FUNCS instead of _FUNC to check for settimeofday() + because we need HAVE_SETTIMEOFDAY. + + libntp/machines.c + 1.12 01/12/02 04:12:12 stenn@whimsy.udel.edu +40 -21 + Do a better job tracking (and reporting, if debug enabled) progress + in ntp_set_tod(). + +ChangeSet@1.758, 2001-11-30 19:36:36-05:00, stenn@whimsy.udel.edu + If no REFCLOCK, no cal_enable. + From: Ralf Nyren + + ntpd/ntp_request.c + 1.26 01/11/30 19:36:35 stenn@whimsy.udel.edu +2 -0 + If no REFCLOCK, no cal_enable. + From: Ralf Nyren + +ChangeSet@1.757, 2001-11-24 23:30:49-05:00, stenn@whimsy.udel.edu + Somewhere along the line, the driver40.htm file got lost - recover it. + + html/driver40.htm + 1.1 01/11/24 23:30:48 stenn@whimsy.udel.edu +141 -0 + + html/driver40.htm + 1.0 01/11/24 23:30:48 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/html/driver40.htm + +ChangeSet@1.756, 2001-11-23 23:23:23-05:00, stenn@whimsy.udel.edu + 4.1.0b-rc1 + TAG: NTP_4_1_0B_RC1 + + NEWS + 1.36 01/11/23 23:23:22 stenn@whimsy.udel.edu +7 -0 + Update the NEWS file. + + configure.in + 1.229 01/11/23 23:23:22 stenn@whimsy.udel.edu +1 -1 + 4.1.0b-rc1 + +ChangeSet@1.755, 2001-11-19 21:29:34-05:00, stenn@whimsy.udel.edu + enable/disable calibrate. + + Flags cleanup for ntpdc and friends. + + From Dave Mills. + + include/ntp_request.h + 1.12 01/11/19 21:29:33 stenn@whimsy.udel.edu +7 -5 + Cleanup/fixes from Dave Mills. + + ntpd/ntp_config.c + 1.54 01/11/19 21:29:33 stenn@whimsy.udel.edu +4 -4 + One can also enable/disable calibrate. + + Alphabetize the flag keywords. + + ntpd/ntp_request.c + 1.25 01/11/19 21:29:33 stenn@whimsy.udel.edu +25 -20 + Alphabetize the keyword checks. + + setclr/handle the CAL and AUTH flag bits, too. + + ntpdc/ntpdc_ops.c + 1.12 01/11/19 21:29:33 stenn@whimsy.udel.edu +17 -13 + Flag cleanup. + +ChangeSet@1.754, 2001-11-16 23:35:26-05:00, stenn@whimsy.udel.edu + ntp_resolver.c is currently unused. + + ntpd/Makefile.am + 1.22 01/11/16 23:35:25 stenn@whimsy.udel.edu +2 -1 + ntp_resolver.c is currently unused. + +ChangeSet@1.753, 2001-11-10 13:46:34-05:00, stenn@whimsy.udel.edu + Handle the version stuff even when building completely outside + the srcdir. + + Makefile.am + 1.24 01/11/10 13:46:34 stenn@whimsy.udel.edu +7 -1 + Handle the version stuff even when building completely outside + the srcdir. + +ChangeSet@1.752, 2001-11-09 23:29:51-05:00, stenn@whimsy.udel.edu + Improve the version file generation code. + + Makefile.am + 1.23 01/11/09 23:29:50 stenn@whimsy.udel.edu +3 -4 + Improve the version file generation code. + +ChangeSet@1.751, 2001-11-08 16:46:12-05:00, stenn@whimsy.udel.edu + Make the cmp of the version file be silent. + + Makefile.am + 1.22 01/11/08 16:46:11 stenn@whimsy.udel.edu +1 -1 + Make the cmp of the version file be silent. + +ChangeSet@1.750, 2001-11-08 16:37:05-05:00, stenn@whimsy.udel.edu + Fix the version file update code. + Reported by John Hay. + The "version" file should not be checked in. + + Makefile.am + 1.21 01/11/08 16:37:02 stenn@whimsy.udel.edu +3 -2 + Fix the version file update code. + Reported by John Hay. - * configure.in: 4.1.0 + BitKeeper/deleted/.del-version~aeecada457249d0c + 1.2 01/11/08 16:34:27 stenn@whimsy.udel.edu +1 -1 + Delete: version -2001-07-27 Harlan Stenn +ChangeSet@1.749, 2001-11-08 03:06:18-05:00, stenn@whimsy.udel.edu + Get the ChangeSet number in the compiled-in version strings. - * ntpd/refclock_oncore.c (oncore_start): Set pps_enable=1, just - like the atom driver does. - From: reg@dwf.com + version + 1.1 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -0 - * ntpd/refclock_nmea.c (nmea_ppsapi): Set pps_enable=1, just like - the atom driver does. - From: Scott Allendorf + BitKeeper/etc/ignore + 1.12 01/11/08 03:06:17 stenn@whimsy.udel.edu +1 -0 + Added version to the ignore list - * ntpd/ntp_config.c (getconfig): CONF_CLOCK_PANIC was using the - wrong config flag. - From: + version + 1.0 01/11/08 03:06:16 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/version + + Makefile.am + 1.20 01/11/08 03:06:16 stenn@whimsy.udel.edu +9 -3 + Maintain the version file, which holds the latest ChangeSet number. + + ntpd/Makefile.am + 1.21 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -1 + Pass the contents of the version file in to the mkver script. + + ntpdate/Makefile.am + 1.7 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -1 + Pass the contents of the version file in to the mkver script. + + ntpdc/Makefile.am + 1.5 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -1 + Pass the contents of the version file in to the mkver script. + + ntpq/Makefile.am + 1.6 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -1 + Pass the contents of the version file in to the mkver script. -2001-07-10 Harlan Stenn + ntptrace/Makefile.am + 1.4 01/11/08 03:06:16 stenn@whimsy.udel.edu +1 -1 + Pass the contents of the version file in to the mkver script. - * configure.in: 4.0.99m-rc3 + scripts/mkver.in + 1.9 01/11/08 03:06:16 stenn@whimsy.udel.edu +5 -0 + If -2001-07-06 Harlan Stenn +ChangeSet@1.748, 2001-11-04 04:38:31-05:00, stenn@whimsy.udel.edu + Lose an obsolete file. - * ntp_update: COPYRIGHT needs a touch. - From: Mike Stump + BitKeeper/deleted/.del-00-list~baf8bb517d043606 + 1.3 01/11/04 04:34:24 stenn@whimsy.udel.edu +0 -0 + Delete: BitKeeper/triggers/00-list -2001-07-04 Harlan Stenn +ChangeSet@1.747, 2001-11-04 04:21:46-05:00, stenn@whimsy.udel.edu + Attempt to handle the cases where triggers are being run from the + RESYNC dir. - * html/config.htm: Major cleanup. - From: Martin Janzen + BitKeeper/triggers/delta-changelog + 1.3 01/11/04 04:21:45 stenn@whimsy.udel.edu +1 -1 + Use bkp to make sure we get the .lgc file in the repo and not + (potentially) the (bogus) one in the RESYNC tree. - * configure.in (rt library check): Don't look for -lrt under - Linux. Under glibc-2.1.2 and -2.2.2 (at least), the POSIX- - compatibility real-time library does strange things with threads - as other processes and we're getting lots of complaints about it. - Reported by: Juha Sarlin - -2001-06-30 Harlan Stenn + BitKeeper/triggers/lg-changeset + 1.2 01/11/04 04:21:45 stenn@whimsy.udel.edu +1 -1 + Make sure we're're accessing the .lgc file in the main repo and not in a RESYNC dir. - * html/driver35.htm: Update email address. + BitKeeper/triggers/triggert + 1.4 01/11/04 04:21:45 stenn@whimsy.udel.edu +10 -4 + General cleanup, and pass along $bkp (bk repo prefix) so we can + find the repo directory instead of the RESYNC dir. -2001-06-25 Harlan Stenn +ChangeSet@1.746, 2001-11-03 14:46:21-05:00, stenn@whimsy.udel.edu + Cleanup - * ntpd/refclock_oncore.c (oncore_msg_BaEaHa): Fix wrong offset for - rsm.bad_almanac - From: Reynir Siik + BitKeeper/triggers/trigger.mk + 1.7 01/11/03 14:46:20 stenn@whimsy.udel.edu +2 -7 + Cleanup -2001-06-12 Harlan Stenn +ChangeSet@1.745, 2001-11-02 16:56:25-05:00, stenn@whimsy.udel.edu + Cleanup. - * configure.in: 4.0.99m-rc2 + BitKeeper/triggers/trigger.mk + 1.6 01/11/02 16:56:25 stenn@whimsy.udel.edu +0 -1 + Remove the trigger.touch file. No longer needed. + We should look at some of the other touch files, too. -2001-06-10 Harlan Stenn +ChangeSet@1.744, 2001-11-02 16:39:34-05:00, stenn@whimsy.udel.edu + Cleanup/reality check smoe trigger stuff. - * ntpd/ntp_config.c: - * include/ntp_config.h: includefile config keyword support - From: Dean Gibson + BitKeeper/triggers/trigger.README + 1.3 01/11/02 16:39:33 stenn@whimsy.udel.edu +8 -7 + Cleanup/reality check the file. -2001-06-08 Harlan Stenn + BitKeeper/triggers/trigger.cfg + 1.7 01/11/02 16:39:33 stenn@whimsy.udel.edu +3 -5 + Update the header docs, merge some of the trigger scripts. - * configure.in: 4.0.99m-rc1b +ChangeSet@1.743, 2001-11-02 04:52:47-05:00, stenn@whimsy.udel.edu + Enable the delta changelog and last-good changeset triggers. - * ntpd/refclock_true.c (true_debug): Bump some buffer sizes to - reduce/eliminate chance of buffer overflow. Use snprintf() - instead of sprintf(). Do a better job of opening the debug file. - * ntpd/ntp_control.c (ctl_getitem): Count overflow packets as bad - and return a BADFMT. - * ntpd/ntp_config.c (save_resolve): call fdopen() with the correct - mode. - From: Bela Lubkin + BitKeeper/triggers/trigger.cfg + 1.6 01/11/02 04:52:47 stenn@whimsy.udel.edu +4 -4 + Enable the delta changelog and last-good changeset triggers. -2001-06-03 Harlan Stenn +ChangeSet@1.742, 2001-11-02 04:33:25-05:00, stenn@whimsy.udel.edu + Prepend the new logs to the ChangeLog. - * include/ntp.h (RES_ALLFLAGS): Add RES_DEMOBILIZE. - From: Dean Gibson + BitKeeper/triggers/delta-changelog + 1.2 01/11/02 04:33:25 stenn@whimsy.udel.edu +3 -1 + Prepend the new logs to the ChangeLog. - * configure.in: 4.0.99m-rc1a +ChangeSet@1.741, 2001-11-02 04:15:19-05:00, stenn@whimsy.udel.edu + Now that we are using sed to install the trigger, call 'chmod +x' + when we're done. -2001-06-02 Harlan Stenn + BitKeeper/triggers/trigger.mk + 1.5 01/11/02 04:15:18 stenn@whimsy.udel.edu +1 -1 + Now that we are using sed to install the trigger, call 'chmod +x' + when we're done. - * ntpd/ntp_refclock.c (refclock_open): Add O_NOCTTY to the open() - flags when opening a serial port. - Reported by: joseph lang + BitKeeper/triggers/triggerd + 1.15 01/11/02 04:15:18 stenn@whimsy.udel.edu +1 -0 + Now that we are using sed to install the trigger, call 'chmod +x' + when we're done. -2001-05-31 Harlan Stenn +ChangeSet@1.740, 2001-11-02 04:05:19-05:00, stenn@whimsy.udel.edu + Better logging. - * html/notes.htm: Typo fix. - From: John Stone + BitKeeper/triggers/triggert + 1.3 01/11/02 04:05:18 stenn@whimsy.udel.edu +1 -1 + Better logging. - * configure.in: 4.0.99m-rc1 +ChangeSet@1.739, 2001-11-02 03:58:14-05:00, stenn@whimsy.udel.edu + Mirror updates. - * html/monopt.htm: Typo fix. - * html/confopt.htm: Cruft removal. - From: John Stone + BitKeeper/triggers/trigger.cfg + 1.5 01/11/02 03:58:13 stenn@whimsy.udel.edu +2 -2 + Enable the mirror updates -2001-05-30 Harlan Stenn +ChangeSet@1.738, 2001-11-02 03:49:01-05:00, stenn@whimsy.udel.edu + Typos. - * README.cvs: More updates and cleanup. + BitKeeper/triggers/triggerd + 1.14 01/11/02 03:49:00 stenn@whimsy.udel.edu +1 -1 + Typos. I"m getting pretty tired... - * ntpd/ntp_loopfilter.c (loop_config): - Check against STA_NANO instead of (NTP_API > 3) to catch kernels - that were rolled while the spec was evolving. - From: John.Hay@icomtek.csir.co.za +ChangeSet@1.737, 2001-11-02 03:42:45-05:00, stenn@whimsy.udel.edu + Trigger manager improvements. - * README.cvs: Note that we want to check out NTP into a clean - subdir. - Reported by jrd@cc.usu.edu (Joe Doupnik) + BitKeeper/triggers/triggerd + 1.13 01/11/02 03:42:44 stenn@whimsy.udel.edu +3 -3 + Install triggert to call the actual trigger, using a sed substitution. -2001-05-27 Harlan Stenn +ChangeSet@1.736, 2001-11-02 03:33:15-05:00, stenn@whimsy.udel.edu + Typo. - * configure.in: 4.0.99k40 + BitKeeper/triggers/trigger.mk + 1.4 01/11/02 03:33:15 stenn@whimsy.udel.edu +1 -1 + Typo. - * include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change - to use most recent MAXSTAGE entries when the filter overflows (ie - driver poking say once per second with poll > MAXSTAGE) rather - than blocking after MAXSTAGE entries (turf oldest rather than turf - most recent). - From: John Woolner +ChangeSet@1.735, 2001-11-02 03:24:31-05:00, stenn@whimsy.udel.edu + trigger manager improvements. - * ntpd/refclock_true.c: - a. Don't cream pp->a_lastcode when we get a pair - b. Fix up pp->leap handling to work correctly - c. clear CEVNT_BADTIME etc warnings when we get good clock - CEVNT_NOMINAL. - From: John Woolner + BitKeeper/triggers/trigger.mk + 1.3 01/11/02 03:24:30 stenn@whimsy.udel.edu +1 -1 + Use sed instead of cp to copy triggert to the target; we will + most likely want to use this trick for the triggers in trigger.cfg, + too. - * kernel/sys/pcl720.h: - Add support for the XL clock to refclock_true.c - From: Paul A Vixie + BitKeeper/triggers/triggert + 1.2 01/11/02 03:24:30 stenn@whimsy.udel.edu +1 -1 + Use a sed substitution for the target trigger name. - * ntpd/ntp_loopfilter.c (local_clock): One more attempt at - "improving" the panic message. +ChangeSet@1.734, 2001-11-02 03:08:17-05:00, stenn@whimsy.udel.edu + More trigger manager fixes -2001-05-26 Harlan Stenn + BitKeeper/triggers/triggerd + 1.12 01/11/02 03:08:17 stenn@whimsy.udel.edu +2 -2 + Set the file count to 0 even earlier. - * configure.in (ac_cv_func_ctty_for_f_setown): BSDI3 needs a ctty - for F_SETOWN, too. - From: Paul A Vixie +ChangeSet@1.733, 2001-11-02 02:49:46-05:00, stenn@whimsy.udel.edu + More trigger manager work -2001-05-24 Harlan Stenn + BitKeeper/triggers/triggerd + 1.11 01/11/02 02:49:46 stenn@whimsy.udel.edu +3 -2 + Don't reset the count at each new tag; somebody might use a tag more + than once. - * html/ntpd.htm: Typo. - From: John Stone +ChangeSet@1.732, 2001-11-02 02:36:34-05:00, stenn@whimsy.udel.edu + Start enabling more triggers... -2001-05-23 Harlan Stenn + BitKeeper/triggers/trigger.cfg + 1.4 01/11/02 02:36:34 stenn@whimsy.udel.edu +1 -1 + Try enabling the paranoid check. - * configure.in: 4.0.99k39 + BitKeeper/etc/ignore + 1.11 01/11/02 02:36:33 stenn@whimsy.udel.edu +1 -0 + Ignore BitKeeper/triggers/p*--*, as those are the files installed + by the trigger manager package. - * ntpd/ntp_loopfilter.c (local_clock): huffpuff cleanup/improvements. - (huffpuff): Cleanup/improvements. - (loop_config): huffpuff initialization cleanup/improvements. - From: Dave Mills, Terje, Mark, and John? +ChangeSet@1.731, 2001-11-02 02:29:37-05:00, stenn@whimsy.udel.edu + More trigger manager cleanup. -2001-05-22 Harlan Stenn + BitKeeper/triggers/triggerd + 1.10 01/11/02 02:29:36 stenn@whimsy.udel.edu +26 -21 + Typos, cleanup. - * html/release.htm: - * html/ntpd.htm: - * html/miscopt.htm: - From: Dave Mills: Updates. +ChangeSet@1.730, 2001-11-02 00:27:34-05:00, stenn@whimsy.udel.edu + More trigger manager work. -2001-05-21 Harlan Stenn + BitKeeper/triggers/triggerd + 1.9 01/11/02 00:27:33 stenn@whimsy.udel.edu +6 -3 + Better logging. + Fix some typos. - * configure.in: 4.0.99k38 +ChangeSet@1.729, 2001-11-02 00:12:41-05:00, stenn@whimsy.udel.edu + Another pass at the trigger manager. - * ntpd/ntp_proto.c (clock_filter): Huff-n-Puff and Popcorn - improvements. - * ntpd/ntp_loopfilter.c (local_clock): Debug cleanup - From: Dave Mills. + BitKeeper/triggers/trigger.README + 1.2 01/11/02 00:12:40 stenn@whimsy.udel.edu +2 -5 + Implement multiple triggers per tag line. - * include/ntp_syscall.h (ntp_gettime): Updated patch from Ulrich. - My original attempt was not backwards compatible. + BitKeeper/triggers/trigger.cfg + 1.3 01/11/02 00:12:40 stenn@whimsy.udel.edu +1 -1 + Enable the "notify" trigger. -2001-05-17 Harlan Stenn + BitKeeper/triggers/trigger.mk + 1.2 01/11/02 00:12:40 stenn@whimsy.udel.edu +1 -2 + Only install triggerd for post-commit and post-incoming. - * include/ntp_syscall.h (ntp_gettime): Fill in the tai member. - From: Ulrich Windl + BitKeeper/triggers/triggerd + 1.8 01/11/02 00:12:40 stenn@whimsy.udel.edu +55 -19 + Now that wedon't call the triggers from triggerd, there is no reason + to re-exec ourselves. + + When we process the triggers.cfg file, first remove the old triggers. + Validate the trigger classes. + Process each script for each tag, installing them so that they are + executed in the correct order. - * configure.in: 4.0.99k37 +ChangeSet@1.728, 2001-10-24 10:00:02-04:00, stenn@whimsy.udel.edu + Disable our triggers until I can find the processing bug. - * ntpd/ntp_proto.c (clock_filter): Lose "off", xtemp and ytemp, - and some obsoleted calculations. Set the peer->offset and - peer->delay from the filter stages. + BitKeeper/triggers/trigger.cfg + 1.2 01/10/24 10:00:02 stenn@whimsy.udel.edu +8 -8 + Disable our triggers until I can find the processing bug. - * ntpd/ntp_loopfilter.c: Comment/document improvements. - (local_clock): correct the offset by one-half the difference - between the sample delay and minimum delay. Lose "mu" from the - debug message. - From: Dave Mills. +ChangeSet@1.727, 2001-10-24 04:42:37-04:00, stenn@whimsy.udel.edu + Recover the 2mirror script. -2001-05-15 Harlan Stenn + BitKeeper/triggers/2mirrors + 1.1 01/10/24 04:14:04 stenn@whimsy.udel.edu +40 -0 - * configure.in: 4.0.99k36 + BitKeeper/triggers/2mirrors + 1.0 01/10/24 04:14:04 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/2mirrors - * ntpd/ntp_loopfilter.c: Huff-n-puff cleanup - From: Dave Mills. + BitKeeper/triggers/triggerd + 1.7 01/10/24 03:54:25 stenn@whimsy.udel.edu +1 -4 + Quiet some debug stuff. -2001-05-14 Harlan Stenn + BitKeeper/triggers/triggerd + 1.6 01/10/24 03:43:12 stenn@whimsy.udel.edu +3 -2 + Run the right script. Sigh. - * configure.in: 4.0.99k35 + BitKeeper/triggers/triggerd + 1.5 01/10/24 03:33:59 stenn@whimsy.udel.edu +2 -0 + triggerd hacking - * ntpd/refclock_atom.c (atom_ppsapi): set pps_enable=1 if - enb_hardpps. - * ntpd/ntp_timer.c: huffpuff support. - (init_timer): huffpuff support. - (timer): huffpuff support. - * ntpd/ntp_proto.c (init_proto): Initialize pps_enable to 0, not 1. - * ntpd/ntp_loopfilter.c (CLOCK_HUFFPUFF): Added. - Add huff-n-puff filter variables. - (local_clock): Lose "pps sync enabled" log noise. - (huffpuff): Added. - (loop_config): LOOP_MINPOLL and LOOP_ALLAN were missing the - trailing break; add LOOP_HUFFPUFF. - * ntpd/ntp_config.c: tinker huffpuff added. - (getconfig): CONF_CLOCK_HUFFPUFF support. - * include/ntpd.h: huffpuff() declaration. - * include/ntp_config.h (CONF_CLOCK_HUFFPUFF): Added. - * include/ntp.h (HUFFPUFF): Added. - (LOOP_HUFFPUFF): Added. - From: Dave Mills. + BitKeeper/triggers/triggerd + 1.4 01/10/24 03:07:10 stenn@whimsy.udel.edu +2 -1 + Disable the re-exec; it seems to be hosing us. -2001-05-11 Harlan Stenn + BitKeeper/triggers/triggerd + 1.3 01/10/24 02:46:31 stenn@whimsy.udel.edu +2 -1 + Use the right ball. Actually get the script if it isn't checked + out and actually run it. - * html/driver20.htm: Reality check. - * ntpd/refclock_nmea.c: Comment cleanup - From: John Woolner + BitKeeper/triggers/triggerd + 1.2 01/10/24 01:59:12 stenn@whimsy.udel.edu +1 -0 + Play ball - actually run the intended trigger script. - * html/release.htm: Cleanup (at least). - * html/refclock.htm: Cleanup (at least). - * html/kern.htm: Cleanup (at least). - * html/index.htm: Cleanup (at least). - * html/extern.htm: Cleanup (at least). - * html/driver1.htm: Cleanup (at least). - * html/debug.htm: Cleanp (at least). - * html/accopt.htm: KoD documentation update. - From: Dave Mills. +ChangeSet@1.726, 2001-10-24 01:50:16-04:00, stenn@whimsy.udel.edu + Ignore some of the trigger system overhead files. - * configure.in: 4.0.99k34 + BitKeeper/etc/ignore + 1.10 01/10/24 01:37:32 stenn@whimsy.udel.edu +3 -0 + added BitKeeper/triggers/trigger.t1 BitKeeper/triggers/trigger.t2 BitKeeper/triggers/trigger.touch - * ntpd/ntp_util.c (record_loop_stats): values are now passed in. - * ntpd/ntp_loopfilter.c (local_clock): pass the values to - record_loop_stats(). - * include/ntpd.h: Pass the parameters in to record_loop_stats(). - With the discipline loop opened (disable ntp) the local clock - updates were not being sent to loopstats. That now is. - From: Dave Mills. - -2001-05-10 Harlan Stenn - - * configure.in: 4.0.99k33 - - * ntpd/ntp_proto.c (receive): Validate the source port. Lose - NTPv1 support. - * ntpd/ntp_loopfilter.c (local_clock): Sanity check sys_poll - earlier instead of later. - From: Dave Mills. - - * ntpd/refclock_oncore.c (oncore_msg_any): We don't always have - GETTIMEOFDAY(). - -2001-05-09 Harlan Stenn - - * ntpd/refclock_shm.c (shm_poll): Apply JAN_1970 correction after - calling TVTOTS(), just like everybody else does. - From: David Malone - - * ntpd/refclock_ulink.c: fixed 33x quality flag, added more - debugging stuff, updated 33x time code explanation. - From: s.l.smith (via j.c.lang). - -2001-05-08 Harlan Stenn - - * configure.in: 4.0.99k32 - - * ntpd/ntp_loopfilter.c: rstclock now takes a 3rd argument, the - last offset. - (init_loopfilter): Use it. - (local_clock): Use it. Clean up the code. - (loop_config): Use it. - (rstclock): Implement it. Clean up the code. - From Dave Mills. - -2001-05-06 Harlan Stenn - - * configure.in: 4.0.99k31 - - * ntpdc/ntpdc_ops.c (sysstats): That's 'bad packet format' - (instead of '... length'), and 'packets rejected' (instead of - 'limitation rejects'. - * ntpd/ntp_proto.c (receive): PUBKEY fixes. Move KoD stuff to - process_packet(). - (process_packet): Move KoD stuff here... - (peer_clear): Unspec the stratum, too. - (clock_filter): Don't update peer->epoch here. Fix the filter - test when checking the epoch. - (fast_xmit): Send back STRATUM_UNSPEC on a KoD packet. - (init_proto): Initialize sys_jitter. - - * ntpd/ntp_loopfilter.c: rstclock() takes 2 parameters now. - (init_loopfilter): Use it... - (local_clock): Ditto, and change the "mu" calculation. Improve - the jitter test in S_SYNC. Use peer->epoch (not current_time) to - update the last_time. Update debug info. - (rstclock): 2nd arg - the epoch to use. Use it. - (loop_config): update call to rstclock. - From: Dave Mills. - -2001-05-01 Harlan Stenn - - * ports/winnt/ntpd/ntpd.dsp: Add cmd_args.c - From: Wink Saville - -2001-04-29 Harlan Stenn - - * ntpq/ntpq.c (tstflags): 11 now. - From: John Cochran - - * ntpd/ntp_proto.c (receive): KoD updates. Improve the comments. - Lose the AM_PROCPKT restrictions test. - (peer_xmit): Check/report on no encryption key in packet. - (fast_xmit): Use peer_xmit's new packet length check code. - From Dave Mills. - -2001-04-28 Harlan Stenn - - * configure.in: 4.0.99k30 - -2001-04-27 Harlan Stenn - - * ntpdc/ntpdc_ops.c: Added "kod", lost "demobilize". - * ntpd/ntp_config.c: Added "kod" keyword. Lose "demobilize" keyword. - * html/release.htm: Updated. - * html/accopt.htm: Updated. - From: Dave Mills. - - * ntpq/ntpq.c: Reorder and add some TEST flag bits. - * ntpd/ntp_proto.c (transmit): Also bail if access denied. - (receive): Lose RES_DEMOBILIZE and (some?) RES_DONTSERVE and - RES_LIMITIED stuff. Update Kiss-Of-Death (KoD) docs. - Call fast_xmit with new 3rd parameter (restrict_mask). - Before checking for an authentic packet, check the restrict_mask - for RES_{DONTSERVE,LIMITED,NOPEER}. - Check restrictions in AM_PROCPKT case. - (peer_clear): Don't lose the stratum if the peer->flags don't - indicate FLAG_REFCLOCK. - (fast_xmit): Take restrict mask as a new argument, and handle - KoD. Reorder some code. - From: Dave Mills. - -2001-04-26 Harlan Stenn - - * ntpdc/ntpdc_ops.c: restrict/unrestrict support for version and - demobilize. Implement demobilze. - * ntpd/ntp_proto.c (receive): Improve version testing, including - RES_DEMOBILIZE support. - (fast_xmit): Patches to kiss-of-death packet. - * ntpd/ntp_loopfilter.c (local_clock): S_SYNC case now also checks - abs(clock_offset) against CLOCK_PGATE*sys_jitter. - * ntpd/ntp_config.c: CONF_RES_DEMOBILIZE/demobilize support. - * include/ntp_config.h (CONF_RES_DEMOBILIZE): Added. - * include/ntp.h (RES_DEMOBILIZE): Added. - From Dave Mills. - -2001-04-25 Harlan Stenn - - * html/accopt.htm: Document the "version" parameter - From Dave Mills. - - * ntpd/ntp_proto.c (fast_xmit): Implement DENY mode. - From Dave Mills. - - * ntpd/ntp_config.c: Add the "allan" tinker variable. - From: Juha Sarlin - - * ntpd/refclock_hopfpci.c (hopfpci_start): Lose the "correct_any" - stuff - it's both obsolete and wrong. - - * ntpd/ntp_proto.c (receive): Keep track of packet versions. - Implement RES_LIMITED. - * include/ntp_config.h (CONF_RES_LIMITED): - * include/ntp.h (RES_LIMITED): Leave the bits in the original - order. - From Dave Mills. - - * util/timetrim.c: - * util/Makefile.am: - * ntpdc/ntpdc_ops.c: - * ntpd/refclock_nmea.c: - * libntp/snprintf.c: - * configure.in: - * configure: - * config.h.in: - * aclocal.m4: - * acconfig.h: - Lint cleanup from: Marc Brett - - * ntpd/ntp_config.c: Add "version" support. - (getconfig): version support. - * include/ntp_config.h (CONF_RES_VERSION): Added. - * include/ntp.h (RES_VERSION): Added. - From: Dave Mills. - - * include/ntp_machine.h (ifreq): WinNT cleanup - -2001-04-23 Harlan Stenn - - * configure.in: 4.0.99k29 - - * html/miscopt.htm: Document the "allan" tinker variable. - * ntpd/ntp_proto.c (clock_filter): Update comments. Lose etemp; - we now use allan_xpt for this. - * ntpd/ntp_loopfilter.c: Added allan_xpt as a tinker variable. - Reorganize variables and improve comments. - (local_clock): Improve comments, use (new) allan_xpt instead of - CLOCK_ALLAN. Fix test in S_SYNC state. Update debug info. - (rstclock): No longer force allan_xpt to CVLOCK_ALLAN in S_FREQ, - S_SYNC, or default case. - (loop_config): Document dangerous tinker variables, and add - LOOP_ALLAN to the list. - * include/ntp_config.h (CONF_CLOCK_ALLAN): Added. - * include/ntp.h (LOOP_ALLAN): Added. - Allan intercept fixes from Dave Mills. - - * scripts/mkver.in: Use the C locale so the dates come out in a - consistent format. - From: ASANO Naoyuki - - * build: Run "config.status" before the "make" because it probably - saves time and trouble. Probably... - - * flock-build: Try building sequentially. - -2001-04-22 Harlan Stenn - - * configure.in (ac_cv_make_tickadj): Fix it right... - - * util/ntp-genkeys.c: extern config_netinfo, too. - - * util/hist.c: - * ntptrace/ntptrace.c: - * ntpq/ntpq.c: - * ntpdc/ntpdc.c: - * ntpdate/ntptimeset.c: - * ntpdate/ntpdate.c: - * ntpd/refclock_parse.c: - * ntpd/refclock_msfees.c: - * ntpd/refclock_jupiter.c: - * ntpd/ntp_refclock.c: - * ntpd/ntp_io.c: - * libparse/clk_wharton.c: - * libparse/clk_varitext.c: - * libparse/clk_trimtaip.c: - * libparse/clk_schmid.c: - * libparse/clk_rcc8000.c: - * libparse/clk_rawdcf.c: - * libparse/clk_meinberg.c: - * libparse/clk_hopf6021.c: - * libparse/clk_dcf7000.c: - * libparse/clk_computime.c: - Lint. From: Simon Burge - -2001-04-21 Harlan Stenn - - * ntpd/refclock_nmea.c (nmea_receive): Fixes. - From: John Woolner - - * util/ntp-genkeys.c: Declare check_netinfo, don't define it. - From: Jack Bryans - - * configure.in (RSASRCS): rsaref2 needs digit.h (I thought I fixed - this already). - - * configure.in (CFLAGS): Disable -Wconversion, enable - -Wmissing-prototypes, and allow for -Werror. - From: Simon Burge - - * util/ntp-genkeys.c (main): Reset the standard mask so the - symlinks are created with the standard mask. - - * configure.in: 4.0.99k28 - - * ntpd/ntpd.c (ntpdmain): Use mode_t for umask value. - - * util/ntp-genkeys.c: Create files with the right umask. - - * util/ntp-genkeys.c: config_file should be declared, not defined. - * ntpd/refclock_mx4200.c (mx4200_pps): debug cleanup. - * ntpd/refclock_hopfser.c: If we're not using it, provide the _bs. - * ntpd/refclock_heath.c (heath_receive): Add missing "break" - statements. - * ntpd/ntp_proto.c: Lose extra definition of mode_ntpdate. - * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Put RSASRCS - on the same line as rsaref.h to improve portability. - * libntp/msyslog.c: Lint cleanup. - From: Marc.Brett@westerngeco.com - - * util/ntp-genkeys.c: - * ntpdate/ntpdate.c: - * ntpd/ntp_config.c: Netinfo header reorder. - From: Jack Bryans - - * configure.in: timespec can be found by looking in goofy places - under SunOS. - -2001-04-20 Harlan Stenn - - * ntpd/refclock_nmea.c: PPSAPI cleanup, default to RMC sentences, - handle milliseconds, multiple sentences, other good stuff. - From: John Woolner , Marc.Brett@westerngeco.com, - John.Hay@icomtek.csir.co.za - - * ntpd/ntp_proto.c (receive): In the AM_NEWBCL case, return in all - cases at the end. - * ntpd/ntp_peer.c (newpeer): Check cast_flags against MDF_BCLNT, - not against MDF_BCAST. - * ntpd/ntp_loopfilter.c (local_clock): Lose debug info. - * ntpd/ntp_crypto.c (crypto_recv): Bugfix. - From: Dave Mills. - - * configure.in: 4.0.99k27 - - * ntpd/ntp_loopfilter.c (local_clock): Check clock_panic > 0. - Check clock_max > 0. - * html/ntpd.htm: Cleanup. - * html/miscopt.htm: Cleanup. - * html/confopt.htm: Cleanup minpoll documentation. - From: Dave Mills. - -2001-04-19 Harlan Stenn - - * ntpd/cmd_args.c (getstartup): check_netinfo needs an extern - declaration. - Reported by: Jack Bryans - - * configure.in (ac_cv_make_timetrim): Added. - * util/Makefile.am (bin_PROGRAMS): MAKE_TIMETRIM - Requested by: Jack Bryans - - * configure.in: 4.0.99k26 - - * util/ntp-genkeys.c: - * ntpd/refclock_oncore.c: - * ntpd/ntp_peer.c: - * libntp/msyslog.c: - * libntp/audio.c: - Lint cleanup. - From: Simon Burge - - * ntpd/ntp_loopfilter.c (local_clock): debug message improvements - from Dave Mills. - - * libntp/emalloc.c (emalloc): Tell people we are exiting if we log - an out-of-memory condition. - - * util/ntp-genkeys.c (main): Don't allow '#' in a generated MD5 - key. Reported by: Dave Tyson - -2001-04-18 Harlan Stenn - - * ntpd/ntp_proto.c (clock_update): minpoll cleanup. - (clock_select): minpoll cleanup. - (clock_filter): Bugfixes from Mark Martinec - * ntpd/ntp_loopfilter.c (rstclock): minpoll cleanup. Debug cleanup. - * ntpd/ntp_config.c (getconfig): Initialize/bounds check minpoll - using NTP_MINDPOLL insted of sys_minpoll. - From: Dave Mills. - -2001-04-17 Harlan Stenn - - * libntp/msyslog.c: - * ElectricFence/page.c (stringErrorReport): Follow Rainer's lead - and use strerror(). - - * ntpd/refclock_shm.c (shm_start): Always use strerror. - * libntp/msyslog.c (msyslog): Use strerror if present. - From: Rainer Orth - - * libparse/parsesolaris.c (rdchar): Cast ~0 to unsigned long. - * libntp/buftvtots.c (buftvtots): Allow for 8-byte tv_sec, tv_usec - in struct timeval. - From: Rainer Orth - -2001-04-16 Harlan Stenn - - * ntpd/ntp_config.c (getconfig): move "tinker" so it's generally - available. - -2001-04-15 Harlan Stenn - - * configure.in: Look for getclock(). - - * ntpd/ntp_config.c (getconfig): Squawk if provided minpoll or - maxpoll values are out of range. - - * ntpd/ntp_proto.c (poll_update): Some operations can only be done - if we're compiling with some REFCLOCKs. - From Dave Mills. - - * configure.in (RSASRCS): Added. - * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Use RSASRCS. - - * configure.in: Limit the DECL_HSTRERROR_0 to aix4.3.*. RSN, we - could also limit it to xlc... - - * configure.in: 4.0.99k25 - - * html/leap.htm: Added. - * html/index.htm: Update. - * html/driver7.htm: Update. - * html/driver6.htm: Update. - * html/driver36.htm: Update. - * html/audio.htm: Update. - * html/y2k.htm: Removed. - From Dave Mills. - -2001-04-14 Harlan Stenn - - * acconfig.h: Lose extra declarations of PACKAGE and VERSION. - - * acconfig.h: - * configure.in: - * include/l_stdlib.h: DECL_HSTRERROR_0 needed for xlc under AIX 4.3.2. - Reported by: Harald Barth - - * ntpd/ntp_proto.c (proto_config): cal_enable (PROTO_CAL) is - invalid if no refclocks are present. - From: Frodo Looijaard - - * README.cvs: On some systems, the -C option fails. - - * ntpd/refclock_nmea.c: - * ntpd/ntp_refclock.c: - * html/driver20.htm: - PPSAPI patches for NMEA driver. - From: John.Hay@icomtek.csir.co.za - - * README.rsa: Describe RSAEuro support, provide alternate rsa.c - patch. - * configure.in: Check for rsaeuro1, RSAOBJS, RSADIR respectively. - * html/build.htm: Hint at rsaeuro1 directory. - * include/global.h (BYTE): Define. - * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Removed rsaref2 - specific sources. - (librsaref_a_LIBADD): Add appropriate objects. - (librsaref_a_DEPENDENCIES): Work around automake limitation. - (stamp-rsaref): Use RSADIR. - * scripts/README: Document ntp-close. - * scripts/Makefile.am (EXTRA_DIST): Distribute it. - * Makefile.am (DISTCLEANFILES): Remove .warning. - * librsaref/Makefile.am (DISTCLEANFILES): Remove copied/touched - librsaref sources, stamp-rsaref. - * ntpdate/Makefile.am (DISTCLEANFILES): Remove version.c. - * ntpq/Makefile.am (DISTCLEANFILES): Likewise. - * parseutil/Makefile.am (DISTCLEANFILES): Remove $(EXTRA_PROGRAMS). - Rainer Orth - - * ntpd/ntp_control.c: Header cleanup - -2001-04-13 Harlan Stenn - - * configure.in: Properly align --help output. - Explain ElectricFence. - From: Rainer Orth - - * ntpd/ntp_loopfilter.c (local_clock): Lose debugging statements. - * ntpd/ntp_proto.c (clock_filter): Rewrite. - From: Dave Mills - - * ntpd/ntp_control.c (ctl_getitem): msyslog() possible buffer - overflow exploit. - - * configure.in: 4.0.99k24 - - * html/pic/radio2.jpg: - * html/release.htm: - * html/refclock.htm: - * html/pps.htm: - * html/ntpd.htm: - * html/miscopt.htm: - * html/driver22.htm: - * html/confopt.htm: - Updated documentation from Dave Mills. - - * util/ntp-genkeys.c: sys_minpoll. - * ntpd/refclock_atom.c: Comment additions. - * ntpd/ntp_proto.c: mode_ntpdate and peer_ntpdate added. - (transmit): We want 3, not 2, consecutive polls. hpoll logic - cleanup. mode_ntpdate changes. - (receive): When setting up a newpeer, use our sys_minpoll, not the - peer->ppoll. - (clock_update): sys_minpoll changes. Reorder some case 1 code. - Don't exit in case 2. - (poll_update): hpoll cleanup. - (peer_clear): u_rand. Use u_rand to randomize the initial poll. - * ntpd/ntp_peer.c (newpeer): Bump peer_ntpdate if we're in - mode_ntpdate. - * ntpd/ntp_loopfilter.c: Initialize sys_poll and sys_minpoll to - NTP_MINDPOLL. - (local_clock): Clean up some debug/info messages. - (rstclock): Use sys_minpoll. - (loop_config): KERNEL_PLL sanity checks. LOOP_MINPOLL support. - * ntpd/ntp_crypto.c (crypto_recv): Turn off FLAG_AUTOKEY when we - turn off TEST10. - * ntpd/ntp_control.c (ctl_getitem): Buffer overflow check. Clean - up some loop logic. - * ntpd/ntp_config.c: Added "tinker" and "minpoll". Use - sys_minpoll now, instead of old manifest constant. - (save_resolve): Print keyid using decimal, not hex. From Lars-Owe - Ivarsson - * include/ntpd.h: Added peer_ntpdate and sys_minpoll. - * include/ntp_config.h (CONF_CLOCK_MINPOLL): Added. - * include/ntp.h: keyid cleanup. LOOP_* cleanup. - From Dave Mills. - -2001-04-03 Harlan Stenn - - * ntpd/ntp_proto.c (clock_filter): Swell stuff. - From: Mark Martinec - - * ports/winnt/ntpd/ntpd.dsp: - * ports/winnt/ntpd/hopf_PCI_io.c: - * ports/winnt/include/hopf_PCI_io.h: - * ports/winnt/include/config.h: - * ntpd/refclock_hopfser.c: - * ntpd/refclock_hopfpci.c: - * ntpd/refclock_conf.c: - * ntpd/ntp_control.c: - * ntpd/Makefile.am: - * libntp/clocktypes.c: - * include/ntp.h: - * include/hopf6039.h: - * include/Makefile.in: - * include/Makefile.am: - * html/pic/fg6039.jpg: - * html/refclock.htm: - * html/driver39.htm: - * html/driver38.htm: - * html/copyright.htm: - Updated Oncore dudes. - - * configure.in: - HOPF drivers and documentation. - From: Bernd Altmeier (with some light - hacking from Harlan to clean up indentation and lose the // comments) - - * ntpd/refclock_oncore.c: - * ntpd/refclock_conf.c: Make it go. - From: Reg Clemens - - * configure.in (openssl): Publish and default to RSAREF; hide - openssl, and only use it if explicitly requested (at least until - we work with it). - -2001-04-02 Harlan Stenn - - * html/y2k.htm: - * html/tickadj.htm: - * html/release.htm: - * html/refclock.htm: - * html/quick.htm: - * html/pps.htm: - * html/ntptrace.htm: - * html/ntptime.htm: - * html/ntpq.htm: - * html/ntpdc.htm: - * html/ntpdate.htm: - * html/ntpd.htm: - * html/miscopt.htm: - * html/index.htm: - * html/genkeys.htm: - * html/exec.htm: - * html/driver7.htm: - * html/driver22.htm: - * html/copyright.htm: - * html/confopt.htm: - * html/build.htm: - * html/authopt.htm: - * html/assoc.htm: - Updates from Dave Mills. - -2001-04-01 Harlan Stenn - - * configure.in (OPENSSL): Just use -lcrypto. - Reported by Dave Mills. - -2001-03-31 Harlan Stenn - - * configure.in: 4.0.99k20 - - * ntpd/refclock_heath.c: Add support for GC-1000 II. - From Dave Mills. - - * ntpd/ntp_proto.c (transmit): Check peer->unreach. - (peer_clear): peer->outdate is a f(BURST_INTERVAL1), not - NTP_MINPOLL. - * ntpd/ntp_loopfilter.c (local_clock): mode_ntpdate stuff. - * ntpd/ntp_crypto.c: OpenSSL/RSAREF support. - * ntpd/cmd_args.c: Use -q, not -z, for mode_ntpdate. - (getstartup): nofork on mode_ntpdate. Usage update. - * include/ntp_crypto.h: OpenSSL/RSAREF support. - From: Dave Mills. - - * configure.in (rsaref): Buglet. - -2001-03-30 Harlan Stenn - - * ntpd/ntp_proto.c (clock_update): mode_ntpdate support. - * ntpd/ntp_loopfilter.c (local_clock): mode_ntpdate support. - * ntpd/cmd_args.c: Added -z (mode_ntpdate). - * include/ntpd.h: mode_ntpdate added. - * include/ntp_crypto.h: RSAREF/OPENSSL cleanup. - From: Dave Mills. - -2001-03-29 Harlan Stenn - - * config.h.in: - * aclocal.m4: - * configure.in: Prepare for OpenSSL support - -2001-03-28 Harlan Stenn - - * README.rsa: Note that RSAEURO will not work. - Reported by: pieter.delacourt@banksys.be - -2001-03-25 Harlan Stenn - - * include/ntp_if.h: - * include/ntp_machine.h: - * include/ntp_unixtime.h: - * libntp/humandate.c: - * libntp/iosignal.c: - * libntp/mktime.c: - * libntp/prettydate.c: - * libntp/systime.c: - * libntp/tvtoa.c: - * libntp/uglydate.c: - * libntp/utvtoa.c: - * libparse/clk_computime.c: - * libparse/clk_dcf7000.c: - * libparse/clk_hopf6021.c: - * libparse/clk_meinberg.c: - * libparse/clk_rawdcf.c: - * libparse/clk_rcc8000.c: - * libparse/clk_schmid.c: - * libparse/clk_trimtaip.c: - * libparse/clk_trimtsip.c: - * libparse/clk_varitext.c: - * libparse/parse.c: - * libparse/parse_conf.c: - * ntpd/check_y2k.c: - * ntpd/ntp_config.c: - * ntpd/ntp_control.c: - * ntpd/ntp_intres.c: - * ntpd/ntp_io.c: - * ntpd/ntp_loopfilter.c: - * ntpd/ntp_monitor.c: - * ntpd/ntp_proto.c: - * ntpd/ntp_refclock.c: - * ntpd/ntp_request.c: - * ntpd/ntp_resolver.c: - * ntpd/ntp_timer.c: - * ntpd/ntp_util.c: - * ntpd/ntpd.c: - * ntpd/refclock_acts.c: - * ntpd/refclock_arbiter.c: - * ntpd/refclock_arc.c: - * ntpd/refclock_as2201.c: - * ntpd/refclock_atom.c: - * ntpd/refclock_bancomm.c: - * ntpd/refclock_chronolog.c: - * ntpd/refclock_chu.c: - * ntpd/refclock_datum.c: - * ntpd/refclock_dumbclock.c: - * ntpd/refclock_fg.c: - * ntpd/refclock_gpsvme.c: - * ntpd/refclock_heath.c: - * ntpd/refclock_hpgps.c: - * ntpd/refclock_irig.c: - * ntpd/refclock_jupiter.c: - * ntpd/refclock_leitch.c: - * ntpd/refclock_local.c: - * ntpd/refclock_msfees.c: - * ntpd/refclock_mx4200.c: - * ntpd/refclock_nmea.c: - * ntpd/refclock_oncore.c: - * ntpd/refclock_pcf.c: - * ntpd/refclock_pst.c: - * ntpd/refclock_shm.c: - * ntpd/refclock_tpro.c: - * ntpd/refclock_trak.c: - * ntpd/refclock_true.c: - * ntpd/refclock_ulink.c: - * ntpd/refclock_usno.c: - * ntpd/refclock_wwv.c: - * ntpd/refclock_wwvb.c: - * ntpdate/ntpdate.c: - * ntpdate/ntptime_config.c: - * ntpdate/ntptimeset.c: - * ntpdc/ntpdc.c: - * ntpdc/ntpdc_ops.c: - * ntpq/ntpq.c: - * ntpq/ntpq_ops.c: - * ntptrace/ntptrace.c: - * parseutil/testdcf.c: - * util/hist.c: - * util/ntp-genkeys.c: - * util/ntptime.c: - * util/precision.c: - * util/tickadj.c: - time.h and sys/time.h cleanup. - -2001-03-24 Harlan Stenn - - * configure.in: '99k19 - - * ntpd/refclock_atom.c (atom_ppsapi): PPS API RFC alignment patches. - From: Ulrich Windl - - * util/ntptime.c: MNT options - From: Ulrich Windl - - * ntpd/ntp_refclock.c (refclock_newpeer): Lose "extra" free(). - From: Ulrich Windl - - * configure.in: 4.0.99k18 and auto* upgrade - -2001-03-14 Harlan Stenn - - * ntpdc/ntpdc_ops.c (printpeer): No more "valid". - * ntpd/ntp_request.c (peer_info): No more "valid". - * ntpd/ntp_refclock.c (refclock_transmit): valid/hpoll cleanup. - * ntpd/ntp_proto.c (transmit): valid/hpoll and peer->ttl cleanup. - peer->valid/oreach cleanup. - (receive): Call newpeer() with the pkt->ppoll, not - NTP_MINDPOLL (in several places). - In AM_NEWPASS, if we have a NULL peer, return. - (poll_update): Added xpoll definition, fixed oldpoll definition. - Algorithmic improvements. - * ntpd/ntp_peer.c (newpeer): Better minpoll/maxpoll - initialization. - (resetmanycast): That's a poll_update() on an MDF_ACAST, not a - poll_clear(). - * ntpd/ntp_crypto.c: include . - (crypto_recv): Leave the crypto_flags alone when wiggling the - peer-> stuff. - (crypto_cert): Make room for daddy. Do a real open() on the cert - file. Read the cert. Initial hack and slash. Better debug info. - * ntpd/ntp_control.c: CP_VALID now does "unreach". - (ctl_putpeer): Ditto. - * include/ntp_request.h: info_peer gets a placeholder for "valid". - * include/ntp_crypto.h (CRYPTO_FLAG_CERT): Comment update. - * include/ntp.h: Lose "valid" from struct peer. - From: Dave Mills. - -2001-03-05 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): hpoll calc logic cleanup. - (receive): New cert stuff. - (poll_update): Improvements. - (peer_clear): New cert stuff. - (peer_xmit): New cert stuff. - * ntpd/ntp_crypto.c: New cert stuff, documentation cleanup. Lose - extraneous poll_uopdate()s. - * ntpd/ntp_control.c: Deal with new cert stuff. - * ntpd/ntp_config.c (getconfig): Handle CONF_CRYPTO_CERT. - * include/ntp_crypto.h (CRYPTO_FLAG_CERT): Added. - (CRYPTO_CERT): Added. - (CRYPTO_CONF_CERT): Added. - Add declaration for struct value certif. - * include/ntp_control.h (CS_CERTIF): Added. - (CP_CERTIF): Added. - * include/ntp_config.h (CONF_CRYPTO_CERT): Added. - * include/ntp.h (TEST10,TEST11): New meaning. Add certif to - struct peer. - (FLAG_PROVEN): Added. - (MAX_EXT_LEN): Removed. - exten grew from 672/4 to 5000/4 for PUBKEY. - From: Dave Mills. - -2001-03-03 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): Documentation cleanup. - (receive): Watch for NULL peer->pubkey.ptr (TEST11). - (poll_update): peer->nextdate, not ->outdate. More cleanup around - the disabled PUBKEY chunk. - * ntpd/ntp_crypto.c (make_keylist): ltemp might be smaller than - sys_automax - check peer->kpoll, too. Other ltemp cleanup. - (crypto_recv): fstamp is a PUBKEY-only variable. - * include/ntp.h (NTP_AUTOMAX): 13, not 12. - From: Dave Mills. - -2001-03-01 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): hpoll cleanup. Call clock_select() - after calling poll_update, not before. - (receive): Call poll_update after crypto_recv if FLAG_SKEY. - (process_packet): Set peer->ppoll Later. - (poll_update): peer->hpoll sanity checking. Set peer->outdate, - not ->nextate, when burst > 0. MDF_ACAST cleanup. - (clock_select): Fix hpoll typo in call to poll_update(). - * ntpd/ntp_crypto.c (crypto_xmit): tstamp's value is a function of - PUBKEY. - * include/ntp.h (clear_to_zero): #define value is a function of - AUTOKEY. - From: Dave Mills. - -2001-02-28 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): Documentation/code update. - (poll_update): Sanity check peer->hpoll. Improve debug info. - (peer_clear): Improve debug info. Turn off FLAG_ASSOC in addition - to FLAG_AUTOKEY. - (clock_select): peer->status is CTL_PST_SEL_DISTSYSPEER, and don't - call poll_update(). Make each entry in the peer_list a - CTL_PST_SEL_SELCAND sooner, too. Rework similar logic later on. - Change debug level on some info. - (peer_xmit): Check peer->flags using FLAG_ASSOC, not - CRYPTO_FLAG_AUTO in a couple places. Don't call poll_update() if - sendlen > LEN_PKT_NOMAC. - * ntpd/ntp_loopfilter.c (local_clock): Improve debug info. - Sanity-check sys_poll sooner. - * ntpd/ntp_crypto.c: New artwork. - (COOKIE_LEN,AUTOKEY_LEN,VALUE_LEN): New. - (make_keylist): More debug info. Use FLAG_ASSOC, not - CRYPTO_FLAG_ASSOC. - (crypto_recv): More debug info. Clean up/improve sanity checks on - CRYPTO_ASSOC and CRYPTO_RESP packets, and in other places. - (crypto_xmit): Clean up/improve sanity checks on CRYPTO_ASSOC and - CRYPTO_RESP packets. Use FLAG_ASSOC, not CRYPTO_FLAG_ASSOC. More - debug info. - * include/ntp.h (NTP_CANLOCK): Lose it. - (clear_to_zero): is now "assoc". - (FLAG_ASSOC): Added. - From: Dave Mills - -2001-02-23 Harlan Stenn - - * ntpdate/ntpdate.h (NTP_MAXAGE): Added. - * ntpd/ntp_refclock.c (refclock_receive): Cleanup. - * ntpd/ntp_proto.c (transmit): Don't reset peer->ppoll in one case. - Update peer->hpoll based on CTL_PST_SEL_CORRECT, not FLAG_SYSPEER. - Don't update peer->ppoll based on MDF_[BM]CAST. - (peer_clear): ppoll is initialized to maxpoll. - (clock_select): call poll_update(peer->hpoll) earlier. - (peer_xmit): Call poll_update later. - * ntpd/ntp_peer.c (peer_config): Rework initial values of [hkp]poll. - * ntpd/ntp_loopfilter.c (CLOCK_PHI): Added. Deal with other - (allow_*) stuff. Treat Windows/NT the same as others regarding - panic steps. Deal with tinker stuff. - * ntpd/ntp_config.c: Tinker stuff. - * ntpd/cmd_args.c (getCmdOpts): -g now wiggles "allow_panic" - (renamed from "correct_any"). -x now wiggles "allow_step" - (renamed from "allow_step_backward"). - * include/ntpd.h: Add tinker variables. Rename/rework variables - associated with "permission to step" and "permission to make a - panic correction" - * include/ntp_config.h (CONFIG_TINKER): Added. - (CONF_CLOCK_MAX): Tinker keyword - (CONF_CLOCK_PANIC): Tinker keyword - (CONF_CLOCK_PHI): Tinker keyword - (CONF_CLOCK_MINSTEP): Tinker keyword - * include/ntp.h (NTP_MINCLOCK): Tinker and other cleanup. - From: Dave Mills - -2001-02-19 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): Don't peer_clear() and reset - minpoll unconditionally; make sure the peer is configured. - (poll_update): When updating peer->ppoll, check on BCAST and - MCAST, not ACAST - (peer_clear): PUBKEY cleanup. Zero out the peer structure - earlier. Initialization cleanup/fixes. - (peer_xmit): CRYPTO_FLAG_AUTO is in peer->flags now. - (key_expire): Debug output. - * ntpd/ntp_peer.c (unpeer): PUBKEY cleanup. - (newpeer): peer variable setup cleanup. - * ntpd/ntp_crypto.c (make_keylist): Keep CRYPTO_FLAG_AUTO in - peer->flags, not crypto_flags. - (crypto_xmit): Ditto. - (crypto_recv): Fix up RV_TSP logic (several places). - * include/ntp.h (clear_to_zero): Moved... - From: Dave Mills. - -2001-02-14 Harlan Stenn - - * ntpd/ntp_proto.c (peer_xmit): Crypto-related fixes - From Dave Mills. - - * ntpd/ntp_crypto.c (crypto_recv): Allocate space for the trailing - NUL on the keystr. - -2001-01-28 Harlan Stenn - - * configure.in: 4.0.99k17 - - * ntpd/refclock_local.c (STRATUM): 3 -> 5 - * ntpd/ntp_proto.c: sys_maxd -> sys_selerr, sys_epsil -> - sys_syserr. various cleanups and improvements. - From: Dave Mills. - -2001-01-19 Harlan Stenn - - * configure.in: 4.0.99k16 - - * config.h.in: Regenerated - became empty somehow. - Reported by John.Hay@icomtek.csir.co.za - - * ntpd/ntp_proto.c (clock_select): Fix sdisp calculation. - From Dave Mills. - - * util/ntp-genkeys.c: - * ntpd/refclock_chu.c: - * ntpd/refclock_atom.c: - * ntpd/ntpd.c: - * ntpd/ntp_loopfilter.c: - * ntpd/ntp_io.c: - * ntpd/cmd_args.c: - * libntp/audio.c: - * include/l_stdlib.h: - * html/copyright.htm: - Lint fixes (Thanks bunches!) - From: Marc.Brett@westerngeco.com - -2001-01-18 Harlan Stenn - - * configure.in: 4.0.99k15 - - * ntpd/ntp_proto.c (clock_select): Track error[] items sooner. - Typo grabbing the dtemp value and in the sdisp calculation. - From Dave Mills. - -2001-01-17 Harlan Stenn - - * configure.in: 4.0.99k14 - - * ntpd/ntp_proto.c: Change description of sys_rootdelay and - sys_rootdispersion. - (process_packet): Fix p_del test (bad distance). - (process_packet): Fix bad synch distance test. - (process_packet): Fix call to clock_filter (p_disp) - (clock_update): Fix sys_rootdelay calculation. - (clock_filter): Initialize jit to f(sys_precision) - (clock_filter): Update jit using distance[i] instead of - SQUARE(). peer->jitter uses dtemp instead of SQUARE(). - (clock_filter): Updated CLOCK_SGATE checks. When printing debug - info, show jitter along with popcorn spike. - (clock_select): New sdisp calc. - (root_distance): New return value calc. - (peer_xmit): xpkt.rootdispersion value change. - * include/ntp.h (CLOCK_SGATE): Popcorn spike gate (Whoa, Molly!) - From Dave Mills. - -2001-01-13 Harlan Stenn - - * config.sub (Repository): Updated. - * config.guess (Repository): Updated. - - * ntpd/ntp_loopfilter.c (local_clock): Just use sys_jitter in the - calculation for rootdispersion. - From Dave Mills. - -2001-01-02 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): Fix documentation. Set - peer->outdate and call poll_update in a new place. Sanity checks - in the MODE_BROADCAST case. - (clock_select): Track the old peer. Use the old peer in - subsequent checks, where appropriate. Clean up unpeer() logic. - From Dave Mills. - -2001-01-01 Harlan Stenn - - * ntpd/refclock_chu.c: Start using HAVE_AUDIO. - * ntpd/ntp_proto.c (clock_select): If about to discard an - ephemeral association, do it only if not the system peer. - From Dave Mills. - - * html/pic/wingdorothy.gif: - * html/pic/bustardfly.gif: - * html/pic/boom3a.gif: - * html/pic/tonea.gif: - * html/pic/stack1a.jpg: - * html/pic/pogoa.gif: - * html/pic/pogo8.gif: - * html/pic/pogo6.gif: - * html/pic/pogo5.gif: - * html/pic/pogo4.gif: - * html/pic/pogo3.gif: - * html/pic/pogo1.gif: - * html/pic/oz2.gif: - * html/pic/flatheads.gif: - * html/pic/boom4.gif: - * html/pic/boom3.gif: - * html/pic/appletree.gif: - * html/pic/alice51.gif: - * html/pic/alice44.gif: - * html/pic/alice35.gif: - * html/pic/alice31.gif: - * html/pic/alice15b.gif: - * html/pic/alice13.gif: - * html/pic/alice11.gif: - * html/release.htm: - * html/rdebug.htm: - * html/prefer.htm: - * html/porting.htm: - * html/ntptrace.htm: - * html/ntpq.htm: - * html/ntpdate.htm: - * html/monopt.htm: - * html/kernpps.htm: - * html/index.htm: - * html/hints.htm: - * html/gadget.htm: - * html/driver7.htm: - * html/copyright.htm: - * html/config.htm: - * html/build.htm: - * html/authopt.htm: - * html/assoc.htm: - * html/accopt.htm: - Cleanup from Dave Mills. - -2000-12-30 Harlan Stenn - - * configure.in: 4.0.99k13 - - * ntpd/refclock_wwv.c (wwv_start): Call audio_init with DEVICE_AUDIO. - * ntpd/refclock_irig.c (irig_start): Call audio_init with DEVICE_AUDIO. - * ntpd/refclock_chu.c: Documentation cleanup. - (DEVICE_AUDIO): Added. - (fd_audio): Added. - (chu_start): Separate audio from serial device. - (chu_receive): Rewrite - get data from serial or audio device as - appropriate. - (chu_audio_receive): Renamed (from chu_receive) to allow both - audio and serial capability. - (chu_serial_receive): Ditto. - (chu_decode): Do the Right Thing based on audio/serial data. - * ntpd/ntp_refclock.c (refclock_open): Check for failure using <0 - instead of ==-1. - * libntp/audio.c: Header cleanup, and remove - HAVE_STRUCT_AUDIO_INFO_* related fields. - (audio_init): Func arg is device to attempt to open. - * include/audio.h (audio_init): Now takes a char * argument. - From Dave Mills. - - * configure.in (ntp_refclock): HAVE_AUDIO added. Remove - HAVE_STRUCT_AUDIO_INFO_* stuff; Dave rewrote the audio stuff. - -2000-12-28 Harlan Stenn - - * configure.in: 4.0.99k12 - -2000-12-27 Harlan Stenn - - * html/release.htm: - * html/patches.htm: - * html/measure.htm: - * html/confopt.htm: - * html/clockopt.htm: - * html/biblio.htm: - * html/authopt.htm: - * html/assoc.htm: - Updates from Dave Mills. - - * include/ntp_crypto.h: Make sure crypto_flags is visible. - From Dave Mills. - -2000-12-14 Harlan Stenn - - * ntpd/ntp_proto.c (process_packet): pleap/pstratum. - (peer_xmit): Use CRYPTO_FLAG_AUTO. - * ntpd/ntp_crypto.c (make_keylist): Use CRYPTO_FLAG_AUTO. Only - sign host name and timestamps if the clock is synched. - * include/ntp_crypto.h (CRYPTO_FLAG_AUTO): Added. - From: Dave Mills - -2000-12-11 Harlan Stenn - - * ntpd/ntp_proto.c (transmit): Call clock_select in a few new - places. BURST/IBURST cleanup. Don't turn off FLAG_BURST at the - EOburst. - (receive): Set peer->unreach = 0 before we call process_packet(). - (process_packet): ditto, before calling poll_update(). Lose some - debugging, MODE_BCLIENT/CLIENT cleanup. - (poll_update): Bump nextupdate on FLAG_REFCLOCK, not _REFCLOCK or - _IBURST. - (peer_clear): Don't set IBURST on MDF_BCLNT. - From: Dave Mills. - - * ntpdate/ntpdate.c (alarming): Appease ansi2knr. - -2000-12-10 Harlan Stenn - - * ntpd/ntp_control.c (ctl_putpeer): CP_TTL and CP_TTLMAX - MDF_ACAST and MDF_MCAST cleanup. - - * ntpd/refclock_wwv.c (wwv_start): ttlmax/ttl cleanup. - * ntpd/refclock_usno.c (usno_timeout): ttlmax/ttl cleanup. - * ntpd/refclock_parse.c (CLK_REALTYPE): ttlmax/ttl cleanup. - * ntpd/refclock_chu.c (chu_start): ttlmax/ttl cleanup. - * ntpd/refclock_acts.c (acts_timeout): ttlmax/ttl cleanup. - * ntpd/ntp_refclock.c (refclock_newpeer): Don't do the - any_interface -> loopback_interface trick. - * ntpd/ntp_proto.c (transmit): Broadcast/manycast cleanup. - * ntpd/ntp_peer.c: Cleanup. - * ntpd/ntp_io.c: Cleanup. - * ntpd/ntp_crypto.c (crypto_recv): AUTOKEY based on BCLNT, not MCAST2. - * include/ntpd.h: Declare findbcastinter(). - * include/ntp.h: struct peer's ttlmax is now max ttl/refclock - mode. ttl is now ttl for manycast mode. - (FLAG_MCAST): Reworked several FLAG_ bits. - From Dave Mills. - -2000-12-05 Harlan Stenn - - * ntpq/ntpq.c: CP_TTLMAX support. - * ntpd/ntp_proto.c (transmit): MDF_ACAST ttl fixes. - * ntpd/ntp_peer.c (resetmanycast): Reset ttl if MDF_ACAST. - (peer_config): Save max ttl in ttlmax. - * ntpd/ntp_control.c: ttlmax support. - * include/ntp_control.h (CP_TTLMAX): Added. - * include/ntp.h: Added ttlmax to struct peer. - Dave Mills. - -2000-12-03 Harlan Stenn - - * ntpd/ntp_proto.c (receive): That any_interface is now an - rbufp->dstadr. - Various other doc and code cleanup. - * ntpd/ntp_peer.c (findmanycastpeer): Fixes - From Dave Mills - -2000-12-02 Harlan Stenn - - * ntpd/ntp_request.c (do_conf): call peer_config with - any_interface, not 0. - * ntpd/ntp_proto.c (transmit): Manycast cleanup - * ntpd/ntp_peer.c (findmanycastpeer): manycast cleanup - * ntpd/ntp_io.c (sendpkt): Only check ttl if we have a ttl - (findinterface): Cleanup - * ntpd/ntp_control.c: cleanup - * include/ntpd.h: Added resetmanycast. - * include/ntp_control.h (CP_TTL): disp -> ttl - * ntpq/ntpq.c: disp -> ttl - From Dave Mills - -2000-11-26 Harlan Stenn - - * configure.in: 4.0.99k11 - - * ntpd/ntp_proto.c (transmit): - * ntpd/ntp_peer.c: - * ntpd/ntp_io.c: - * ntpd/ntp_control.c (ctl_putpeer): - * ntpd/ntp_config.c (getconfig): - * include/ntpd.h: mcast/ucast interface cleanup. - From: Dave Mills - - * include/ntp_request.h: Put data[] as MAXFILENAME+16. This will - fix the conf_peer requests again, but re-break compatibility with - old versions of the daemon. Sigh. - - * util/ntp-genkeys.c (cleanlinks): Don't do it if nosymlinks. - -2000-11-19 Harlan Stenn - - * ntpd/refclock_parse.c (rawdcf_init_1): make Linux happier with - some modem control stuff. - From: Wolfram Pienkoss (via Frank Kardel) - - * ntpd/refclock_pcf.c (pcf_poll): isdst fix - From: Andreas Voegele - -2000-10-28 Harlan Stenn - - * configure.in: 4.0.99k10 - - * ntpd/refclock_wwvb.c (wwvb_start): Cosmetic reorder. - * ntpd/refclock_atom.c (RANGEGATE): Cleanup. Add ASTAGE. - Add ppsparams to struct ppsunit. - (atom_start): Init peer->burst to ASTAGE. - (atom_shutdown): Multi-handle - (atom_pps): Multi-handle - (atom_pps): RANGEGATE cleanup - (atom_poll): Poll count cleanup. Error check cleanup. Burst cleanup. - * ntpd/ntp_refclock.c (refclock_transmit): Lose the pre-burst - check poll_update(). - (refclock_sample): Fix the jitter calc. - (refclock_receive): Pass the jitter to the clock_filter(). - - * ntpd/ntp_proto.c (clock_update): If we lose sync, reset the poll - to NTP_MINDPOLL. - (poll_update): Poll wiggles. Make sure peer->nextdate is timely. - (clock_select): If we lose sync, reset the poll to NTP_MINDPOLL. - * ntpd/ntp_loopfilter.c (local_clock): Show the asocid in debug - output. popcorn debug message changes. Clamp the poll interval - if the system peer has changed. PPS wiggle changes. - From Dave Mills. - -2000-10-16 Harlan Stenn - - * ntpd/refclock_pcf.c (pcf_start): - * html/driver35.htm: - The radio clock transmits 69 bits with a period of 2.5 - milliseconds per bit. Thus the driver now sets the default - calibration offset to 0.1725 (69 * 2.5 = 172.5). - Its now possible to disable the check of the radio clock's - synchronisation status bit. Several users requested this option. - From: Andreas Voegele - - * html/refclock.htm: - * html/rdebug.htm: - * html/prefer.htm: - * html/pps.htm: - * html/ntpdc.htm: - * html/miscopt.htm: - * html/ldisc.htm: - * html/kern.htm: - * html/index.htm: - * html/exec.htm: - * html/driver22.htm: - * html/clockopt.htm: - Updates from Dave Mills - - * ntpd/ntp_intres.c (request): Sanity check the size of the response - -2000-10-15 Harlan Stenn - - * ntpq/ntpq_ops.c (dopeers): Dave didn't like the patch to show - the units on the times... - * ntpdc/ntpdc_ops.c (doset): SYS_FLAG_PPS cleanup - * ntpd/refclock_wwv.c (wwv_newchan): Update the peer refid if - we're talking to a stratum 0 source - * ntpd/refclock_trak.c: Needs PPS - * ntpd/refclock_oncore.c: Disable for now - * ntpd/refclock_mx4200.c: Needs PPSAPI, not PPS - Header cleanup. PPS interface cleanup. - Process sentences with a switch - Cleanup and sanity checks - * ntpd/refclock_datum.c: header cleanup, light body cleanup - * ntpd/refclock_conf.c: CLOCK_TRAK needs PPS - MX4200 needs PPSAPI, not PPS - Disable ONCORE for now - * ntpd/refclock_bancomm.c: Surgery - * ntpd/refclock_atom.c: Cleanup - (atom_control): added - (atom_ppsapi): added - * ntpd/ntp_request.c (setclr_flags): SYS_FLAG_PPS cleanup - * ntpd/ntp_refclock.c: stropts.h back in in TTYCLK and - HAVE_SYS_CLKDEFS_H - Get ntp_syscall if KERNEL_PLL - Define cal_enable - (refclock_receive): Cleanup - (refclock_control): sanity check procptr - * ntpd/ntp_proto.c (init_proto): pps_enable - (proto_config): Turn on/off PPS discipline - * ntpd/ntp_loopfilter.c: pps_enable - (local_clock): record_loop_stats() if !ntp_enable - (local_clock): Turn off PPS if it's not enabled - Other cleanup/fixes - * ntpd/ntp_config.c: pps and calibrate keywords. Initialize - pps_assert to 0, not 1 (swap assert/clear?) - * include/ntpd.h: We have pll_status if KERNEL_PLL - Added pps_enable and cal_enable - * include/ntp_request.h (SYS_FLAG_PPS): Renamed from - SYS_FLAG_AUTHENTICATE - * include/ntp.h (PROTO_PPS): Added - (PROTO_CAL): Added - From: Dave Mills - -2000-09-23 Harlan Stenn - - * include/ntp_refclock.h (stropts.h, sys/clkdefs.h): Harmful and - useless file include's turned off. - * libntp/iosignal.c (netinet/in.h, sys/sockio.h): Duplicate file - include's turned off. - * ntpd/ntp_refclock.c (ntp_tty.h): File included. - (refclock_open, refclock_ioctl): Use `TTY' from ntp_tty.h. - * ntpd/refclock_atom.c: Grab a few headers regardless; if we don't - CLOCK_ATOM we provide a stub pps_sample() routine so the WHARTON - can be compiled/used. - * ntpq/ntpq_ops.c (dopeers, doopeers): Print the units for - each column header. - Tue Sep 12 16:25:51 2000 Philippe De Muyter - - * ntpd/refclock_atom.c (atom_start): Lose "temp", because we now - initially either CAPTUREASSERT or CAPTURECLEAR. - (atom_pps): pps_info_t is our friend. Update comments to reflect - reality. DTRT with pps_info. Do some overflow checks. - From: Dave Mills. - -2000-09-21 Harlan Stenn - - * configure.in: Much improved Solaris patch-level check for the - FLL bug test. - From: Marc.Brett@westgeo.com - -2000-09-19 Harlan Stenn - - * include/Makefile.am (noinst_HEADERS): Added ntp_tty.h - Reported by Dave Mills - -2000-09-16 Harlan Stenn - - * ntptrace/ntptrace.c: - * ntpdate/ntptimeset.c (receive): - * ntpdate/ntpdate.c (receive): - STRATUM cleanup - * ntpd/refclock_atom.c (atom_poll): Autostratum. Lose the leap. - * ntpd/ntp_proto.c: sys_prefer - (process_packet): stratum cleanup - (clock_select): Autostratum the ATOM - * ntpd/ntp_loopfilter.c: pps_update/pps_stratum wiggle. - * include/ntpd.h: Lose pps_update, gain sys_prefer - * include/ntp.h: STRATUM variable cleanup - From Dave Mills - -2000-09-13 Harlan Stenn - - * ntpd/refclock_oncore.c (oncore_get_timestamp): Print debug - messages being aware of HAVE_STRUCT_TIMESPEC. - - * ntpd/refclock_atom.c: Have pps_params tag along in the ppsunit - structure, where it really belongs. - (atom_pps): Use PPS_CAPTURE{ASSERT,CLEAR} - From: Dave Mills. - -2000-09-12 Harlan Stenn - - * configure.in (ac_cv_var_atom_ok): Cleanup ATOM/PPSAPI stuff... - - * scripts/ntp-close: Find "close" ntp servers. - From: Neal McBurnett - - * ntpd/refclock_conf.c: - * ntpd/refclock_oncore.c: Re-enabled oncore driver for HAVE_PPSAPI - case only. - -2000-09-12 Philippe De Muyter - - * ntpd/refclock_parse.c (we400a_pollinfo): Useless variable removed. - [WHARTON slot]: Set NO_POLL, NO_INIT and NO_DATA; fix `fixed format' - and `offset' fields. - - * include/ntp_tty.h: New file - * libntp/icom.c: Use it. - - * ntp_update (UPDATE_OPTIONS): Use -d, too. Fix Pass 1 comment. - -2000-09-12 Harlan Stenn - - * ntpd/refclock_oncore.c: shmem_fname added. oncore_init_shmem() - updated. - (oncore_start): Comment cleanup - (oncore_read_config): Move call to oncore_shmem_init() - (oncore_init_shmem): Prototype change - (oncore_init_shmem): Don't exit on errors - (oncore_msg_any): timespec/timeval cleanup - (oncore_msg_Cj_id): shmem_fname changes - (oncore_msg_BaEaHa): saw_At bugfix - (oncore_get_timestamp): Added current_mode/current_params. Commented. - Added time_pps_getcap() calls. - From: Reg Clemens - - * ntpd/ntp_io.c (input_handler): Better recvfrom() error message - From: Dean Gibson - - * ntpdc/ntpdc.c (passwd): Get them working again. - From: Benjamin Greenwald + BitKeeper/etc/ignore + 1.9 01/10/24 01:37:05 stenn@whimsy.udel.edu +8 -0 + added BitKeeper/triggers/post-commit BitKeeper/triggers/post-incoming BitKeeper/triggers/post-outgoing BitKeeper/triggers/pre-apply BitKeeper/triggers/pre-commit BitKeeper/triggers/pre-incoming BitKeeper/triggers/pre-outgoing BitKeeper/triggers/pre-resolve -2000-09-11 Harlan Stenn +ChangeSet@1.725, 2001-10-24 01:32:31-04:00, stenn@whimsy.udel.edu + New ChagneLog processing. + New trigger scripts. - * ntpd/refclock_atom.c: - (atom_start): - * ntpd/ntp_refclock.c: Comment cleanup. PPS/PPSAPI cleanup - (refclock_open): PPS/PPSAPI cleanup - From: Dave Mills + BitKeeper/triggers/triggert + 1.1 01/10/24 01:32:30 stenn@whimsy.udel.edu +14 -0 - * ntpd/refclock_oncore.c: - * ntpd/refclock_mx4200.c: - HAVE_TIMESPEC -> HAVE_STRUCT_TIMESPEC + BitKeeper/triggers/triggerd + 1.1 01/10/24 01:32:30 stenn@whimsy.udel.edu +54 -0 - * configure.in: ATOM requires struct timespec, not PPSAPI. Clean - up dependencies accordingly. + BitKeeper/triggers/trigger.README + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +53 -0 -2000-09-09 Harlan Stenn + BitKeeper/triggers/triggert + 1.0 01/10/24 01:32:30 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/triggert - * configure.in (ac_cv_var_atom_ok): Improve ATOM configure message - PARSE requires ATOM. + BitKeeper/etc/ignore + 1.8 01/10/24 01:32:30 stenn@whimsy.udel.edu +2 -0 + Added ChangeLog BitKeeper/triggers/.lgc to the ignore list - * ntpd/ntpd.c (set_process_priority): Clean up debug messages. + BitKeeper/triggers/delta-changelog + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +64 -0 -2000-09-07 Harlan Stenn + BitKeeper/triggers/triggerd + 1.0 01/10/24 01:32:30 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/triggerd - * configure.in: ac_cv_atom_ok, depends on HAVE_PPSAPI. - I notice the PARSE clocks require ATOM. Could be interesting... + BitKeeper/triggers/lg-changeset + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +15 -0 -2000-09-06 Harlan Stenn + BitKeeper/triggers/paranoid + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +80 -0 - * Makefile.in (distdir): Seems to be a bug in an automake library - somewhere... + BitKeeper/triggers/trigger.cfg + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +25 -0 -2000-09-05 Harlan Stenn + BitKeeper/triggers/trigger.mk + 1.1 01/10/24 01:32:29 stenn@whimsy.udel.edu +17 -0 - * ntpd/ntp_loopfilter.c (loop_config): V3 API needs MOD_BITS when - initializing ntv.modes. Initialize ntv.{maxerror,esterror,status} - earlier. Clean up KERNEL_PLL code. + BitKeeper/triggers/lg-changeset + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/lg-changeset -2000-09-04 Harlan Stenn + BitKeeper/triggers/trigger.README + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/trigger.README - * ntpq/ntpq.c: report offset as "offset", not "phase". Lose - compliance. - * ntpd/refclock_local.c (local_poll): variance -> jitter - * ntpd/refclock_chu.c (chu_major): Lose variance. - * ntpd/ntp_util.c (hourly_stats): sys_error -> sys_jitter - (record_loop_stats): ditto - * ntpd/ntp_request.c (peer_info): variance -> jitter - * ntpd/ntp_refclock.c (refclock_sample): variance -> jitter - (refclock_receive): variance -> jitter - * ntpd/ntp_proto.c (process_packet): variance -> jitter - (clock_filter): variance -> jitter - (clock_select): variance -> jitter - (root_distance): variance -> jitter - * ntpd/ntp_peer.c (newpeer): variance -> jitter - * ntpd/ntp_loopfilter.c: Cleanup pll_nano selection bogon. - Centralize the kernel API data. - (local_clock): Lose sys_error. - (loop_config): Code cleanup. - * ntpd/ntp_control.c: Call offset "offset" and not "phase". Lose - CS_COMPLIANCE. Deal with variance/jitter rename. - * include/ntp_refclock.h: Rename variance to jitter in struct - refclockproc. - * include/ntp_control.h (CS_COMPLIANCE): Lose it. - * include/ntp.h: Rename variance to jitter in struct peer. - From: Dave Mills + BitKeeper/triggers/delta-changelog + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/delta-changelog -2000-09-01 Harlan Stenn + BitKeeper/triggers/trigger.cfg + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/trigger.cfg - * ntpd/refclock_atom.c: Use the new ppsunit. Cleanup and improve - documentation. - * ntpd/ntp_refclock.c (refclock_sample): Don't accumulate - variance. - From Dave Mills + BitKeeper/triggers/trigger.mk + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/trigger.mk -2000-08-31 Harlan Stenn + BitKeeper/triggers/paranoid + 1.0 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/paranoid - * html/driver22.htm: Update the docs. - * ntpd/refclock_atom.c (atom_start): Open the device if it hasn't - been opened already. - (pps_sample): Make it more visible. - From Dave Mills. + Makefile.am + 1.19 01/10/24 01:32:29 stenn@whimsy.udel.edu +1 -0 + Distribute ChangeLog-4.1.0. - * configure.in: 4.0.99k8 + ChangeLog-4.1.0 + 1.589 01/10/24 01:32:29 stenn@whimsy.udel.edu +0 -0 + Renamed the CVS ChangeLog to ChangeLog-4.1.0; + the new ChangeLog is auto-generated. - Revert to the older automake. + BitKeeper/deleted/.del-post-commit.changelog~baedea457d24369c + 1.6 01/10/24 01:11:24 stenn@whimsy.udel.edu +0 -0 + Delete: BitKeeper/triggers/post-commit.changelog - * configure.in: The PPSAPI headers use "inline", so require a STDC - compiler. + BitKeeper/deleted/.del-pre-apply.paranoid~baecee4c7d243e1c + 1.3 01/10/24 00:42:20 stenn@whimsy.udel.edu +0 -0 + Delete: BitKeeper/triggers/pre-apply.paranoid - * ntpd/refclock_atom.c (atom_shutdown): Typo - From Dave Mills + BitKeeper/deleted/.del-post-incoming.2mirrors~baedfb107d26b494 + 1.5 01/10/24 00:42:11 stenn@whimsy.udel.edu +0 -0 + Delete: BitKeeper/triggers/post-incoming.2mirrors - * configure.in: Convert to autoconf-2.49 +ChangeSet@1.724, 2001-10-20 12:07:53-07:00, wink@iris1.saville.com + Add support for waiting on an IO event under Windows NT. This improves the responsiveness + of the system when running under NT. - * ntpd/refclock_atom.c: Header cleanup Comment cleanup. Lose the - TTYCLK stuff. Convert to PPSAPI. - * ntpd/ntp_refclock.c (refclock_newpeer): Move refclock_unpeer(). - From: Dave Mills + BitKeeper/etc/logging_ok + 1.3 01/10/20 12:07:50 wink@iris1.saville.com +1 -0 + Logging to logging@openlogging.org accepted -2000-08-29 Harlan Stenn + ntpd/ntpd.c + 1.36 01/10/20 12:07:43 wink@iris1.saville.com +27 -6 + Add support for waiting on an IO event under Windows NT. This improves the responsiveness + of the system when running under NT. - * configure: Fix the autoconf problem... + ports/winnt/include/ntp_iocompletionport.h + 1.5 01/10/20 12:07:43 wink@iris1.saville.com +2 -0 + Add get_io_event -2000-08-20 Harlan Stenn + ports/winnt/ntpd/ntp_iocompletionport.c + 1.6 01/10/20 12:07:43 wink@iris1.saville.com +33 -0 + Add support for waiting on an IO event under to improve responsiveness. - * configure.in: 99k7 +ChangeSet@1.723, 2001-10-15 23:36:58-04:00, stenn@whimsy.udel.edu + Lose mktime.c snprintf.c strdup.c strerror.c from + EXTRA_libntp_a_SOURCES as they are auto-added by AC_REPLACE_FUNCS - * util/ntptime.c (main): Report TAI stuff - * ntpq/ntpq.c: CS_COMPLIANCE/CS_JITTER cleanup - * ntpd/ntp_loopfilter.c (local_clock): sys_error/sys_jitter cleanup. - kernel PPL cleanup. - * ntpd/ntp_crypto.c: Check NTP_API if we're doing KERNEL_PLL so we - can get the TAI stuff. - * ntpd/ntp_control.c: CS_COMPLIANCE now reports "error" instead of - "jitter". CS_JITTER now reports jitter. - * include/ntpd.h: Added sys_jitter - * include/ntp_control.h (CS_JITTER): Added - From: Dave Mills + libntp/Makefile.am + 1.13 01/10/15 23:36:58 stenn@whimsy.udel.edu +2 -2 + Lose mktime.c snprintf.c strdup.c strerror.c from + EXTRA_libntp_a_SOURCES as they are auto-added by AC_REPLACE_FUNCS - * ntpd/cmd_args.c (getCmdOpts): Crack -N at pre-scan, as we do the - priority wiggle before the final scan. - From: Tom Smith - We might do better to move the priority wiggle to after the final - scan. Especially if we want to permit command-line options to - have decent control over the priority. When we rewrite the config - file stuff we might go to a multi-scan to solve some of these - problems. +ChangeSet@1.722, 2001-10-11 00:15:50-04:00, stenn@whimsy.udel.edu + Make a little mirror trigger noise -2000-08-19 Harlan Stenn + BitKeeper/triggers/post-incoming.2mirrors + 1.4 01/10/11 00:14:58 stenn@whimsy.udel.edu +2 -0 + Make a little mirror trigger noise - * configure.in: '99k6, and manually fix configure. +ChangeSet@1.721, 2001-10-10 21:14:30-04:00, stenn@whimsy.udel.edu + Use %u to display the keyid. + From: Simon Burge - * include/ntp_request.h (NTP_MAXHOSTNAME): 144 -> 32 + ntpd/ntp_config.c + 1.53 01/10/10 21:14:29 stenn@whimsy.udel.edu +2 -2 + Use %u to display the keyid. + From: Simon Burge -2000-08-18 Harlan Stenn +ChangeSet@1.720, 2001-10-09 02:04:10-04:00, stenn@whimsy.udel.edu + Check for clock_gettime(). - * util/ntp-genkeys.c (main): Don't call fclose if stream is NULL. + configure.in + 1.228 01/10/09 02:04:09 stenn@whimsy.udel.edu +1 -1 + Check for clock_gettime(). -2000-08-17 Harlan Stenn +ChangeSet@1.719, 2001-10-08 21:51:07-04:00, stenn@whimsy.udel.edu + Use EOLN_NATIVE. - * html/driver35.htm: - * ntpd/refclock_pcf.c: Updates and improvements - From: Andreas Voegele + ElectricFence/tstheap.c + 1.2 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_cv_struct_ntptimeval): Lose the TAI check - we - don't need it since we can check NTP_API. Re-hack the generated - configure script. + ElectricFence/print.c + 1.2 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure: Manual hack to the ntptimeval.time.tv_nsec stuff - because we're running an old autoconf. + ElectricFence/page.c + 1.5 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-16 Harlan Stenn + ElectricFence/libefence.3 + 1.2 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntptime.c: Use: HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC, it's - the standard name. + ElectricFence/README + 1.2 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Look for struct ntptimeval.tai in sys/timex.h - Cleanup struct tptimeval member tests. + ElectricFence/Makefile.am + 1.7 01/10/08 21:18:40 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c: New command-line arguments + util/tickadj.c + 1.5 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-14 Harlan Stenn + util/testrs6000.c + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): More small steps... + util/sht.c + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-13 Harlan Stenn + util/timetrim.c + 1.3 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c (crypto_rsa): Now that we're using - NTP_KEYSDIR, make sure there is a '/ between the dir and the file. + ElectricFence/CHANGES + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): More small steps... + ElectricFence/COPYING + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-12 Harlan Stenn + ElectricFence/Makefile- + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): Another small step... + ElectricFence/efence.h + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 99k5 + ElectricFence/efence.c + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_request.h: Make data[] member of req_pkt 32 again. - Bump the version number... + ElectricFence/eftest.c + 1.2 01/10/08 21:18:39 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_loopfilter.c (local_clock): Change 0. to 0 in a couple - of places. - From Dave Mills + util/precision.c + 1.3 01/10/08 21:18:38 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-11 Harlan Stenn + util/README + 1.3 01/10/08 21:18:38 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): Minimal progress... + util/jitter.c + 1.3 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-06 Harlan Stenn + util/kern.c + 1.3 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/check_y2k.c: Make debug definition match ntpd.h's declaration + util/longsize.c + 1.2 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/Makefile.am (check-local): Use test in favor of [ + util/ntp-genkeys.c + 1.59 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-05 Harlan Stenn + util/ntptime.c + 1.14 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (NTP_KEYSDIR): Typo + util/Makefile.am + 1.10 01/10/08 21:18:37 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-04 Harlan Stenn + util/hist.c + 1.5 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ElectricFence/Makefile.am (check-local): use test instead of [ + util/ansi2knr.c + 1.3 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: AC_REPLACE_FUNCS(strdup) - * libntp/strdup.c (strdup): Added. - * libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Added strdup.c + util/ansi2knr.1 + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Use $U on .o files - (ntp_genkeys_LDADD): ditto. + util/byteorder.c + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c: Use NTP_KEYSDIR + scripts/support/etc/setup + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (snifflink): Ignore ENOENT, too. + scripts/support/etc/rc + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (peer_xmit): Crypto cleanup - * ntpd/ntp_crypto.c: Cleanup - * ntpd/ntp_control.c: Join the club - * ntpd/ntp_config.c: Call crypto_config() instead; we got rid of - crypto_flags. - * include/ntp_crypto.h (CRYPTO_FLAG_ENAB): New crypto flags, rework - * include/ntp_control.h (CS_FLAGS): Wiggle in. - * include/ntp.h: Added crypto peer status to struct peer - From Dave Mills + scripts/support/etc/install + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-03 Harlan Stenn + scripts/support/etc/cron + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c: Initialize path_keysdir to NTP_KEYSDIR. + scripts/support/etc/crontab + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (NTP_KEYSDIR): Added - * acinclude.m4: Added AC_DEFINE_DIR macro + scripts/rc1/postinstall + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): Sanity checks on the file paths. + scripts/rc1/preremove + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-02 Harlan Stenn + scripts/rc1/preinstall + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (crypto_config): Only #ifdef PUBKEY - (PATH_MAX): Try harder... + scripts/rc1/xntp + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-08-01 Harlan Stenn + scripts/rc2/local.ntpd + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): Use snifflink() - (snifflink): Implement... + scripts/rc1/prototype + 1.2 01/10/08 21:18:36 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Check for readlink() + scripts/support/conf/sun4.sun4m.faui42 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-31 Harlan Stenn + scripts/support/conf/sun4.sun4c + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (main): Use strdup on the tokens returned - from ntp_config... - (crypto_config): Fix a typo... - (crypto_config): Even more... - (usage): Flesh it out. + scripts/support/conf/sun4.sun4c.Lucifer + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_config.h: - * ntpd/ntp_config.c: Move a whack of #defines to ntp_config.h so - ntp-genkeys.c can see them, too. + scripts/support/conf/sun4.sun4.faui45 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c: Add stubs to work with ../ntpd/ntp_config.o, - start hooking things up. - (main): debugging - (crypto_config): better implementation + scripts/support/conf/sun4.sun4.faui10 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag + scripts/support/conf/sun4.sun4.faui01 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_config.c (getconfig): - * ntpd/ntpd.c: Initialize "debug" here, not in ntp_config.c + scripts/support/conf/sun3.sun3 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/Makefile.am (ntp_genkeys_LDADD): Added ../ntpd/ntp_config.o - * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Added. + scripts/support/conf/hp700.hp700 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-30 Harlan Stenn + scripts/support/conf/hp700.hp700.faui47 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99k4 - * util/ntp-genkeys.c: Start hacking for new functionality. - * include/Makefile.am (noinst_HEADERS): Added ntp_cmdargs.h and - ntp_config.h . - * ntpd/ntp_config.c: Grab ntp_cmdargs.h. Make some new globals - (ugh), move ntpd-specific variables and code to cmd_args.c . - * ntpd/cmd_args.c: Move command argument processing functions from - ntp_config.c to this file. - * ntpd/Makefile.am (ntpd_SOURCES): Added cmd_args.c - * include/ntpd.h: Move getstartup() to ntp_cmdargs.h - * include/ntp_cmdargs.h: New file - Begin the hacking fest to make it easier for ntp-genkeys to use - ntpd's config processing code. I really hope this is the lesser - of the evils... + scripts/support/conf/hp300.hp300 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-28 Harlan Stenn + scripts/support/conf/sun4.sun4m.faui45m + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c (usage): Added. + scripts/support/conf/hp800.hp800 + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c: Cleanup - * ntpd/ntp_proto.c (transmit): Add some parens. - (peer_xmit): Add ntohl when grabbing sndauto.seq for broadcast. - * ntpd/ntp_peer.c (findpeer): Cleanup - * ntpd/ntp_loopfilter.c (local_clock): Typo - From Dave Mills + scripts/support/conf/tickconf + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_config.h: Created + scripts/support/conf/ntp.conf + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp-genkeys.c: Always build, but realize we may not have - RSAREF. Compile parts appropriately. + scripts/support/conf/sun4.sun4m + 1.2 01/10/08 21:18:35 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/Makefile.am (bin_PROGRAMS): Always make ntp-genkeys - (ntp-genkeys_LDADD): Use $LIBRSAREF instead of the "real path" - * configure.in: Lose MAKE_NTP_GENKEYS + scripts/stats/tdata.S + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: - * util/ntp-genkeys.c: - * util/Makefile.am: - Renamed ntp_genkeys to ntp-genkeys. + scripts/stats/psummary.awk + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-27 Harlan Stenn + scripts/stats/peer.awk + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntpdate.c (ntpdatemain): Cleanup error message. + scripts/stats/loop_summary + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntpdate.c (ntpdatemain): Add missing authtrust() call - From: Jason Heiss + scripts/stats/loop.awk + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_ulink.c (ulink_receive): - * ntpd/ntp_crypto.c: - * libntp/authparity.c: - Lint/noise cleanup - From: Marc Brett + scripts/stats/loop.S + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c: Specifically track manycastserver and - survivors - From: Dave Mills + scripts/stats/itf.awk + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-26 Sven Dietrich + scripts/stats/itf.S + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c: remove WINNT priority adjustment to the ports/winnt area - where it does not clutter up the main distribution. + scripts/stats/summary.sh + 1.3 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-07-24 Harlan Stenn + scripts/stats/tdata.awk + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (receive): dstadr_sin needs higher visibility - From: Dave Mills + scripts/stats/README + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Added baldwin + scripts/stats/README.timecodes + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_request.c: - * ntpd/ntp_proto.c: - * ntpd/ntp_peer.c: - * ntpd/ntp_io.c: - * ntpd/ntp_intres.c: - * ntpd/ntp_crypto.c (make_keylist): - * ntpd/ntp_control.c: - * ntpd/ntp_config.c (CONF_MOD_IBURST, save_resolve): - * include/ntpd.h (findpeerbyassoc, newpeer, peer_config, *_interface): - * include/ntp_request.h (CONF_FLAG_IBURST): - * include/ntp_crypto.h (crypto_xmit, make_keylist): - * include/ntp.h (FLAG_IBURST): - * html/release.htm: - * html/confopt.htm: - * html/assoc.htm: - Add iburst option, fix broadcast/multicast and some types. - From: Dave Mills - -2000-07-20 Harlan Stenn - - * scripts/Makefile.am (bin_SCRIPTS): Install ntp-wait - - * configure.in: 4.0.99k - -2000-07-19 Harlan Stenn - - * ntpd/ntp_proto.c (peer_xmit): PUBKEY cleanup - -2000-07-18 Harlan Stenn - - * configure.in: 4.0.99j5 - - * html/ntpd.htm (HREF): Document other missing command-line options - - * html/ntpd.htm (HREF): Document - * html/confopt.htm (href): Undocument - * ntpd/ntp_config.c (getconfig): -N high for high-priority. - Lose the ntp.conf way of setting priority. - - * ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup - From Dave Mills - -2000-07-17 Harlan Stenn - - * html/confopt.htm (href): Document it. - * ntpd/ntp_config.c (getconfig): CONFIG_PRIORITY support - * ntpd/ntpd.c (set_process_priority): Use it. - - * ntpd/ntp_crypto.c: Crypto key stuff - * ntpd/ntp_proto.c: pubkey -> pubkey.ptr - * ntpd/ntp_control.c (ctl_putpeer): fstamp -> pubkey.fstamp - * ntpd/ntp_peer.c: - * include/ntpd.h: - * include/ntp_types.h: - * include/ntp_request.h: - * include/ntp_crypto.h: - * include/ntp_control.h: - * include/ntp.h: Type cleanup - From: Dave Mills - -2000-07-14 Harlan Stenn - - * ElectricFence/Makefile.am (check-local): Don't run the tests if - we didn't build the programs... - (check-local): Same, but watch the return codes... - - * ElectricFence/page.c: #include config.h if it's there. - Properly handle the sys_errlist declaration. - - * html/ntpq.htm: - * html/index.htm: - * html/debug.htm: - * html/authopt.htm: - Reality check. - From Dave Mills - -2000-07-13 Harlan Stenn - - * Makefile.am (SUBDIRS): Added ElectricFence - * configure.in (AC_CONFIG_FILES): Added ElectricFence support - * ElectricFence: Imporpted. - -2000-07-12 Harlan Stenn - - * util/ntp_genkeys.c (main): Cleanup - * ntpd/refclock_wwv.c (wwv_qrz): sqrt -> SQRT - * ntpd/refclock_chu.c (chu_rf): sqrt -> SQRT - * ntpd/ntpd.c (set_process_priority): Disable high-priority for now. - PUBKEY cleanup. - * ntpd/ntp_timer.c: sys_revoketime cleanup. - * ntpd/ntp_proto.c (receive): PUBKEY cleanup. Comment and code - cleanup. - (process_packet): Comment and code (PUBKEY) cleanup. - (peer_xmit): Comment and code cleanup. - (fast_xmit): Comment and code cleanup. - * ntpd/ntp_peer.c (expire_all): revoketime cleanup. PUBKEY cleanup. - * ntpd/ntp_crypto.c: Comment reorg. DH parameters are now - file-static instead of local to subroutines. - (make_keylist): peer->pcookie.key cleanup/fix - (crypto_recv): Subroutine documentation cleanup, other cleanup - (crypto_xmit): Cleanup/document. - (crypto_setup): Cleanup/document. - (crypto_agree): Cleanup/document. - (crypto_rsa): now static - (crypto_dh): now static. Comment cleanup. Code cleanup. - (crypto_tai): now static. Code and comment cleanup. - (crypto_config): Deal with CRYPTO_CONF_LEAP. - * ntpd/ntp_control.c (CS_DHPARAMS): Rename corresponding token to - "params". Remove CS_TAI from def_sys_var[]. - (ctl_putsys): CS_HOST, CS_DHPARAMSm CS_REVTIME, and CS_LEAPTIME - bugfix. CS_TAI cleanup. - * ntpd/ntp_config.c (CONF_CRYPTO_LEAP): Added - (getconfig): Added CONF_CRYPTO_LEAP support. - * include/ntp_syslog.h: Lose GIZMO stuff. - * include/ntp_crypto.h (CRYPTO_CONF_LEAP): Added - * include/ntp.h: struct autokey, cookie,value, and pkt changes for - signature field. Update the inline docs on pkt's exten field. - From: Dave Mills - - -2000-07-08 Harlan Stenn - - * ntpd/ntp_util.c (stats_config): If we read a bogus old_drift, - use 0 instead of failing. - -2000-07-03 Harlan Stenn - - * README.cvs: Cleanup. - - * ntpd/refclock_datum.c (datum_pts_poll): index -> unit_index - * ntpd/ntp_resolver.c (findhostaddr): const cleanup - * libntp/recvbuff.c: - * libntp/msyslog.c: - * libntp/emalloc.c: - * libntp/authreadkeys.c: - Fix header order. - From: Simon Burge - - * ntpd/ntp_util.c (stats_config): Use HAVE_FINITE and HAVE_ISFINITE - * configure.in (ac_cv_struct_ntptimeval_timespec): isfinite() - checks for HP-UX11. - From: Albert Chin-A-Young - -2000-07-02 Harlan Stenn - - * flock-build (LIST): Lose malarky, update some machine/OS descriptions - - * configure.in: 4.0.99j4 - - * ntpq/ntpq.c: Lose PUBKEY stuff - older ntpq's will complain when - they see the info in a packet. - * ntpd/ntp_proto.c (peer_xmit): TAI changes. - * ntpd/ntp_crypto.c: Fix host/network byteorder stuff. Follow - global->struct changes. TAI changes. Bugfixes. - * ntpd/ntp_control.c: Follow field reorder/rename. - * include/ntp_crypto.h: Move crypto stuff from separate globals - into structs. - * include/ntp_control.h (CS_HOST): Reorder/rename some fields - From: Dave Mills - -2000-06-30 Harlan Stenn - - * ntpd/ntp_peer.c (unpeer): Moved keystr cleanup inside ifdef PUBKEY - - * configure.in: 4.0.99j3 - - * html/release.htm: - * html/ntpq.htm: - * html/authopt.htm: - Updates from Dave Mills - - * ntpd/ntp_request.c (dns_a): Don't call crypto_public for now... - * ntpd/ntp_proto.c (receive): Follow the TEST wiggles - (peer_xmit): TAI support - * ntpd/ntp_crypto.c: TAI support - * ntpd/ntp_control.c: CS_VERSION and CS_TAI support - * include/ntp_crypto.h (CRYPTO_FLAG_TAI): Added. - * include/ntp_control.h (CS_VERSION): Added. - * include/ntp.h (TEST4,TEST5,TEST8,TEST9): Wiggle. - From: Dave Mills - - * ntpd/Makefile.am (ntpd_SOURCES): Lose refclock_ulink331.c - because the new refclock_ulink.c handles it. - -2000-06-28 Harlan Stenn - - * ntpd/ntp_config.c (getconfig): Sanity check the right variable - From: Dave Mills. - -2000-06-25 Harlan Stenn - - * configure.in: 4.0.99j2 - - * ntpd/ntp_proto.c: - * ntpd/ntp_peer.c: - * ntpd/ntp_crypto.c: - * include/ntp_crypto.h: - * include/ntp.h: - AUTOKEY/PUBKEY/DH/crypto changes - From: Dave Mills - -2000-06-23 Harlan Stenn - - * html/driver34.htm: - * ntpd/refclock_ulink.c: - * ntpd/refclock_ulink331.c: (removed) - Updated for 320/330 series refclocks - From: joseph lang - - * ntpd/refclock_oncore.c: Patches/improvements - * html/driver30.htm: New release - From: Reg Clemens - -2000-06-17 Harlan Stenn + scripts/stats/README.stats + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99j1 + scripts/support/README + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdc/ntpdc.c (getcmds): - * configure.in: - Readline support. - From: Aaron Sherman - - * ntpd/refclock_ulink331.c: Added. - Sent in by Doug Grosso - * ntpd/Makefile.am (ntpd_SOURCES): Added refclock_ulink331.c - - * libntp/snprintf.c: Added stdio.h - From: Marc Brett - - * include/ntp.h: struct autokey's siglen is u_int32. So is the - siglen in struct cookie. So is siglen and value length in struct - value. Add fstamp to struct peer. Resize the exten AUTOKEY field - in struct pkt. - * include/ntp_crypto.h: crypto_enable -> crypto_flags and a - variety of other cleanups. - * ntpd/ntp_config.c: crypto_enable -> crypto_flags, and some - key/fudge cleanup. - * ntpd/ntp_control.c: Much cleanup. - * ntpd/ntp_crypto.c: Many changes that Harlan is too tired to - properly document. - * ntpd/ntp_peer.c: crypto_enable -> crypto_flags - (peer_config): Hold off on crypto_public() until some resolver - issue is fixed. - * ntpd/ntp_proto.c (receive): Disable the reverse DNS lookup for now. - (process_packet): Don't record_raw_stats() for now. - crypto_enable was renamed to crypto_flags. - (peer_xmit): In MODE_ACTIVE or MODE_PASSIVE, only call - crypto_xmit() if the peer->cmmd is not CRYPTO_AUTO. Reset - peer->cmmd to 0 when we're thru. - Don't reset peer->cmmd to 0 until the end of MODE_CLIENT. - * ntpd/ntpd.c: Lose the call to crypto_init(). Instead, call - crypto_setup() later on if we have crypto_flags. - * util/ntp_genkeys.c: Lose GENLEN; use PRIMELEN/2 . - From Dave Mills. - - * ntpd/ntp_crypto.c (crypto_rsa): - (crypto_dh): - Do some debug logging if readlink() fails with something other - than EINVAL (file isn't a symlink). + scripts/support/bin/monl + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-06-04 James R. Van Zandt + scripts/support/bin/mvstats + 1.2 01/10/08 21:18:34 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/miscopt.htm (trap): punctuation + scripts/stats/ensemble.awk + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/ntpd.htm (-g): typo + scripts/stats/etf.awk + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/miscopt.htm (logconfig): List the "clock" event class. - "allprefix" should be two words. + scripts/stats/dupe.awk + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-31 Harlan Stenn + scripts/stats/clock.awk + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_timer.c: Protect - -2000-05-30 Harlan Stenn + scripts/stats/ensemble.S + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/Makefile.am: Document what we expect from -lm + scripts/stats/etf.S + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-29 Harlan Stenn + scripts/monitoring/README + 1.3 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99j + scripts/monitoring/ntploopwatch + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-22 Harlan Stenn + scripts/monitoring/ntptrap + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/ntptime.htm: More fixes - From: Kazu TAKAMUNE + scripts/monitoring/timelocal.pl + 1.2 01/10/08 21:18:33 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-16 Harlan Stenn + scripts/plot_summary.in + 1.2 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build (KEYSUF): - * flock-build: - * configure.in: Lose the "md5" options from the --with-crypto - check; Dave hates it. + scripts/ntpver.in + 1.2 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_util.c (stats_config): - * ntpd/ntp_loopfilter.c (loop_config): - * libntp/systime.c (adj_systime): - * include/ntp_proto.h (NTP_MAXFREQ): - Renamed MAX_FREQ to NTP_MAXFREQ + scripts/ntpsweep.in + 1.2 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c (ntpdmain): - * ntpd/ntp_proto.c (receive): - (poll_update): - * ntpd/ntp_intres.c (addentry): - * ntpd/ntp_config.c (getconfig): - Lint cleanup - From: Marc Brett + scripts/ntp-wait.in + 1.5 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_stdlib.h: - * libntp/systime.c (adj_systime): - * ntpd/ntp_loopfilter.c (loop_config): - * ntpd/ntp_util.c (stats_config): - * ports/winnt/ntpd/nt_clockstuff.c (adj_systime): - MAXFREQ -> MAX_FREQ - * include/ntp_proto.h: Define MAX_FREQ + scripts/summary.in + 1.2 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-15 Harlan Stenn + scripts/monitoring/ntploopstat + 1.3 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_stdlib.h: - * libntp/systime.c (adj_systime): - * ntpd/ntp_loopfilter.c (loop_config): - * ntpd/ntp_util.c (stats_config): - * ports/winnt/ntpd/nt_clockstuff.c (adj_systime): - sys_maxfreq -> MAXFREQ - Per Dave Mills. + scripts/monitoring/ntp.pl + 1.3 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-14 Harlan Stenn + scripts/monitoring/lr.pl + 1.3 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * acinclude.m4: Typo... + scripts/monitoring/loopwatch.config.SAMPLE + 1.2 01/10/08 21:18:32 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-13 Harlan Stenn + scripts/ntp-groper + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/gpstolfp.c (GPSORIGIN): Try new ULONG_CONST macro + scripts/ntp-restart + 1.3 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntptimeset.c: - * ntpdate/ntpdate.h: - * ntpd/refclock_oncore.c (oncore_msg_En): - * ntpd/ntp_util.c (stats_config): - * ntpd/ntp_request.c: - * ntpd/ntp_intres.c (findhostaddr): - * ntpd/ntp_config.c (getconfig): - * libntp/systime.c (adj_systime): - * libntp/lib_strbuf.c: - * libntp/authparity.c: - * libntp/audio.c: - Header/lint cleanup - From/reported by: Simon Burge + scripts/ntp-status + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c (findhostaddr): Compiler noise cleanup + scripts/ntp-close + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_intres.c: Compiler noise cleanup + scripts/mkver.in + 1.8 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/ntptime.htm: Document reality check - From: Kazu TAKAMUNE + scripts/hpadjtime.sh + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-12 Harlan Stenn + scripts/freq_adj.in + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_intres.c (ntp_intres): Quiet some debug messages - Reported by: Brian Bergstrand + scripts/fixautomakedepsmagic + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-11 Harlan Stenn + scripts/checktime.in + 1.2 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/mkver.in (ConfStr): Use -r if we're using RSAREF, - otherwise use -a if we're using autokey, otherwise use no extra - suffix. + scripts/Makefile.am + 1.9 01/10/08 21:18:31 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-11 Sven Dietrich + scripts/calc_tickadj.in + 1.2 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ports/winnt/include/config.h: New defines to support AUTOKEY - * ports/winnt/include/unistd.h: Added another dummy placeholder.h - * ports/winnt/ntpd/ntpd.dsp: Added ntp_crypt.c to makefile - * ports/winnt/ntpd/ntpd.c: service_main needs a local hostname[] - * html/hints/winnt.htm: Add remark about 4.0.99i not compiling. - These changes got WINNT running again. No idea if the keys stuff - works however. + scripts/README + 1.8 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-10 Harlan Stenn + ports/winnt/include/arpa/inet.h + 1.3 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i9 + ports/winnt/include/netinet/in.h + 1.3 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c: tstamp and autokey cleanup - From: Dave Mills + ports/winnt/include/netinet/in_system.h + 1.2 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (clock_update): Only call expire_all() if - AUTOKEY - From many folks, including Reg Clemens + ports/winnt/include/netinet/ip.h + 1.2 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-07 Harlan Stenn + ports/winnt/include/sys/socket.h + 1.3 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i8 - - * flock-build: Use new --with-crypto choices - * build (KEYSUF): Deal with new --with-crypto - * configure.in: --with-crypto={md5,autokey,rsaref}; - lose --enable-autokey + ports/winnt/include/sys/time.h + 1.3 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-06 Harlan Stenn + ports/winnt/include/sys/wait.h + 1.3 01/10/08 21:18:30 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build (KEYSUF): Catch --disable-autokey first. + ports/winnt/include/sys/signal.h + 1.3 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-05 Harlan Stenn + ports/winnt/include/sys/ioctl.h + 1.4 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: If we don't use autokey, don't use rsaref either. + ports/winnt/include/sys/param.h + 1.3 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i7 + ports/winnt/include/sys/resource.h + 1.3 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build (KEYSUF): - * flock-build: - It's --disable-autokey now + ports/winnt/include/transmitbuff.h + 1.3 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: MD5 is not optional (but AUTOKEY is) - * include/ntp_stdlib.h: - * libntp/a_md5encrypt.c: - * libntp/authkeys.c: - (authhavekey): - (MD5auth_setkey): - (auth_delkeys): - (authencrypt): - (authdecrypt): - * libntp/authreadkeys.c: - (authreadkeys): - * ntpd/ntp_proto.c (init_proto): - * libntp/authusekey.c: - MD5 is required. + ports/winnt/include/unistd.h + 1.2 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-04 Harlan Stenn + ports/winnt/include/win32_io.h + 1.4 01/10/08 21:18:29 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i6 + ports/winnt/instsrv/instsrv.c + 1.5 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (transmit): Fix up the UNREACH code. - (receive): Lose some debug code. - (clock_update): expire_all() if LEAP_NOTINSYNC - crypto_xmit() a CRYPTO_AUTO if !FLAG_AUTOKEY instead of recauto.tstamp - crypto_xmit() a CRYPTO_PRIV (not CRYPTO_AUTO) based on pcookie.tstamp - crypto_xmit() a CRYPTO_AUTO (not CRYPTO_PRIV) based on FLAG_MCAST2 - and !FLAG_AUTOKEY - * ntpd/ntp_crypto.c (crypto_recv): Clean up debug output. - Don't AUTOKEY if FLAG_MCAST2 - From: Dave Mills + ports/winnt/include/netdb.h + 1.3 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Also make obe withouyt md5 (no AUTOKEY) - * build (BDIR): Handle -noautokey build directory suffix - * configure.in: Prepare for AUTOKEY in mkver.in - * scripts/mkver.in (ConfStr): Indicate in the version string if - we're not using AUTOKEY. + ports/winnt/include/termios.h + 1.2 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-03 Harlan Stenn + ports/winnt/include/syslog.h + 1.3 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntp-wait.in: Fun things with backspaces + ports/winnt/include/clockstuff.h + 1.4 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i5 + ports/winnt/include/config.h + 1.10 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntptrace/ntptrace.c: Protect sys/ioctl.h; grab config.h + ports/winnt/include/hopf_PCI_io.h + 1.2 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (transmit): AUTOKEY and tstamp fixes. - (clock_update): Check oleap against LEAP_NOTINSYNC - (peer_clear): Free pubkey when we're done - Check peer's keynumber against the seq in MODE_BROADCAST. - Reorder tstamp changes. - * ntpd/ntp_crypto.c (crypto_recv): Check the packet if we get a - CRYPTO_RESP and reorder the update of tstamp. - (crypto_recv): Don't expire the peer until we're thru with it. - * include/ntp.h: AUTOKEY and pkeyid changes - From Dave Mills + ports/winnt/include/ntp_timer.h + 1.3 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntpdate.c: Protect sys/ioctl.h + ports/winnt/include/ntp_iocompletionport.h + 1.4 01/10/08 21:18:28 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-05-01 Harlan Stenn + ports/winnt/libntp/SetSystemTime.c + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i4 + ports/winnt/libntp/log.h + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp.h: - * include/ntp_crypto.h: - * include/ntpd.h: - * ntpd/ntp_crypto.c: - * ntpd/ntp_proto.c: - * ntpd/ntpd.c: - * util/ntp_genkeys.c: - Dave Mills closed some potential vulnerabilities in the key protocol. + ports/winnt/ntpd/ntp_iocompletionport.c + 1.5 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-28 Harlan Stenn + ports/winnt/libntp/mexit.c + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i3 + ports/winnt/libntp/util_clockstuff.c + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c: Just check tstamp, forget about sndauto.seq - * ntpd/ntp_crypto.c (crypto_recv): Lose inappropriate ntohl() - conversion on tstamp. - AUTOKEY if tstamp>0, not != - Stash tstamp before we check pcookie.key (several places) - * ntpd/ntp_control.c (ctl_putpeer): In CP_INITSEQ, check - recauto.key, not keylist. - From: Dave Mills + ports/winnt/ntpd/refclock_trimbledc.c + 1.4 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-27 Harlan Stenn + ports/winnt/libntp/messages.mc + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i2 + ports/winnt/libntp/transmitbuff.c + 1.4 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpq/ntpq.c: PUBKEY stuff - * ntpd/ntp_proto.c (clock_select): nreach, and better survivor pick. - * ntpd/ntp_peer.c (newpeer): Better nextdate choice. - * ntpd/ntp_control.c (ctl_putsys): Buglet in CS_HOSTNAM code. - From Dave Mills. + ports/winnt/ntpd/refclock_trimbledc.h + 1.3 01/10/08 21:18:27 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-24 Harlan Stenn + ports/winnt/ntpd/win32_io.c + 1.5 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build (IAM): Show hostname if we trip a buildkey check. + ports/winnt/ntpd/nt_clockstuff.c + 1.10 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-23 Harlan Stenn + ports/winnt/ntpd/hopf_PCI_io.c + 1.2 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build: deal with optional 1st argument (SIG), which must match - the contents of .buildkey + ports/winnt/scripts/mkver.bat + 1.4 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Generalize, implement SIG and .buildkey, and drive - list from LIST, which the user can override. + parseutil/testdcf.c + 1.3 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-21 Harlan Stenn + parseutil/README + 1.2 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i1 - Dave updated some docs, implemented the kpoll variable, and - wiggled a host/network byte order thing in the crypto key code. + parseutil/Makefile.am + 1.4 01/10/08 21:18:26 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-16 Harlan Stenn + parseutil/dcfd.c + 1.8 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwvb.c (wwvb_receive): Grab any character (instead - of just a space) before the DSTchar. - From: Dave Mills + ntptrace/ntptrace.h + 1.2 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-11 Harlan Stenn + ntptrace/ntptrace.c + 1.15 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99i + ntptrace/README + 1.3 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - Dave made some documentation updates. + ntptrace/Makefile.am + 1.3 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-08 Harlan Stenn + ntpq/ntpq_ops.c + 1.11 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Add malarky. By default, --enable-parse-clocks. - Start 2 builds, one with and the other without rsaref. + ntpq/README + 1.3 01/10/08 21:18:25 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h6 - Dave improved the crypto stuff some more. + ntpq/ntpq.h + 1.2 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-05 Harlan Stenn + ntpq/ntpq.c + 1.17 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_acts.c (acts_receive): Do a better job with year - conversions and leap-year checks. The PTB stuff caught this. - Reported by: Daniel.Aeby@eam.admin.ch + ntpq/Makefile.am + 1.5 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-04-02 Harlan Stenn + ntpdc/ntpdc_ops.c + 1.11 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_atom.c (atom_pps): Bugfix - From: Philippe Charnier + ntpdc/ntpdc.h + 1.2 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-30 Harlan Stenn + ntpdc/ntpdc.c + 1.9 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/clk_wharton.c (cvt_wharton_400a): Do not return - CVT_NONE when receiving the early warning bit set. - From: Philippe De Muyter + ntpdc/README + 1.3 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h5 - Dave made more changes to the auth key stuff. + ntpdc/Makefile.am + 1.4 01/10/08 21:18:24 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-29 Harlan Stenn + ntpdate/ntptimeset.c + 1.11 01/10/08 21:18:23 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h4 - Dave made a bunch of changes/fixes to the auth key stuff. + ntpdate/ntptime_config.c + 1.5 01/10/08 21:18:23 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-22 Harlan Stenn + ntpdate/ntpdate.h + 1.5 01/10/08 21:18:23 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c: Typos. + ntpdate/ntpdate.c + 1.25 01/10/08 21:18:23 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-21 Harlan Stenn + ntpdate/Makefile.am + 1.6 01/10/08 21:18:23 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h3 + ntpdate/README + 1.3 01/10/08 21:18:22 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_intres.c: Use LOG_INFO instead of LOG_DEBUG. - * ntpd/ntp_resolver.c: Ditto. + ntpd/refclock_wwvb.c + 1.10 01/10/08 21:18:22 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-20 Harlan Stenn + ntpd/refclock_usno.c + 1.6 01/10/08 21:18:22 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/Makefile.am (ntp_genkeys_LDADD): Might need snprintf (-lntp) + ntpd/refclock_ulink.c + 1.11 01/10/08 21:18:22 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (stamp-rsaref): nodist_HEADERS are not - supoprted yet. Hack around it. + ntpd/refclock_jjy.c + 1.2 01/10/08 21:18:22 stenn@whimsy.udel.edu +0 -0 - * ntpd/ntp_resolver.c (findhostaddr): hstrerror isn't always available. + ntpd/refclock_wwv.c + 1.26 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Look for hstrerror. + ntpd/refclock_true.c + 1.7 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntp_genkeys.c (main): Use snprintf, not sprintf. + ntpd/refclock_trak.c + 1.7 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c: Use gethostname, not uname - * util/ntp_genkeys.c: Ditto - From: Dave Mills + ntpd/refclock_shm.c + 1.10 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-19 Harlan Stenn + ntpd/refclock_ptbacts.c + 1.2 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (receive): Rename ntp_res_send() to - ntp_res_name() and adjust the number of arguments. - * ntpd/ntp_resolver.c (ntp_res_name): Ditto - * include/ntpd.h: Ditto + ntpd/refclock_tpro.c + 1.6 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c: Add de_done to the dns_entry structure. + ntpd/refclock_parse.c + 1.18 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-18 Harlan Stenn + ntpd/refclock_palisade.h + 1.6 01/10/08 21:18:21 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h2 + ntpd/refclock_palisade.c + 1.9 01/10/08 21:18:20 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/Makefile.am (info_trimble.c): Use $(srcdir)/foo.sed - instead of foo.sed . + ntpd/refclock_oncore.c + 1.37 01/10/08 21:18:20 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (stamp-rsaref): Copy each file to the build - directory, not to the source directory. This sucks; it wastes - space (but it's more portable). + ntpd/refclock_nmea.c + 1.16 01/10/08 21:18:20 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_busted_vpath_in_make): Add FreeBSD. I bet all - systems that use pmake will need this. - (ac_busted_vpath_in_make): Remove FreeBSD - I found a workaround. + ntpd/refclock_mx4200.c + 1.15 01/10/08 21:18:20 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am: General cleanup + ntpd/refclock_pst.c + 1.6 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h1 + ntpd/refclock_msfees.c + 1.8 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c: Lose unneeded header. + ntpd/refclock_local.c + 1.6 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-17 Harlan Stenn + ntpd/refclock_leitch.c + 1.5 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/snprintf.c: #include + ntpd/refclock_jupiter.c + 1.8 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Use it correctly... + ntpd/refclock_pcf.c + 1.6 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-16 Harlan Stenn + ntpd/refclock_irig.c + 1.9 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/Makefile.am (EXTRA_DIST): Added snprintf.c + ntpd/refclock_hpgps.c + 1.5 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Look for (and provide if it's missing) snprintf() + ntpd/refclock_hopfser.c + 1.3 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_request.c (dns_a): Call crypto_public with the resolved - name and the peer pointer. - (dns_a): crypto_public() is only available if PUBKEY is #defined. + ntpd/refclock_hopfpci.c + 1.3 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c (crypto_public): sprintf is Evil. Use snprintf. - (crypto_setup): Ditto - (crypto_read): Ditto + ntpd/refclock_heath.c + 1.9 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c (ntp_res_send): Lose some debugging noise. + ntpd/refclock_gpsvme.c + 1.5 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_config.c (getconfig): Lose testing code. + ntpd/refclock_dumbclock.c + 1.5 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_request.c (dns_a): Fix buglet in hostname length check. + ntpd/refclock_datum.c + 1.7 01/10/08 21:18:19 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-16 Harlan Stenn + ntpd/refclock_fg.c + 1.7 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_request.c (dns_a): Start cracking the returned information. + ntpd/refclock_conf.c + 1.15 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-15 Harlan Stenn + ntpd/refclock_chu.c + 1.21 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_resolver.c (ntp_res): Authenticate the keyid. + ntpd/refclock_chronolog.c + 1.5 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_crypto.c (crypto_line): Fix definition - (crypto_read): Ditto. + ntpd/refclock_bancomm.c + 1.7 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_config.c (getconfig): Move req_keyid generation here. + ntpd/refclock_atom.c + 1.35 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (BUILT_SOURCES): Cleanup more nodist_ stuff. + ntpd/refclock_as2201.c + 1.7 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-03-14 Harlan Stenn + ntpd/refclock_arc.c + 1.8 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build (RSASUF): If we have rsaref2/ and are building - --without-rsaref, note it as a build-directory suffix. + ntpd/refclock_arbiter.c + 1.5 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99h - Crypto merge + ntpd/refclock_acts.c + 1.8 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Added nodist_ + ntpd/ntp_timer.c + 1.17 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-28 Harlan Stenn + ntpd/ntp_util.c + 1.15 01/10/08 21:18:18 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Lose the changequote calls and fix the quoting. - Reported by: Akim Demaille + ntpd/ntp_peer.c + 1.30 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_request.c: Log various error conditions. + ntpd/ntp_restrict.c + 1.4 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-27 Harlan Stenn + ntpd/ntp_resolver.c + 1.13 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99g + ntpd/ntp_request.c + 1.24 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c: Only log EINTR if debug > 2. + ntpd/ntp_refclock.c + 1.40 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-25 Harlan Stenn + ntpd/ntp_proto.c + 1.95 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/mkver.in (ConfStr): Use `-r' when configured with crypto. + ntpd/ntp_monitor.c + 1.5 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwvb.c (wwvb_receive): Undo the previous chagne. + ntpd/ntp_loopfilter.c + 1.54 01/10/08 21:18:17 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-24 Harlan Stenn + ntpd/ntpd.c + 1.35 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwvb.c (wwvb_receive): LENWWVB0 can return 6 or 7 - fields. - From: Michael Sinatra - with a cleanup from Ulrich. + ntpd/ntp_control.c + 1.39 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/mkver.in (ConfStr): Make RSAREF appear as part of the - version. + ntpd/ntp_intres.c + 1.19 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-21 Sven Dietrich + ntpd/ntp_filegen.c + 1.6 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ports/winnt/include/config.h: Enable MD5 and RANDOM by default - * ports/winnt/libntp/SetSystemTime.c: Fix warning and const declaration - From: Carl Byington + ntpd/ntp_crypto.c + 1.44 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-21 Harlan Stenn + ntpd/ntp_config.c + 1.52 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (SUBDIRS): Make librsaref right after includes so we - can copy any needed header files over. + ntpd/map_vme.c + 1.4 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/Makefile.am (INCLUDES): Also look in librsaref for des.h - * ntpd/Makefile.am (INCLUDES): Ditto - * util/Makefile.am (INCLUDES): Ditto + ntpd/jupiter.h + 1.2 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (librsaref_a_SOURCES): Use the des.h from - the rsaref2 distribution. + ntpd/Makefile.am + 1.20 01/10/08 21:18:16 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): No, we don't want des.h + ntpd/ntp_io.c + 1.22 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-20 Harlan Stenn + ntpd/check_y2k.c + 1.6 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): Add des.h + ntpd/cmd_args.c + 1.8 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-19 Harlan Stenn + libparse/trim_info.c + 1.2 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_config.c (do_resolve_internal): Try Real Hard to - generate a full random key. - From: Carl Byington + libparse/parsestreams.c + 1.4 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp.h: Now we know we have either mrand48() or random(). - * configure.in: If we have mrand48, use it. Otherwise, use (and - provide if necessary) random(). - * libntp/Makefile.am (EXTRA_DIST): random.c - * libntp/random.c: Added. + libparse/parsesolaris.c + 1.4 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-18 Harlan Stenn + libparse/parse_conf.c + 1.7 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am (stamp-rsaref): Typo + libparse/parse.c + 1.8 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_cv_func_ctty_for_f_setown): Yes for OpenBSD - (ac_cv_var_ntp_syscalls): Fix quoting of description - From: Jonathan Rozes + libparse/mkinfo_scmd.sed + 1.2 01/10/08 21:18:15 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * librsaref/Makefile.am: Fix stamp-rsaref dependency order. + libparse/mkinfo_rcmd.sed + 1.2 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99f + libparse/info_trimble.c + 1.2 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-17 Harlan Stenn + libparse/data_mbg.c + 1.3 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_mx4200.c: Remove the DOP-weighted position - averaging code and revert to a simple mean average. The weighted - average consistently produced a *worse* result. Go figure. - * html/mx4200data.htm: Cleanup, reflect current reality. - * html/driver9.htm: Cleanup, reflect current reality. - * html/copyright.htm: Cleanup, and credit where credit is due. - From: Marc.Brett@westgeo.com + libparse/clk_wharton.c + 1.4 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c: Cleanup/fixes - * html/driver30.htm: Cleanup - * html/Oncore-SHMEM.htm: Cleanup - From: Reg Clemens + libparse/clk_varitext.c + 1.5 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-16 Sven Dietrich + libparse/clk_trimtsip.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * winnt/scripts/mkver.bat: Frederick Czajka [w2k@austin.rr.com] - winnt/ntpq/ntpq.dsp: modified mkver.bat to eliminate the - winnt/ntpd/ntpd.dsp: need to have Perl installed and the - winnt/ntpdc/ntpdc.dsp: PERL environment variable to be set. - winnt/ntpdate/ntpdate.dsp: - winnt/ntptrace/ntptrace.dsp: Thanks, Frederick! + libparse/clk_trimtaip.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_nmea.c: Correctly interpret the quality indicator. + libparse/clk_schmid.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-15 Harlan Stenn + libparse/clk_rcc8000.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_nmea.c: Correctly interpret the quality indicator. - Deal with the time supplied in centiseconds. GPGCA/GPGGA cleanup. - From: Andrew Hood + libparse/clk_rawdcf.c + 1.8 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/Makefile.am (K_CFLAGS): Use instead. Add NEED_NTP_BOPS. + libparse/clk_meinberg.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-10 Harlan Stenn + libparse/clk_hopf6021.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntp-wait.in: Intensify, including some suggestions from - Ulrich. + libparse/clk_dcf7000.c + 1.6 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99e + libparse/Makefile.am + 1.7 01/10/08 21:18:14 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntp-wait.in: Lose cruft, sleep after each try. + libparse/clk_computime.c + 1.6 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntp-restart: It's ntpd now. Also, call ntp-wait. + libparse/README + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (AC_CONFIG_*): New scripts that use PATH_PERL + libntp/ymd2yd.c + 1.3 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/Makefile.am (noinst_SCRIPTS): Added ntp-wait - (noinst_SCRIPTS): Added all of the scripts that now use PATH_PERL + libntp/utvtoa.c + 1.3 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Get the path to perl - (AC_CONFIG_*): Added scripts/ntp-wait + libntp/uinttoa.c + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntptrace/ntptrace.c (DoTrace): If the server's srcadr is 0.0.0.0 - then we haven't synced yet. Note and punt. - Reported by: Bdale Garbee ,http://bugs.debian.org/56551 + libntp/uglydate.c + 1.3 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-09 Harlan Stenn + libntp/tvtots.c + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment) - From: Carl Byington + libntp/tvtoa.c + 1.3 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Disable kernel_fll_bug for Generic_105181-17 under - Solaris-2.6 - From: Juergen Georgi + libntp/tstotv.c + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-02-07 Harlan Stenn + libntp/tsftomsu.c + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99d + libntp/systime.c + 1.18 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/Oncore-SHMEM.htm: New document - * html/driver30.htm: Cleanup and improvements - From: Reg Clemens + libntp/syssignal.c + 1.8 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-30 Harlan Stenn + libntp/strerror.c + 1.2 01/10/08 21:18:13 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c: Patches/improvements - From: Reg Clemens + libntp/strdup.c + 1.4 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-29 Harlan Stenn + libntp/octtoint.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99c + libntp/README + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-28 Harlan Stenn + libntp/statestr.c + 1.3 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Autoconf update... + libntp/snprintf.c + 1.5 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntpdate.c (ntpdatemain): Typo - From: Jack Bryans + libntp/refnumtoa.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (EXTRA_DIST): Add flock-build. Probably UDel specific... + libntp/recvbuff.c + 1.8 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-23 Harlan Stenn + libntp/ranny.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/check_y2k.c (main): Reformat for ansi2knr + libntp/random.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (AC_OUTPUT): Revert to obsolete form until automake - catches up. + libntp/prettydate.c + 1.3 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-22 Harlan Stenn + libntp/msutotsf.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Use AC_CHECK_TYPES((s_char)) instead of - AC_CHECK_TYPE. - (ac_cv_var_kernel_fll_bug): Generic_106541-08 is apparently OK, too. + libntp/numtohost.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/Makefile.am (EXTRA_DIST): Need to explicitly distribute - mkver.in and ntpver.in now, apparently. - * configure.in: Search for the various audio_info members so the - printing in audio_show is less of a circus. This required an - autoconf upgrade. Major sigh. + libntp/numtoa.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/audio.c (audio_show): Clean up (more) properly. + libntp/netof.c + 1.2 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-21 Sven Dietrich + libntp/msyslog.c + 1.11 01/10/08 21:18:12 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Add pointer to html/hints/winnt.htm to INSTALL file - * Fix NT makefiles to accomodate at least one weird - version of Visual C that can't handle the LFs without - the DOS CR also. + libntp/Makefile.am + 1.12 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-20 Sven Dietrich + libntp/mstolfp.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Update Copyright in Palisade driver to 2000 - * Fix Palisade MIN & MAX POLL to optimal values + libntp/modetoa.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-19 Harlan Stenn + libntp/mfptoa.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/driver7.htm: Patches from Dave Mills - * html/driver36.htm: Patches from Dave Mills + libntp/mktime.c + 1.3 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/copyright.htm: Added Kamal Mostafa + libntp/mfptoms.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-19 Harlan Stenn + libntp/mfp_mul.c + 1.3 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99b + libntp/humandate.c + 1.3 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-18 Harlan Stenn + libntp/memmove.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_chu.c: NCHAN is used with generic ICOM. + libntp/md5c.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Use new audio stuff - * ntpd/refclock_irig.c: Use new audio stuff - * ntpd/refclock_chu.c: Use new audio stuff - * ntpd/ntp_proto.c: Clean up - * ntpd/ntp_loopfilter.c (local_clock): Clean up error message - * include/icom.h: Number of arguments changed - * libntp/Makefile.am (libntp_a_SOURCES): Added audio.c - * libntp/audio.c: New file - * include/Makefile.am (noinst_HEADERS): audio.h added - * include/audio.h: New file - From: Dave Mills + libntp/machines.c + 1.11 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/freq_adj: Added. FreeBSD frequency adjustment script. + libntp/log.h + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Do a better job on my oncore_ok check for SCO. + libntp/log.c + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-15 Harlan Stenn + libntp/ieee754io.c + 1.4 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99a + libntp/iosignal.c + 1.8 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntpsweep: New version - * html/copyright.htm: Added Hans Lambermont - From: Hans Lambermont + libntp/lib_strbuf.c + 1.3 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-14 Harlan Stenn + libntp/lib_strbuf.h + 1.2 01/10/08 21:18:11 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c (oncore_start): Only dance with the - pps_device if it's there. - From: reg@dwf.com + libntp/fptoa.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: ONCORE is OK if ac_cv_hdr_def_tiocdcdtimestamp=yes + libntp/fptoms.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build: Just overwrite the log file each time; sometimes NFS goes - a little goofy. + libntp/getopt.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_fg.c: Syntax/punctuation cleanup + libntp/gpstolfp.c + 1.5 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-13 Harlan Stenn + libntp/calyearstart.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/ntpsweep: New version - From: Hans Lambermont + libntp/clocktime.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_fg.c: New version - * html/driver37.htm: New version - From: Dmitry Smirnov + libntp/findconfig.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-12 Harlan Stenn + libntp/icom.c + 1.7 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * README.des: Cleanup + libntp/inttoa.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-12 Harlan Stenn + libntp/emalloc.c + 1.5 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.99 + libntp/calleapwhen.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/driver36.htm: Cleanup - * html/monopt.htm: Ditto - From: Dave Mills + libntp/clocktypes.c + 1.9 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_intres.c (ntp_intres): Put "NTP_INTRES running" at a - higher debug level + libntp/dofptoa.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-11 Harlan Stenn + libntp/decodenetnum.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: More improvements - From: Dave Mills + libntp/hextolfp.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-10 Harlan Stenn + libntp/dolfptoa.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Bugfixes/improvements - From: Dave Mills + libntp/hextoint.c + 1.2 01/10/08 21:18:10 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Get the quoting right on the sys_errlist check. - From documentation by: Akim Demaille + libntp/caltontp.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-08 Harlan Stenn + libntp/caljulian.c + 1.3 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: cannot be detected... - * ntpd/ntp_io.h: ...but every OS has it - * ntpd/refclock_oncore.c: Lint removal - * ntpq/ntpq_ops.c: Lint removal - * ntpq/refclock_chu.c: chu_major() is not an audio routine (?), lint - * libntp/icom.c: AIX doesn't have - From: Marc.Brett@westgeo.com + libntp/buftvtots.c + 1.3 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_chu.c: NetBSD needs sys/ioctl.h - (chu_debug): NetBSD-specific debug output. - From: Frederick Bruckman + libntp/binio.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-06 Harlan Stenn + libntp/authusekey.c + 1.4 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98m - I skipped `l' - it looks like a `1'. + libntp/authreadkeys.c + 1.4 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/driver7.htm: Doc update - * html/driver36.htm: Ditto - * html/audio.htm: Ditto + libntp/authparity.c + 1.4 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Dvae snuck another fix/change in on me. + libntp/authkeys.c + 1.7 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98k + libntp/authencrypt.c + 1.5 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_chu.c (chu_start): Call icom_init with the speed - * ntpd/refclock_wwv.c (wwv_start): Ditto, plus other improvements. - * libntp/icom.c (icom_init): Add speed parameter - * include/icom.h: Update declaration - From: Dave Mills + libntp/audio.c + 1.7 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): Added icom.h - From: Frederick Bruckman + libntp/atouint.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-05 Harlan Stenn + libntp/atolfp.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98j + libntp/atoint.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c (timecode): Make definition == declaration - (wwv_newchan): Ditto - (wwv_corr4): Dave fixed the declaration. + libntp/adjtimex.c + 1.2 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Add rackety to the flock - it runs SunOS 4.1.3/cc + libntp/adjtime.c + 1.3 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Undo that declaration cleanup for now... + libntp/a_md5encrypt.c + 1.6 01/10/08 21:18:09 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_io.c (open_socket): TOS support - From: Marc.Brett@westgeo.com + kernel/tty_clk_STREAMS.c + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -2000-01-04 Harlan Stenn + kernel/tty_clk.c + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Declaration cleanup - * ntpd/refclock_fg.c (fg_receive): Not all sprintf's are created - equal... - From: Marc.Brett@westgeo.com + kernel/tty_chu_STREAMS.c + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Dave Cleaned and Improved things. - * ntpd/ntp_loopfilter.c (local_clock): Dave fixed something. + kernel/tty_chu.c + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Rename max to p_max or s_max as appropriate - to avoid native SunOS compiler collision. - (wwv_epoch): Make declaration == definition - (wwv_rsec): Ditto - (wwv_newchan): Ditto - (wwv_qsy): Ditto - (timecode): Ditto + kernel/sys/tpro.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c (oncore_init_shmem): Use a cast to widen - mmap's NIL offset. + kernel/sys/timex.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_chu.c (chu_rf): Make declaration == definition. - Rename min/max to es_min/es_max to avoid native SunOS compiler - collision. - (chu_uart): Make declaration == definition. + kernel/sys/ppsclock.h + 1.3 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/icom.c (sndpkt): Make declaration and definition equivalent. - (doublefreq): Ditto. + kernel/sys/pcl720.h + 1.3 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c (MAP_FAILED): Some systems do not #define - this. + kernel/sys/parsestreams.h + 1.3 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: - * ntpd/refclock_chu.c: - * libntp/icom.c: - * libntp/Makefile.am: - * include/icom.h: - * html/driver7.htm: - * html/driver36.htm: - Support for ICOM. The WWV/H driver, by the way, is getting truly - awesome. The CHU autotune function works okay as it is. I'd like - to find somebody else to test the audio drivers just to make sure - I haven't done something stupid. There is a new define ICOM - intended for the driver autotune function; however, I crafted the - thing in much the same way as the refclock_atom.c thing - it tries - to open /dev/icom and, if that fails, goes quietly to sleep. - From: Dave Mills - -2000-01-03 Harlan Stenn - - * ntpd/refclock_oncore.c (oncore_read_config): Patches and cleanup - From: Poul-Henning Kamp - more isascii() stuff from HMS. - - * ntpd/refclock_fg.c (fg_receive): Cast. - From: Tom Smith - - * ntpd/map_vme.c (map_vme): tx.access_result indicates failure on - < 0, not <= 0. A fix that apparently did not get brought over - from the ntp3 base. - From: Michael Barone - - * configure.in: Move the ONCORE_SHMEM_STATUS check and definition - here. - - * ntpd/refclock_oncore.c (oncore_init_shmem): Some systems do not - have MAP_HASSEMAPHORE. - - * ntpd/refclock_oncore.c: Drive ONCORE_SHMEM_STATUS based on - HAVE_SYS_MMAN_H . If this needs finer checks, do it in - configure.in . - (oncore_read_config): Add the isascii() checks; older versions of - Unix don't guarantee correct behavior of is*() without it. - - * ntpd/refclock_oncore.c: Add proof-of-concept support for - delivering receiver data stream to other processes through - a memory-mapped file. - From: Poul-Henning Kamp - -2000-01-02 Harlan Stenn - - * configure.in (ac_refclock_chu): Provide the CHU driver by - default, and by default prefer the AUDIO version. We used to - limit this to SunOS or Solaris; now we drive by the availability - of the audioio header file. - Select the IRIG and WWV audio drivers the same way. - - * flock-build: build ignores the -l flag; lose it. - (BUILD_ARGS): added. - * build: Remove unused -l stuff (LOG variable). - - * ntpd/ntp_refclock.c: HAVE_PPSAPI header cleanup - From: Reg Clemens - -2000-01-01 Harlan Stenn - - * configure.in (CLOCK_WWV): Require or - -1999-12-29 Harlan Stenn - - * configure.in: 4.0.98i - - * ntpd/refclock_gpsvme.c: Fixes - From: Michael Barone - Patch severely hacked by HMS to "make it conform". I hope I - didn't break anything. - - * scripts/ntpsweep: Nifty utility - From: Hans.Lambermont@nl.origin-it.com - - * ntpd/refclock_fg.c: - * ntpd/refclock_conf.c: - * ntpd/ntp_control.c: - * ntpd/Makefile.am: - * libntp/clocktypes.c: - * include/ntp.h: - * html/refclock.htm: - * html/driver37.htm: - * configure.in: - * acconfig.h: - Forum Graphic GPS clock support - From: Dmitry Smirnov - - * configure.in: Default to compile the IRIG, CHU and WWV/H - drivers and compile the CHU driver for audio, not modem. - Requested by Dave Mills. - - * html/audio.htm: - * html/driver36.htm: - * html/qth.htm: - Dave wrote these to go along with the changes I checked in yesterday. - -1999-12-28 Harlan Stenn - - * ntpd/refclock_wwv.c: - * ntpd/refclock_conf.c: - * ntpd/refclock_chu.c: - * ntpd/ntp_refclock.c: - * ntpd/ntp_loopfilter.c: - * html/refclock.htm: - * html/pps.htm: - * html/index.htm: - * html/driver7.htm: - * html/driver6.htm: - * html/copyright.htm: - - I indulged an old agenda to polish up some programs originally - written for a DSP evaluation board. The result is a really hot - audio driver for the NIST WWV/WWVH time/frequency station plus a - makeover for the CHU audio driver. Currently, they and their IRIG - audio driver buddy use the SunOS/Solaris audio interface, which is - clean and simple. I hook the line in jack to a shortwave radio and - these drivers (driver 7 for CHU and driver 36 for WWV) and the - drivers do the rest. The WWV/H driver is really hot - I am - currently watching the ionosphere move from the doppler that shows - up on the tick modulation tracked by the program. During midday - when the F2 layer settles down, the program closes in on a few - tens of microseconds of spare jitter and wander. This watch on - whichever 15/20 MHz signal sounds the best. At night on 5/10 MHz - and even 2.5 HMz where the multipath, interference and noise are - much worse, the driver bangs around somewhat more. - - The CHU driver makeover discovered a few broken bones after all - these years, but its majority decoder is back in business. For - various reasons to icky to reveal here, its 103-modem demodulator - is not quite as good as the chip, but it comes close and hey, - 2025/2125 FSK is just not a good idea for HF radio. This driver is - not nearly as sophisitcated as the WWV/H driver, but here a few - hundred miles south of Ottawa, it does a passably good job. - - I tell you this in the hopes of getting somebody interested in - porting the audio interface to other machines, in particular - Linux, FreeBSD and anything else with a sound card. When the - ionosphere stays cool, the WWV/H driver is as good as anything - else around here and with much less jitter than a serial port. The - only downside is all the audio drivers chew up a modest fraction - of cycles for the DSP routines - a few percent on the newer - silicon, up to half the cycles on an old Sparc IPC. Whattheheck, - these old machines aren't doing anything else around here except - serving time, and even when sucking cycles for DSP they still mind - the PPS microseconds. - - The audio driver documentation had a makeover, too. - From: Dave Mills - -1999-12-20 Harlan Stenn - - * configure.in: 4.0.98h - -1999-12-19 Harlan Stenn - - * libntp/syssignal.c: Small cleanup to Marc's patch. - - * ntpd/ntp_refclock.c: - * ntpd/refclock_atom.c: Header cleanup - * html/driver30.htm: Cleanup and improvements. - From: Reg Clemens - - * ntpd/ntp_refclock.c: - * ntpd/refclock_jupiter.c: - * ntpd/refclock_msfees.c: - * ntpd/refclock_mx4200.c: - Portability (Solaris) patches - * ntpd/refclock_mx4200.c: - Self-survey improvements, cleanup for, PPS re-activation - * libntp/syssignal.c: - Fix for "interrupted system call" (EINTR) failure of the PPS - ioctl(TIOCGPPSEV) call in Solaris. Not sure why it was - interrupted, but this works around the failure. Not sure if - the (now silent) interrupt affects the timing accuracy. - THERE IS A CHANCE THIS PART OF THE PATCH MAY ADVERSELY - AFFECT OTHER SYSTEMS! - * scripts/ntp-status: Added. - From: Marc.Brett@westgeo.com - - * ntpdate/ntpdate.c: Deal with multiple addresses. - From: Jeffrey C Honig - - * ntpd/refclock_conf.c: Replaced macro SHM with CLOCK_SHM. - * ntpd/refclock_shm.c (shm_poll): Take clock time in UTC. - pp->day starts at 1, t->tm_yday starts at 0. - From: Jakob Stoklund Olesen + kernel/sys/i8253.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-16 Harlan Stenn + kernel/sys/clkdefs.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * NEWS: Updated ONCORE instructions - From: Kamal A Mostafa + kernel/sys/chudefs.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-13 Harlan Stenn + kernel/sys/bsd_audioirig.h + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98g + kernel/sys/README + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c: Cleanup and fixes - From: Reg Clemens and Kamal A Mostafa - -1999-12-11 Harlan Stenn + kernel/sys/Makefile.am + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Cleanup/checkin of the current state of affairs. - From: Dave Mills + kernel/Makefile.am + 1.2 01/10/08 21:18:08 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c: #elif conversion. I can only hope I did - it right. + kernel/clkinit.c + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c: Various patches - From: Reg Clemens and Kamal A Mostafa + kernel/chuinit.c + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-09 Harlan Stenn + kernel/README + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (default_get_precision): Use the right arg type - to pass "sizeof freq" to sysctlbyname(). - From: Ollivier Robert + include/README + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Cleanup and fixes. - From: Dave Mills + include/ntp_request.h + 1.11 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-08 Harlan Stenn + include/trimble.h + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwv.c: Cleanup and fixes - * ntpd/refclock_conf.c: WWV declaration cleanup. - From: Dave Mills + include/recvbuff.h + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-07 Harlan Stenn + include/parse_conf.h + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/clk_rawdcf.c (cvt_rawdcf): Buglet. - From: Frank Kardel + include/parse.h + 1.4 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-06 Harlan Stenn + include/ntp_select.h + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/Makefile.am (ntpd_SOURCES): Added refclock_wwv.c + include/ntp_unixtime.h + 1.3 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_wwvb.c: - * ntpd/refclock_wwv.c: - * ntpd/refclock_conf.c: - * ntpd/refclock_chu.c: - * libntp/clocktypes.c: - * include/ntp.h: Dave cleaned some things up - Dave cleaned some things up (WWVB -> SPECTRACOM, CHU -> CHU_AUDIO, - WWV_AUDIO) + include/ntp_types.h + 1.4 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * acconfig.h: REFCLOCK_WWVB -> REFCLOCK_SPECTRACOM, added REFCLOCK_WWV - * configure.in: Deal with it. + include/ntp_stdlib.h + 1.11 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-05 Harlan Stenn + include/ntp_syslog.h + 1.3 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_refclock.c (refclock_open): More PPS cleanup - From: Dave Mills + include/ntp_syscall.h + 1.5 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpq/ntpq.c: - * ntpq/ntpq_ops.c: - Make `ntpq -pn' independent of DNS, ad advertised. - From: Kamal A Mostafa + include/ntp_string.h + 1.2 01/10/08 21:18:07 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_mx4200.c (mx4200_start): make missing 3rd - parameter a 0. - -1999-12-04 Harlan Stenn - - * ntpd/ntp_refclock.c (refclock_open): "flags" processing cleanup - (refclock_open): PPS device initialization cleanup - * include/ntp_refclock.h (LDISC_CHU): - (LDISC_PPS): Clean up comments - From: Dave Mills - -1999-12-03 Sven Dietrich - - * libntp/mexit.c: Moved WINNT port specific file to ports/winnt/libntp - * ports/winnt/libntp/libntp.dsp: Fix WinNT makefile for new source loc. - -1999-12-03 Harlan Stenn + include/ntp_io.h + 1.3 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/Makefile.am (libntp_a_SOURCES): Lose mexit.c - Sven will - move it to the winnt port area. + include/ntp_config.h + 1.12 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-03 Sven Dietrich + include/ntp_tty.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/systime.c: Removed adjtime hack for WINNT - * ports/winnt/ntpd/nt_clockstuff.c: Winnt double precision adjtime - * ports/winnt/inlcude/clockstuff.h: Remove no longer needed externs + include/ntp.h + 1.49 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-12-02 Harlan Stenn + include/ntp_calendar.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/Makefile.in: Manually hacked to remove the - libparse_kernel.a.[co] cruft + include/ntp_cmdargs.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/Makefile.am (k*.o): Generate these form the Makefile, - not from separate .c files + include/ntp_refclock.h + 1.10 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/tickadj.htm: - * html/notes.htm: - * html/hints/solaris.html: - Point to the new dosynctodr report. - - * html/hints/solaris.xtra.S99ntpd: - Update. Should be rewritten to take advantage of the new -g - switch and perhaps a loop to wait until ntpd hits a reasonable - "state". - - * html/hints/solaris-dosynctodr.html: New information - From: "John W. Sopko Jr." - -1999-12-01 Harlan Stenn - - * libntp/authkeys.c (auth_moremem): Clear memory allocated for sk. - From: Hugo Mildenberger - -1999-12-01 Sven Dietrich - - * libntp/recvbuff.c: Unused functions cleanup - * ntpd/ntpd.c: ProcessorAffinity, IO cleanup - * ports/winnt/instsrv/instsrv.c: Service name changed to NTP - - NT port shouldn;t hop between CPUs. Set affinity to first processor. - Service name was NetworkTimeProtocol. Too long. Now NTP. - -1999-12-01 Harlan Stenn - - * scripts/plot_summary.pl: Improved option parsing. Fixed one - minor Perl compatibility error. - * scripts/summary.pl: Official revision for NTPv4: Parse new - statistic file formats correctly, provide error checking for bad - input files, and guard against negative arguments to sqrt() - because of numeric effects. Use one pattern to select valid - statistic files. Add selectable output directory - (``--output-directory'') and improved option parsing. Directory - with statistic files (now settable also with - ``--input-directory'') defaults to ``/var/log/ntp''. - From: Ulrich Windl - - * html/driver8.htm: - * libparse/clk_computime.c: - * libparse/clk_dcf7000.c: - * libparse/clk_hopf6021.c: - * libparse/clk_meinberg.c: - * libparse/clk_rawdcf.c: - * libparse/clk_rcc8000.c: - * libparse/clk_schmid.c: - * libparse/clk_trimtaip.c: - * libparse/clk_trimtsip.c: - * libparse/data_mbg.c: - * libparse/kclk_computime.c: - * libparse/kclk_dcf7000.c: - * libparse/kclk_hopf6021.c: - * libparse/kclk_meinberg.c: - * libparse/kclk_rawdcf.c: - * libparse/kclk_rcc8000.c: - * libparse/kclk_schmid.c: - * libparse/kclk_trimtaip.c: - * libparse/kclk_trimtsip.c: - * libparse/kparse.c: - * libparse/kparse_conf.c: - * libparse/parse.c: - * libparse/parse_conf.c: - * libparse/parsesolaris.c: - * libparse/parsestreams.c: - * ntpd/refclock_parse.c: - Mods and updates - From: Frank Kardel - - * acconfig.h: PCF refclock - * configure.in: - * html/driver35.htm: - * html/refclock.htm: - * include/ntp.h: - * libntp/clocktypes.c: - * ntpd/Makefile.am: - * ntpd/ntp_control.c: - * ntpd/refclock_conf.c: - * ntpd/refclock_pcf.c: - From: Andreas Voegele - - * acconfig.h: DECL_STIME_1 - - * configure.in (iCFLAGS): Use -std1 for alpha*-dec-osf* if we are - using "cc". - Reported by: Tom Smith - -1999-11-30 Harlan Stenn - - * include/l_stdlib.h: DECL_SYSTIME_1 --- a long * - * configure.in: Use it for DEC OSF[45] - Reported by: Tom Smith - - * ntpd/refclock_parse.c: Add missing declarations - * ntptrace/ntptrace.c: Ditto - * ntpd/ntp_proto.c: Ditto - * ntpd/refclock_palisade.c: Ditto - From: Jonathan Stone - -1999-11-18 Sven Dietrich - * Win NT port updates - * ntpd.dsp: makefile only builds supported refclocks - * config.h: cleanup, undefine unsupported clock_atom - * win32_io, clock_NMEA: foundation for future refclock support - * recvbuff, transmitbuff, IOcompletionport: streamline packet handler - * html/hints/winnt.htm: Added up-to-date html docs for WINNT - -1999-11-17 Harlan Stenn - - * html/copyright.htm: Credit Jack for his work. - - * html/pic/*: Save a *ton* of space on the pictures. - From: Jack Sasportas - -1999-11-16 Harlan Stenn - - * configure.in : changequote for osf[45] test. - Reported by: Tom Smith - - * ntp_update: Ignore stuff in any A.* directory. - -1999-11-15 Harlan Stenn - - * configure.in: Clean up header checks for sys/syssgi.h and - sys/select.h . Originally, we did not check for sys/select.h - under some versions of SCO (see xntp3-5). Somewhere in ntp4 we - dropped the SCO check and added the check for sys/syssgi.h, - exclusive of checking for sys/select.h. Marc Brett can't think of - a reason why we should not be checking for sys/select.h, so let's - look for it now. - -1999-11-13 Harlan Stenn - - * ntpdate/ntpdate.c: Add the ability for ntpdate to query a - multicast address. We use the response to the multicast address - to learn new servers which we then add to the peer list and query. - In changing this I made the list of peers a linked list. - - To be complete I should detect a broadcast address and make it - behave the same way. But that requires a scan of the interface - list which is more complicated that I want to deal with... - - Fix a bug, allowing ntpdate to compile if SLEWALWAYS and STEP_SLEW - are both defined. - - From: Jeffrey C Honig - - * ntpd/ntp_refclock.c: sys/sio.h and SCO5_CLOCK cleanup - From: Kamal A Mostafa + include/ntp_control.h + 1.14 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_loopfilter.c: Let -g do a "correct any" for the first - time adjustment. - From: Dave Mills + include/ntp_crypto.h + 1.21 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: sys/sio.h needs to be checked independently. - Reported by: Kamal A Mostafa + include/ntp_proto.h + 1.4 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-11 Harlan Stenn + include/ntp_malloc.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98f + include/ntp_machine.h + 1.9 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: DECL_PLOCK_0 and DECL_STIME_0 are for dec-osf5*, too - * ntpd/ntpd.c: DEC OSF cleanup (editorial comments by HMS) - From: Tom Smith + include/ntp_datum.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_refclock.c: MAXUNIT bugfix - From: Marc.Brett@westgeo.com + include/ntp_if.h + 1.3 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_refclock.c: - * ntpd/ntpd.c: - * ntpd/refclock_arc.c: - * ntpd/refclock_as2201.c: - * ntpd/refclock_atom.c: - * ntpdc/ntpdc.c: - * ntpq/ntpq.c: - Code cleanup. - From: Marc.Brett@westgeo.com + include/ntp_fp.h + 1.3 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_stdlib.h: - * libntp/systime.c: - * ntpd/ntp_proto.c: - Replaced the 'sco5_oldclock' variable with 'systime_10ms_ticks'. - Cleared libntp/systime.c and include/ntp_stdlib.h of references - to SCO5_CLOCK and RELIANTUNIX_CLOCK (moved to ntpd/ntp_proto.c). - From: Kamal A Mostafa + include/ntp_filegen.h + 1.2 01/10/08 21:18:06 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: alpha-dec-osf4* -> alpha*-dec-osf4*|alpha*-dec-osf5* - From: Tom Smith + include/ntpd.h + 1.28 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Look for . If TIOCDCDTIMESTAMP is - there, we have TTYCLK. - * acconfig.h: Lose old AIOCTIMESTAMP stuff - Reported by: Kamal A Mostafa + include/Makefile.am + 1.12 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-10 Harlan Stenn + include/adjtime.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c (set_process_priority): Clean up nice() and setpriority() + include/l_stdlib.h + 1.8 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-09 Harlan Stenn + include/mbg_gps166.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (EXTRA_DIST): Added README.cvs - Reported by: Kamal A Mostafa + include/ascii.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-08 Harlan Stenn + include/iosignal.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98e + include/audio.h + 1.3 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-07 Harlan Stenn + include/ntif.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Lose AIOCTIMESTAMP tests + include/mx4200.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c: lose select() EINTR debug warning - * ntpd/ntp_refclock.c: AIOCTIMESTAMP -> TIOCDCDTIMESTAMP. Watch - CLK_SETSTR. - * ntpd/refclock_atom.c: fdpps is only there for PPS or PPSAPI. - AIOCTIMESTAMP is gone now. - From: Kamal A Mostafa + include/md5.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (HAVE_MLOCKALL): Deal with dec-osf5 realities - * ntpd/refclock_ulink.c (ulink_poll): Fix cast. - * libntp/machines.c (ntp_set_tod): Use a long* for the argument to - stime(). - Reported by: Tom Smith + include/ieee754io.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c (set_process_priority): Use whatever we have until - something works. + include/icom.h + 1.4 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_loopfilter.c: Keep clock_frequency changes in a temp - variable so we can record it to loopstats (near as HMS can tell). - From: Dave Mills + include/hopf6039.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-06 Harlan Stenn + include/gps.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * acconfig.h: RELIANTUNIX_CLOCK - * configure.in (ac_cv_var_tickadj): RELIANTUNIX_CLOCK - * libntp/systime.c (adj_systime): Reliant patches - From: Andrej Borsenkow + include/global.h + 1.3 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-05 Harlan Stenn + include/binio.h + 1.2 01/10/08 21:18:05 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c (parse_start): ASYNC_PPS_CD_NEG cleanup - * configure.in (ac_cv_make_ntptime): OK on Linux - From: + clockstuff/clktest.c + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: NetBSD has PPSAPI now - F_SETOWN is needed for NetBSD - From: Jonathan Stone + conf/dewey.conf + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-02 Harlan Stenn + conf/beauregard.conf + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98d + clockstuff/propdelay.c + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c: Cleanup/fixes - From: John Hay + conf/README + 1.4 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c: Lose #include "ntp_select.h" - * ntpd/ntpd.c: Lose #include "ntp_select.h" - * ntpd/ntp_io.c: Lose #include "ntp_select.h" - * ntpd/ntp_intres.c: Lose #include "ntp_select.h" - * libntp/iosignal.c: Lose #include "ntp_select.h" - * include/ntpd.h: #include "ntp_select.h" for declaration of activefds - Reported by: Christian Krackowizer + clockstuff/README + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-11-01 Harlan Stenn + clockstuff/Makefile.am + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.98c + clockstuff/chutest.c + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libntp/syssignal.c: Don't warn about SA_RESTART - * libntp/recvbuff.c: Fix free buffer count - From: Jeffrey C Honig + conf/baldwin.conf + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/pps.htm: - * html/howto.htm: - * html/confopt.htm: - * html/clockopt.htm: - * html/uthopt.htm: - Updates. - From: Dave Mills - - * ntpd/refclock_wwvb.c: burst fixes - * ntpd/refclock_ulink.c: burst fixes - * ntpd/refclock_tpro.c: burst and NSTAGE fixes - * ntpd/refclock_pst.c: burst fixes - * ntpd/refclock_irig.c: SAMPLE -> SAMPLES - * ntpd/refclock_heath.c: burst fixes - * ntpd/refclock_dumbclock.c: burst fixes - * ntpd/refclock_chronolog.c: burst fixes - * ntpd/refclock_bancomm.c: burst fixes - * ntpd/refclock_atom.c: burst fixes - * ntpd/refclock_as2201.c: burst fixes - * ntpd/ntp_refclock.c: PPSAPI, code, and comment cleanup/fixes - * ntpd/ntp_proto.c: Broadcast/restrict cleanup - * ntpd/ntp_loopfilter.c: Cleanup and fixes - * libntp/gpstolfp.c: Lose the UL qualifiers - old compilers hate them - From: Dave Mills - -1999-10-31 Harlan Stenn - - * configure.in: TIOCSPPS cleanup - -1999-10-20 Harlan Stenn - - * configure.in: 4.0.98b - - * ntpd/refclock_atom.c: AIOCTIMESTAMP patch - * ntpd/ntpd.c: SCO clock patch - * ntpd/ntp_request.c: noselect patch - * ntpd/ntp_refclock.c: AIOCTIMESTAMP patch - * ntpd/ntp_proto.c: noselect patch - * ntpd/ntp_intres.c: noselect patch - * ntpd/ntp_config.c: noselect patch - * include/ntp_request.h: noselect patch - * include/ntp.h: noselect patch - From: Kamal A Mostafa - - * configure.in: - * acconfig.h: TTYCLK_AIOCTIMESTAMP - Stuff for Kamal - - * ntpd/refclock_atom.c (atom_pps): make "result" initialization - uglier, but more bulletproof. - - * configure.in (sys/timepps.h): Fixed. - From: John Hay - -1999-10-19 Harlan Stenn - - * ntpd/refclock_oncore.c: Rename instance.state to instance.o_state - - * refclock_oncore.c: - * refclock_mx4200.c: - * refclock_chu.c: - * refclock_atom.c: - * ntp_refclock.c: - * ntp_peer.c: - * ntp_loopfilter.c: - * include/ntp_refclock.h: - Various cleanup and fixes - From: Dave Mills - -1999-10-17 Harlan Stenn - - * ntpd/ntp_config.c (CONFIG_FILE): NT changes - From: Sven Dietrich - -1999-10-16 Harlan Stenn - - * configure.in: sys/timepps.h verification changes - - * ntpd/refclock_atom.c (atom_poll): PPS cleanup - From: Dave Mills - (atom_pps): Portability patch - From: John Hay - - - * libntp/msyslog.c: - * libntp/gpstolfp.c: - Lint cleanup - From: Jonathan Stone - - * parseutil/dcfd.c: abs() -> l_abs(), time.h (AIX 4.3.2 patches) - From: Dana Kaempen - - * ntpd/refclock_oncore.c: - * ntpd/refclock_atom.c: - * ntpd/ntp_refclock.c: - PPS cleanup - From: John.Hay@mikom.csir.co.za - - * util/ntptime.c: - * ntpdate/ntptimeset.c: - * ntpdate/ntpdate.c: - * ntpd/refclock_trak.c: - * ntpd/refclock_oncore.c: - * ntpd/refclock_mx4200.c: - * ntpd/refclock_msfees.c: - * ntpd/refclock_atom.c: - * ntpd/ntp_control.c: - * ntpd/ntp_config.c: - * configure.in: - * configure: - PPS, Solaris 7, cleanup patches - From: Marc.Brett@westgeo.com - - * ports/winnt/ntptrace/ntptrace.dsp: - * ports/winnt/ntpq/ntpq.dsp: - * ports/winnt/ntpdc/ntpdc.dsp: - * ports/winnt/ntpdate/ntpdate.dsp: - * ports/winnt/ntpd/refclock_trimbledc.c: - * ports/winnt/ntpd/ntpd.dsp: - * ports/winnt/ntpd/ntp_iocompletionport.c: - * ports/winnt/ntpd/nt_clockstuff.c: - * ports/winnt/libntp/util_clockstuff.c: - * ports/winnt/libntp/libntp.dsp: - * ports/winnt/libntp/SetSystemTime.c: - * ports/winnt/instsrv/instsrv.c: - * ports/winnt/include/sys/ioctl.h: - * ports/winnt/include/termios.h: - * ports/winnt/include/config.h: - * ports/winnt/include/clockstuff.h: - * ports/winnt/ntp.dsw: - * ntpd/refclock_shm.c: - * ntpd/refclock_palisade.c: - * ntpd/ntpd.c: - * ntpd/ntp_timer.c: - * ntpd/ntp_refclock.c: - * libntp/systime.c: - * libntp/machines.c: - NT patches - From: Sven Dietrich - -1999-10-15 Harlan Stenn - - * ntpd/refclock_wwvb.c: - * ntpd/refclock_usno.c: - * ntpd/refclock_ulink.c: - * ntpd/refclock_tpro.c: - * ntpd/refclock_pst.c: - * ntpd/refclock_parse.c: - * ntpd/refclock_palisade.c: - * ntpd/refclock_oncore.c: - * ntpd/refclock_mx4200.c: - * ntpd/refclock_msfees.c: - * ntpd/refclock_jupiter.c: - * ntpd/refclock_irig.c: - * ntpd/refclock_heath.c: - * ntpd/refclock_chu.c: - * ntpd/refclock_atom.c: - * ntpd/refclock_as2201.c: - * ntpd/refclock_arc.c: - * ntpd/refclock_arbiter.c: - * ntpd/refclock_acts.c: - * ntpd/ntp_refclock.c: - * include/ntp_refclock.h: - Bunches of fixes. - From: Dave Mills - -1999-10-10 Harlan Stenn - - * html/driver16.htm: New version - * ntpd/refclock_bancomm.c: New version - From: "Cliff, Gary" - "Ramasivan, Ganesh" - - * ntpd/refclock_ulink.c (ulink_receive): Cleanup - (ulink_poll): Cleanup - * ntpd/refclock_atom.c (atom_pps): SunOS timespec/timeval cleanup - From: Marc.Brett@westgeo.com - - * INSTALL: Point NT folks at ports/winnt - Reported by: Stephen Gildea - - * include/ntp_stdlib.h: Noise abatement - * include/ntpd.h: Noise abatement - Reported by: "W. David Higgins" - - * configure.in: DECL_STDIO_0 with gcc under solaris. - - * include/l_stdlib.h: DECL_TOUPPER_0 - DECL_STRERROR_0 - - * configure.in: Fix a bunch of implicit declarations for SunOS - - * html/release.htm: cleanup - we still provide MD5. - Reported by: Winslowe Lacesso - -1999-10-09 Harlan Stenn - - * ntpd/refclock_oncore.c: - * ntpd/refclock_atom.c: - * ntpd/ntp_refclock.c: - PPS API code updated to the current spec - From: Dave Mills - - * configure.in (ac_cv_make_tickadj): Don't make tickadj starting - with solaris2.5 - Requested by: Dave Mills - -1999-10-04 Harlan Stenn - - * configure.in: We might need -lsocket for the -lnsl check. - -1999-09-19 Harlan Stenn - - * ntpd/refclock_ulink.c: Typos in C++ comment - Reported by: Thomas.Tornblom@Sun.SE - - * configure.in: 4.0.98a - - * ntpd/ntp_config.c (getconfig): Fix typo. - From: "David E. Myers" - From: David Godfrey - From: Geoffrey Sisson - -1999-09-17 Harlan Stenn - - * configure.in: 4.0.98 - - NetInfo support: - - * config.guess - * config.sub - Add Mac OS (versions 10 and up). - - * acconfig.h - * config.h.in - * configure.in - Check for NetInfo API; add HAVE_NETINFO macro and friends. - - * include/ntp.h - * ntpd/ntp_config.c - * ntpdate/ntpdate.c - Add support for reading configuration from NetInfo. - - * ntpd/ntp_config.c - Get rid of unnecessary eol variable in tokenizer. - - * html/notes.htm - * html/ntpd.htm - * html/ntpdate.htm - Document NetInfo functionality. - - * util/tickadj.c - Use HAVE_KVM_OPEN conditional around kvm.h include. - - From: Wilfredo Sanchez - -1999-09-15 Harlan Stenn - - * acconfig.h: - * config.h.in: - * configure.in: - * html/driver34.htm: - * html/refclock.htm: - * include/ntp.h: - * libntp/clocktypes.c: - * ntpd/Makefile.am: - * ntpd/ntp_control.c: - * ntpd/refclock_conf.c: - * ntpd/refclock_ulink.c: - Ultralink driver - From: Dave Strout + conf/grundoon.conf + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-09-14 Harlan Stenn + conf/malarky.conf + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: ReliantUNIX patches - From: Andrej Borsenkow + conf/pogo.conf + 1.3 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_atom.c: PPS cleanup - * ntpd/ntp_refclock.c (refclock_ioctl): PPS cleanup - From: Dave Mills + conf/rackety.conf + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntptrace/ntptrace.c (ReceiveBuf): addserver() can return NIL. - Reported by: "Alan J. Wylie" + html/hints/mpeix + 1.2 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 - * libntp/ieee754io.c: - * ntpd/ntp_proto.c: - * ntpd/ntp_refclock.c: - Lint cleanup. - From: Marc.Brett@westgeo.com + html/hints/winnt.htm + 1.8 01/10/08 21:18:04 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-09-12 Harlan Stenn + html/hints/solaris-dosynctodr.html + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_refclock.c (refclock_ioctl): Declaration cleanup. + html/hints/solaris.html + 1.4 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (init_proto): msyslog kern_enable at LOG_DEBUG. + html/hints/solaris.xtra.4023118 + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_atom.c: Add missing declaration. + html/hints/sco.htm + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-09-11 Harlan Stenn + html/hints/solaris.xtra.S99ntpd + 1.3 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_cv_make_ntptime): Just look for struct - ntptimeval, not timespec or nsec (Solaris 2.7 should get ntptime - and it uses msec). - (ac_cv_var_oncore_ok): Reorder so it's a "normal" clock + html/hints/solaris.xtra.patchfreq + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Solaris Kernel FLL bug fixed in 106541-07 + html/hints/sun4 + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-09-02 Harlan Stenn + html/hints/svr4-dell + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.97f + html/hints/svr4_package + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntptrace/ntptrace.c: - * ntpdate/ntptimeset.c: - * ntpdate/ntptime_config.c: - * ntpdate/ntpdate.c: - * util/ntptime.c: - * parseutil/dcfd.c: - * libparse/parsestreams.c: - * libparse/parse_conf.c: - * libparse/parse.c: - * libparse/clk_varitext.c: - * libparse/clk_trimtsip.c: - * libparse/clk_trimtaip.c: - * libparse/clk_schmid.c: - * libparse/clk_rcc8000.c: - * libparse/clk_rawdcf.c: - * libparse/clk_meinberg.c: - * libparse/clk_hopf6021.c: - * libparse/clk_dcf7000.c: - * libparse/clk_computime.c: - * libntp/msyslog.c: - * libntp/iosignal.c: - * libntp/syssignal.c: - * adjtimed/adjtimed.c: - * ntpd/refclock_shm.c: - * ntpd/refclock_parse.c: - * ntpd/refclock_palisade.c: - * ntpd/refclock_mx4200.c: - * ntpd/refclock_jupiter.c: - * ntpd/refclock_datum.c: - * ntpd/ntpd.c: - * ntpd/ntp_util.c: - * ntpd/ntp_timer.c: - * ntpd/ntp_request.c: - * ntpd/ntp_refclock.c: - * ntpd/ntp_monitor.c: - * ntpd/ntp_loopfilter.c: - * ntpd/ntp_io.c: - * ntpd/ntp_intres.c: - * ntpd/ntp_filegen.c: - * include/l_stdlib.h: - and errno declaration cleanup. - - * ntpd/map_vme.c: cleanup some spacing. - -1999-09-01 Harlan Stenn - - * configure.in: 4.0.97e - - * configure.in (ac_cv_struct_sigaction_has_sa_sigaction): - * acconfig.h: Ditto - * parseutil/dcfd.c (main): Use it. - From: HOSAKA Eiichi - -1999-08-29 Harlan Stenn - - * configure.in: 4.0.97d - - * include/ntp_stdlib.h: Clean up previous NeXT patch. - From: Jack Bryans + html/hints/todo + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c: Permit RTS to power a DCF77. - From: Carsten Paeth + html/hints/vxworks.html + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_oncore.c (oncore_start): This makes the Oncore run - on systems without hardpps(). - From: Poul-Henning Kamp - -1999-08-28 Harlan Stenn - - * configure.in: 4.0.97c - - * configure.in (ac_cv_make_ntptime): Typo. - From: Ulrich Windl - -1999-08-26 Harlan Stenn - - * configure.in: 4.0.97b - - * libntp/iosignal.c: - * ntpd/ntp_peer.c: - * ntpd/refclock_nmea.c: - * ntpdate/ntptime_config.c: - * ntpdate/ntptimeset.c: - AIX, Irix, and SunOS lint cleanup - From: Marc.Brett@westgeo.com - -1999-08-24 Harlan Stenn - - * configure.in 4.0.97a - - * configure.in (AC_OUTPUT): added scripts/Makefile - * Makefile.am (SUBDIRS): Added scripts - * scripts/Makefile.am: Added - -1999-08-23 Harlan Stenn - - * ntpd/refclock_nmea.c: Patches for: - Trimble OEM Ace-II receiver. Low cost PCB with single - voltage input, external active antenna and two serial - ports with either NMEA and ITAPs output. Programmable - to be tuned for 'time' accuracy in fixed station config. - From: Nick Hibma - -1999-08-21 Harlan Stenn - - * ntpd/ntp_config.c: Added listen_to_virtual_ips support (-L flag) - * ntpd/ntp_io.c: Ditto - -1999-08-19 Harlan Stenn - - * ntpd/ntp_intres.c (request): Lint cleanup - * ntpd/ntp_control.c (ctl_putclock): Ditto - * libntp/recvbuff.c (getrecvbufs): Ditto - (get_free_recv_buffer): Ditto - * libntp/systime.c (adj_systime): Ditto - -1999-08-18 Harlan Stenn - - * configure.in: 4.0.97 - - * libntp/systime.c: - * ntpd/ntp_loopfilter.c: - * ntpd/ntpd.c: - * ports/winnt/libntp/nt_clockstuff.c: - From: Sven Dietrich + html/hints/vxworks.htm + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * README.cvs: Updated. + html/hints/solaris.xtra.4095849 + 1.2 01/10/08 21:18:03 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: - * include/ntp_machine.h: - * libntp/mexit.c: - * ntpd/ntp_config.c: - * ntpd/ntp_peer.c: - * ntpd/ntp_restrict.c: - * ntpd/refclock_arc.c: - * ntpdate/ntpdate.c: - Irix, SunOS, AIX, lint patches - From: Marc.Brett@westgeo.com + html/hints/refclocks + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ansi2knr.c: New release (fix for bug reported by Marc Brett) - From: "L. Peter Deutsch" + html/hints/sgi + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_stdlib.h: NeXT portability patch - From: Jack Bryans + html/hints/bsdi + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: - * dot.emacs: (cleanup) - * ntpdate/Makefile.am: - * ntpdate/ntpdate.h: - * ntpdate/ntptime_config.c: - * ntpdate/ntptimeset.c: - ntptimeset patches. - From: Jeffrey Hutzelman + html/hints/changes + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c (local_input): ts.l_ui -> ts.fp.l_ui + html/hints/decosf1 + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-08-11 Harlan Stenn + html/hints/decosf2 + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.96p1 + html/hints/freebsd + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c (sys/resource.h): Include this file only #if - HAVE_SYS_RESOURCE_H. - (set_process_priority): Use TIOCNOTTY only if it is #define'd. - * ntpd/refclock_parse.c (STREAM): STREAM does not imply HAVE_TERMIOS. - (termios.h, termio.h, fcntl.h): Do not include those files here; - they are already included by ntp_refclock.h or ntp_io.h. - * ntpd/refclock_leitch.c (sgtty.h, termios.h, termio.h): Do not - include those files here; they are already included by ntp_refclock.h. - * ntpdate/ntpdate.c (sys/resource.h) : Include that file only #if - HAVE_RESOURCE_H. - From: Philippe De Muyter + html/hints/hpux + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntptrace/ntptrace.c (input_handler): Make it a "normal" function - definition. - Reported by: GIANNI_CATANIA@hp-italy-om6.om.hp.com + html/hints/linux + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: pc-cygwin32 -> pc-cygwin* because of a change in - B20. - From: Stephen Gildea + html/hints/notes-xntp-v3 + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-08-09 Harlan Stenn + html/hints/parse + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.96 + html/hints/rs6000 + 1.2 01/10/08 21:18:02 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * parseutil/dcfd.c (main): Replace SA_ONSTACK and SV_ONSTACK with - HAVE_SIGACTION and HAVE_SIGVEC, respectively. HP-UX provides both - of the former but only one of the latter... + html/tickadj.htm + 1.6 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-08-08 Harlan Stenn + html/quick.htm + 1.5 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Better tests for -lnsl and -lsocket - From: Albert Chin-A-Young + html/hints/a-ux + 1.2 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - Works for me - handle openlog() and -lgen the same way. - - * Makefile.am (EXTRA_DIST): Add in the y2k notes - - * parseutil/dcfd.c: Renamed drift_comp to accum_drift + html/rdebug.htm + 1.5 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Added MAKE_CHECK_Y2K support; check_y2k needs libparse. - * ntpd/Makefile.am (check_PROGRAMS): Use MAKE_CHECK_Y2K - * ntpd/Makefile.am (check-local): Added. - * parseutil/Makefile.am (check-local): Added. + html/Oncore-SHMEM.htm + 1.3 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp.h: Y2KFixes - * libparse/parse.c: Ditto - * ntpd/Makefile.am (check_PROGRAMS): Ditto - * ntpd/refclock_acts.c: Ditto - * ntpd/refclock_arc.c (arc_receive): Ditto - * ntpd/refclock_heath.c: Ditto - * ntpd/refclock_hpgps.c: Ditto - * parseutil/Makefile.am (check-local): Ditto - * parseutil/dcfd.c (check_y2k): Ditto - * NOTES.y2kfixes: Ditto - * readme.y2kfixes: Ditto - * results.y2kfixes: Ditto - * ntpd/check_y2k.c: Ditto - From: y2k@y2k.labs.att.com + html/ntptime.htm + 1.7 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-08-07 Harlan Stenn + html/ntptrace.htm + 1.5 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Look for sys/ppstime.h. + html/parsedata.htm + 1.3 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-31 Harlan Stenn + html/parsenew.htm + 1.2 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_io.c (create_sockets): Typo. - From: Doug Wells + html/patches.htm + 1.5 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-29 Harlan Stenn + html/porting.htm + 1.4 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_cv_struct_ntptimeval): Explicitly look for - struct ntptimeval. - (ac_cv_var_kernel_pll): Require struct ntptimeval. - Linux. Grrr. - Reported by: Ronald Kuetemeier + html/hints/aix + 1.2 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-27 Harlan Stenn + html/qth.htm + 1.3 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.95 - - * ports/winnt: New release - From: Sven Dietrich - -1999-07-26 Harlan Stenn - - * libntp/machines.c (ntp_set_tod): Bugfix - From: Andrej Borsenkow - -1999-07-25 Harlan Stenn - - * configure.in: 4.0.94b - - * acconfig.h: - * configure.in: - * libparse/Makefile.am: - * libparse/parse_conf.c: - * libparse/clk_varitext.c: - * libparse/kclk_varitext.c: - * ntpd/refclock_parse.c: VARITEXT parse clock - * ntpdate/ntpdate.c: bugfix - From: Tony McConnell - -1999-07-24 Harlan Stenn - - * include/ntp_syscall.h (ntp_gettime): Make it static - * configure.in: Added AC_C_INLINE - Reported by: "Charles C. Fu" - -1999-07-23 Harlan Stenn - - * include/ntpd.h: - * libntp/machines.c: - * libntp/systime.c: - * ntpd/ntp_config.c: - * ntpd/ntp_filegen.c: - * ntpd/ntp_io.c: - * ntpd/ntp_proto.c: - * ntpd/ntp_timer.c: - * ntpdate/ntpdate.c: Windows NT port cleanup - From: Sven Dietrich - -1999-07-22 Harlan Stenn - - * libntp/authkeys.c: - * libntp/ieee754io.c: - * libntp/iosignal.c: - * libntp/machines.c: - * libntp/mexit.c: - * libntp/recvbuff.c: - * ntpd/ntp_filegen.c: - * ntpd/ntp_loopfilter.c: - * ntpd/ntp_request.c: - * ntpd/ntp_timer.c: - * ntpd/ntpd.c: Compile/lint cleanup - From: Allen Smith + html/release.htm + 1.14 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-21 Harlan Stenn - - * configure.in: 4.0.94a - - * configure.in (ac_cv_make_ntptime): Add tv_nsec check. + html/refclock.htm + 1.15 01/10/08 21:18:01 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): Forgot ntp_syscall.h - From: John.Hay@mikom.csir.co.za + html/ntpq.htm + 1.7 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: 4.0.94 + html/prefer.htm + 1.5 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (SUBDIRS): librsaref - (dist-hook): Lose CVS subdirs in the distribution tarball + html/mx4200data.htm + 1.5 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): Added iosignal.h, recvbuff.h + html/ntpdc.htm + 1.6 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (dist-hook): Don't call dos2unix anymore + html/notes.htm + 1.6 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-20 Harlan Stenn + html/pps.htm + 1.9 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * acconfig.h: - * util/ntptime.c: FreeBSD nano patches - From: Per Hedeland and - Allen Smith + html/ntpdate.htm + 1.6 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp.h: - include/ntp_fp.h: - include/ntp_io.h: - include/ntp_machine.h: - include/ntp_refclock.h: - include/ntp_stdlib.h: - include/ntpd.h: - libntp/Makefile.am: - libntp/emalloc.c: - libntp/machines.c: - libntp/mexit.c: - libntp/msyslog.c: - libntp/statestr.c: - libntp/syssignal.c: - libntp/systime.c: - libparse/parse.c: - libparse/parse_conf.c: - ntpd/ntp_control.c: - ntpd/ntp_intres.c: - ntpd/ntp_io.c: - ntpd/ntp_proto.c: - ntpd/ntp_refclock.c: - ntpd/ntp_request.c: - ntpd/ntp_timer.c: - ntpd/ntp_util.c: - ntpd/ntpd.c: - ntpd/refclock_nmea.c: - ntpd/refclock_palisade.c: - ntpd/refclock_palisade.h: - ntpd/refclock_shm.c: - ntpdate/ntpdate.c: - ntptrace/ntptrace.c: Cleanup - * libntp/recvbuff.c: - libntp/iosignal.c: - include/iosignal.h: - include/recvbuff.h: Added - From: Sven_Dietrich@Trimble.COM + html/ntpd.htm + 1.14 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * README: Add README.cvs + html/measure.htm + 1.4 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (ac_cv_var_struct_ntptime_val_timespec): Typo. - From: John Hay + html/miscopt.htm + 1.12 01/10/08 21:18:00 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-19 Harlan Stenn + html/leap.htm + 1.2 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (EXTRA_DIST): Lose ntpmak; "build" does a better job. + html/ldisc.htm + 1.3 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpq/Makefile.am (version.o): Use mkver - * ntptrace/Makefile.am (version.o): Ditto - * ntpdate/Makefile.am (version.o): Ditto - * ntpd/Makefile.am (version.o): Ditto - * ntpdc/Makefile.am (version.o): Ditto - - * configure.in (AC_OUTPUT): scripts/mkver + html/kernpps.htm + 1.4 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * scripts/mkver.in: Created. Note RSAREF in the version string + html/hints.htm + 1.4 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-18 Harlan Stenn + html/kern.htm + 1.6 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * README.des: Updated. + html/gadget.htm + 1.4 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpq/Makefile.am (LDADD): Add LIBRSAREF + html/extern.htm + 1.5 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdc/Makefile.am (LDADD): Add LIBRSAREF + html/index.htm + 1.11 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/Makefile.am (LDADD): Add LIBRSAREF + html/htmlprimer.htm + 1.2 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/Makefile.am (LDADD): Add LIBRSAREF + html/howto.htm + 1.5 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in (AC_OUTPUT): Added librsaref/Makefile - Added tests for making/using librsaref.a - Lose old DES stuff; AC_DEFINE(DES) if we find the rsaref stuff. + html/monopt.htm + 1.7 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-11 Harlan Stenn + html/genkeys.htm + 1.6 01/10/08 21:17:59 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_trak.c (trak_receive): disambiguate expression. - At least now it is unambiguous. It may even still be correct. - Reported by: Tom Smith + html/driver5.htm + 1.3 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntp_update (UPDATE_OPTIONS): Typo. + html/driver4.htm + 1.4 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-07-07 Harlan Stenn + html/driver39.htm + 1.2 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntp_update: Check out copyright.htm before COPYRIGHT + html/driver38.htm + 1.2 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_config.c: Support for PPS assert/clear/hardpps - * ntpd/ntp_refclock.c (refclock_ioctl): Ditto - (refclock_gtlin): Ditto - * html/clockopt.htm: Document. - From: John Hay + html/driver37.htm + 1.3 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * html/monopt.htm: We have four types of files now - * ntpd/refclock_oncore.c: If debug is on, tell when - we are waiting for a valid almanac - From: Poul-Henning Kamp + html/driver36.htm + 1.7 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_machine.h (HAVE_TERMIOS): STREAMS does not imply - HAVE_TERMIOS !!! - * include/parse.h (timercmp): Macro defined if needed. - * ntpd/ntp_config.c (SIGCHLD): Macro defined as SIGCLD if needed. - (sys/wait.h): File included only if HAVE_SYS_WAIT_H. - * configure.in (sys/wait.h): File added to AC_CHECK_HEADERS list. - From: Philippe De Muyter + html/driver35.htm + 1.5 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-06-23 Harlan Stenn + html/driver34.htm + 1.3 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_irig.c (irig_debug): NetBSD patches - From: Frederick Bruckman + html/driver33.htm + 1.4 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/ntptime.c (main): ntx.freq bugfix (-f option) - From: Frederick Bruckman + html/driver8.htm + 1.4 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -1999-06-22 Harlan Stenn + html/driver3.htm + 1.3 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Fix typo with DECL_H_ERRNO test + html/driver9.htm + 1.5 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_loopfilter.c: Lose syscall decl, it's handled in - l_stdlib.h now. - * ntpd/ntp_request.c: Ditto - * util/ntptime.c: Ditto + html/driver6.htm + 1.5 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Mon May 31 18:49:49 1999 Rainer Orth + html/driver7.htm + 1.10 01/10/08 21:17:58 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_proto.c (proto_config): Don't set sys_bclient on - PROTO_MULTICAST_ADD, only caller can decide; remove wrong set on - PROTO_MULTICAST_DEL. + html/driver30.htm + 1.7 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Mon May 31 18:49:49 1999 Rainer Orth + html/driver29.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c (stream_receive): Cast size_t to int to - match format. - (local_receive): Likewise. - (trimbletaip_event): Likewise. - (stream_receive): Cast struct timeval members to long to match - format. - (local_receive): Likewise. + html/driver28.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_util.c (stats_config): Cast size_t to int to match - format. + html/driver32.htm + 1.4 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * libparse/clk_rawdcf.c (cvt_rawdcf): Cast ptr difference to int - to match format. - * ntpd/refclock_parse.c (gps16x_poll): Likewise. + html/driver26.htm + 1.2 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_filegen.c (filegen_open): Use long format, cast arg to - match. + html/driver23.htm + 1.4 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_parse.c (list_err): Use long format to match arg. - (parse_statistics): Likewise. - (gps16x_message): Likewise. - (cvt_ts): Use long format, cast args to match. - (parse_start): Add missing arg. - (gps16x_message): Swap args to match format. + html/driver22.htm + 1.7 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntpd.c (ntpdmain): Cast uid to long, adapt format. + html/driver20.htm + 1.5 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_intres.c (readconf): Use long format to match arg. - * ntpd/ntp_io.c (getrecvbufs): Likewise. - * ntpd/ntp_proto.c (default_get_precision): Likewise. + html/driver2.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_loopfilter.c (local_clock): Cast clock_panic to int to - match format. + html/driver27.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/ntp_io.c (io_multicast_add): Print s_addr member, not - struct in_addr, to match format. + html/driver24.htm + 1.2 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/ntp_stdlib.h: Declare msyslog() as printf-like for gcc - format checking. + html/driver19.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Fri May 28 16:39:35 1999 Rainer Orth + html/driver18.htm + 1.3 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdc/ntpdc_ops.c (iostats): Align timereset line. + html/driver16.htm + 1.2 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpq/ntpq_ops.c (doopeers): Properly align header. + html/driver1.htm + 1.4 01/10/08 21:17:57 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdc/ntpdc_ops.c (debug): Removed declaration, already in - ntp_stdlib.h. - * ntpq/ntpq_ops.c: Likewise. + html/driver12.htm + 1.3 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdate/ntpdate.c (debug): Declare volatile to match - ntp_stdlib.h. - * ntpdc/ntpdc.c, ntpq/ntpq.c, ntptrace/ntptrace.c, util/tickadj.c, - util/ntptime.c: Likewise. + html/driver11.htm + 1.3 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/parse.h (debug): Don't declare to avoid clash with - ntp_stdlib.h. + html/driver10.htm + 1.3 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * include/Makefile.am (noinst_HEADERS): Add new ntp_syscall.h. + html/debug.htm + 1.6 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Also check for -lrt for POSIX.1c functions. + html/exec.htm + 1.7 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Wed May 26 21:03:30 1999 Rainer Orth + html/confopt.htm + 1.15 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * configure.in: Removed -Wwrite-strings from CFLAGS. + html/config.htm + 1.5 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpdc/ntpdc.c (help): Remove superfluous cast. - * ntpq/ntpq.c (help): Likewise. - -Tue May 25 18:00:49 1999 Rainer Orth - - * ntpq/ntpq_ops.c (struct varlist): name cannot be const char * - since it may be malloc'ed. - - * ntpdc/ntpdc.c (sendrequest): Declare pass as const char *, don't - loose const in cast. - * ntpq/ntpq.c (sendrequest): Likewise. - - * ntpd/ntp_control.c (ctl_getitem): Remove superfluous cast. - * include/ntpd.h (struct ctl_var): text cannot be const char * - since it's malloc'ed. - -1999-06-22 Harlan Stenn - - * include/l_stdlib.h: Don't include , add forward - declaration of struct in_addr instead. - From: Rainer Orth - - Patch: - - * include/l_stdlib.h: Fixed syscall() declaration. - * configure.in: Updated test to match. - - * configure.in: Check if we need to declare errno and h_errno. - Check for which may provide a h_errno declaration and - which the latter needs. - * acconfig.h: Provide the necessary templates. - - * include/ntp_syscall.h: New file, hides various implementations - of ntp_adjtime() and ntp_gettime() syscalls. - * ntpd/ntp_loopfilter.c: Use it. - * ntpd/ntp_request.c: Likewise. - * ntpd/refclock_local.c: Likewise. - * util/ntptime.c: Likewise. - - * include/l_stdlib.h: Include , declare inet_ntoa if - necessary. - Moved syscall() declaration here. - - * kernel/sys/parsestreams.h: Include for it's - definition of struct ppsclockev. - Include unconditionally for definition of - CIOGETEV via TIOCGPPSEV. - * kernel/sys/ppsclock.h: Protect struct ppsclockev from - redefinition. - - * include/ntp_refclock.h: Protect it from multiple inclusion. - * include/ntp_fp.h: Likewise. - * include/ntp.h: Likewise. - - * include/ntpd.h: Include ntp_refclock.h for MAXDIAL declaration. - * libntp/authkeys.c: Include ntpd.h for current_time declaration. - - * include/ntpd.h (getauthkeys, auth_agekeys, rereadkeys): Moved - prototypes to ntp_stdlib.h - - * include/ntp_stdlib.h: Declare variables exported by libntp. - * include/ntpd.h: Likewise for ntpd. - - * libntp/authkeys.c (key_hash, authnokey, authfreekeys, - cache_flags): Made static. - * libntp/systime.c (tvu_maxslew, tsf_maxslew, sys_clock_offset, - sys_residual): Likewise. - * ntpd/ntp_intres.c (confentries): Likewise. - * ntpd/ntp_loopfilter.c (clock_offset, clock_panic): Likewise. - (pll_nano): Likewise. Removed duplicate definition. - * ntpd/ntp_peer.c (peer_free, current_association_ID, - assocpeer_calls, init_peer_starttime): Likewise. - * ntpd/ntp_proto.c (sys_offset, sys_authdly): Likewise. - * ntpd/ntp_request.c (numrequests, numresppkts, errorcounter): - Likewise. - * ntpd/ntp_restrict.c (res_calls, res_found, res_not_found, - res_timereset, res_limited_refcnt): Likewise. - * ntpd/ntpd.c (was_alarmed, worker_thread): Likewise. - - * ntpq/ntpq_ops.c: Moved declaration of external variable from - ntpq.c to file scope. - - * adjtimed/adjtimed.c: Moved declarations of external variables to - ntpd.h and ntp_stdlib.h. - * clockstuff/propdelay.c: Likewise. - * libntp/a_md5encrypt.c, libntp/authencrypt.c, libntp/authkeys.c, - libntp/mfp_mul.c, libntp/msyslog.c, libntp/systime.c: Likewise. - * ntpd/ntp_config.c, ntpd/ntp_control.c, ntpd/ntp_filegen.c, - ntpd/ntp_intres.c, ntpd/ntp_io.c, ntpd/ntp_loopfilter.c, - ntpd/ntp_monitor.c, ntpd/ntp_peer.c, ntpd/ntp_proto.c, - ntpd/ntp_refclock.c, ntpd/ntp_request.c, ntpd/ntp_restrict.c, - ntpd/ntp_timer.c, ntpd/ntp_util.c, ntpd/ntpd.c, - ntpd/refclock_acts.c, ntpd/refclock_arbiter.c, ntpd/refclock_arc.c, - ntpd/refclock_as2201.c, ntpd/refclock_atom.c, - ntpd/refclock_bancomm.c, ntpd/refclock_chronolog.c, - ntpd/refclock_chu.c, ntpd/refclock_datum.c, - ntpd/refclock_dumbclock.c, ntpd/refclock_gpsvme.c, - ntpd/refclock_heath.c, ntpd/refclock_hpgps.c, ntpd/refclock_irig.c, - ntpd/refclock_jupiter.c, ntpd/refclock_leitch.c, - ntpd/refclock_local.c, ntpd/refclock_msfees.c, - ntpd/refclock_mx4200.c, ntpd/refclock_nmea.c, - ntpd/refclock_oncore.c, ntpd/refclock_palisade.h, - ntpd/refclock_parse.c, ntpd/refclock_pst.c, ntpd/refclock_shm.c, - ntpd/refclock_tpro.c, ntpd/refclock_trak.c, ntpd/refclock_true.c, - ntpd/refclock_usno.c, ntpd/refclock_wwvb.c: Likewise. - * ntpdate/ntpdate.c: Likewise. - * ntpdc/ntpdc.c, ntpdc/ntpdc_ops.c: Likewise. - * ntpq/ntpq.c: Likewise. - * ntptrace/ntptrace.c: Likewise. - * util/ntptime.c, til/tickadj.c: Likewise. - From: Rainer Orth - - * include/ntp_machine.h: Removed superfluous yy/mm/dd comments. - * include/ntpd.h: Likewise. - * libntp/authencrypt.c: Likewise. - * libntp/a_md5encrypt.c: Likewise. - * libntp/caljulian.c: Likewise. - * libntp/ymd2yd.c: Likewise. - * libntp/syssignal.c: Likewise. - * libntp/ymd2yd.c: Likewise. - * ntpd/ntp_control.c: Likewise. - * ntpd/ntp_io.c: Likewise. - * ntpd/ntp_timer.c: Likewise. - * ntpdate/ntpdate.c: Likewise. - * ntpq/ntpq_ops.c: Likewise. - * ntpd/ntp_peer.c (findpeer): Wrap debug output in DEBUG/debug. - From: Rainer Orth - - * dot.emacs: Removed wrong indentation of substatements. - Wrap in c-style. - From: Rainer Orth + html/clockopt.htm + 1.8 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_palisade.c: Patches from Marc Brett - * ntpd/refclock_palisade.h: Ditto. - * util/hist.c: Ditto. + html/build.htm + 1.7 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Tue Jun 1 00:40:04 1999 Harlan Stenn + html/copyright.htm + 1.18 01/10/08 21:17:56 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build: mips-dec-ultrix4.4 hates "set -e" + html/authopt.htm + 1.12 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * flock-build: Created + html/audio.htm + 1.6 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * build: added -l option + html/assoc.htm + 1.7 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Mon May 31 20:28:40 1999 Harlan Stenn + html/accopt.htm + 1.8 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * README: Removed auto{make,conf}.patch files + html/biblio.htm + 1.5 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Tue May 25 01:20:53 1999 Harlan Stenn + BitKeeper/triggers/00-list + 1.2 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 - * Makefile.am ($(srcdir)/COPYRIGHT): Added - (EXTRA_DIST): Remove auto*.patches + BitKeeper/triggers/post-commit.changelog + 1.5 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 -Thu May 20 01:03:00 1999 Harlan Stenn + adjtimed/Makefile.am + 1.2 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * Makefile.am (dist-hook): Call dos2unix on the .htm files + adjtimed/README + 1.3 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * ntpd/refclock_palisade.h: Clean up declarations. + BitKeeper/triggers/pre-apply.paranoid + 1.2 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 - * configure.in (ac_cv_struct_ntptimeval_timespec): Added. - (ac_cv_make_ntptime): Only if ntptimeval does not use timespec. + adjtimed/adjtimed.c + 1.4 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag - * util/tickadj.c: Linux Patches - From: Reg Clemens + librsaref/Makefile.am + 1.15 01/10/08 21:17:55 stenn@whimsy.udel.edu +0 -0 + Turn on EOLN_NATIVE flag -Wed May 19 01:18:24 1999 Harlan Stenn + BitKeeper/triggers/post-incoming.2mirrors + 1.3 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in: 4.0.93a + BitKeeper/etc/config + 1.4 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * ntpd/refclock_palisade.h: Restore some lost patches - From: Kamal A Mostafa + BitKeeper/etc/ignore + 1.7 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Sun May 16 13:18:32 1999 Philippe De Muyter + BitKeeper/etc/logging_ok + 1.2 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * libparse/clk_wharton.c (cvt_wharton_400a, inp_wharton_400a): Expect - serial output format number 1, not 5. - (clock_wharton_400a) : Likewise. - * ntpd/refclock_parse.c (parse_clockinfo): For Wharton 400a clock, - do not poll, but expect a message every second. - * html/parsedata.htm : Entry added for Wharton 400a clock. - * html/driver8.htm : Entry fixed for Wharton 400a clock. + readme.y2kfixes + 1.5 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Sun May 16 02:59:46 1999 Harlan Stenn + BitKeeper/triggers/notify + 1.2 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in: 4.0.93 + README.hackers + 1.5 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Sat May 15 18:53:47 1999 Harlan Stenn + results.y2kfixes + 1.5 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in (ntp_refclock): ONCORE requires PPSAPI, CIOGETEV, - or TIOCGPPSEV. - Reported by: Reg Clemens + NEWS + 1.35 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Fri May 14 23:58:35 1999 Harlan Stenn + WHERE-TO-START + 1.5 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in: 4.0.92h2 + NOTES.y2kfixes + 1.6 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in (ac_cv_make_ntptime): Not under Linux. Yes, it - works for some people. We're tired of the complaints from the - others. + README.cvs + 1.10 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Fri May 14 18:58:59 1999 Rainer Orth + ntp_update + 1.10 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * libntp/authreadkeys.c (authreadkeys): Reject autokey keys. - Include ntp.h for NTP_MAXKEY definition, ntp_fp.h for types used - in ntp.h. + mkinstalldirs + 1.7 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Wed May 12 23:02:22 1999 Rainer Orth + README.des + 1.10 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * libntp/authkeys.c (auth_delkeys): Don't remove autokey keys, - leave info on KEY_TRUSTED flag alone. - Include ntp.h for NTP_MAXKEY definition. + TODO + 1.6 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 -Thu May 13 02:19:02 1999 Harlan Stenn + README.rsa + 1.7 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in: 4.0.92h1 + README + 1.18 01/10/08 21:17:54 stenn@whimsy.udel.edu +0 -0 - * configure.in: patch for ReliantUNIX - From: Andrej Borsenkow + missing + 1.7 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0 - * ntpd/refclock_oncore.c: Patches - From: Reg Clemens + config.sub + 1.10 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0 -Thu Apr 29 14:01:04 1999 Rainer Orth + install-sh + 1.5 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0 - * html/*.htm: Remove unnecessary  . Cleanup 

-	sections.
+  configure.in
+    1.227 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: Properly align configure --help output.
-	* html/config.htm: Include this version, removing Netscape  
-	cruft.
+  depcomp
+    1.6 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-Wed Apr 28 15:08:55 1999  Rainer Orth  
+  dot.emacs
+    1.7 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* kernel/sys/parsestreams.h: Only include  if
-	struct ppsclockev is missing from system headers.
+  excludes
+    1.5 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* util/tickadj.c (getoffsets): Define kernels[] only if used.
-	(openfile): Rename fd to avoid shadowing global fd.
-	(writevar): Likewise.
-	(readvar): Likewise.
+  config.guess
+    1.10 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* parseutil/dcfd.c (read_drift): drift_file is const char *.
-	(update_drift): Likewise.
-	(adjust_clock): Likewise.
-	(main): Likewise.
+  flock-build
+    1.23 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_parse.c (gps16x_poll): Adapt format to match
-	parse->localstate type.
+  acconfig.h
+    1.29 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_refclock.c (refclock_gtlin): Only define gotit label
-	if used.
+  README.bk
+    1.13 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* include/l_stdlib.h (openlog, syslog): char * args are const.
+  INSTALL
+    1.7 01/10/08 21:17:53 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in (*-*-osf4*): Enable declaration of stime().
+  acinclude.m4
+    1.7 01/10/08 21:17:52 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_oncore.c (oncore_msg_any): Cast args to long to
-	match prototype.
-	(oncore_msg_En): Likewise.
+  Makefile.am
+    1.18 01/10/08 21:17:52 stenn@whimsy.udel.edu +0 -0
 
-	* include/ntp_refclock.h (struct refclockstat): Declare p_lastcode
-	as const char *.
+  build
+    1.20 01/10/08 21:17:52 stenn@whimsy.udel.edu +0 -0
 
-	* ntpq/ntpq_ops.c (struct varlist): Define name as const.
+  ChangeLog
+    1.588 01/10/08 21:17:52 stenn@whimsy.udel.edu +0 -0
 
-	* ntpdc/ntpdc.c (tokenize): Define cp as const char *, remove
-	wrong cast instead.
+  TODO
+    1.5 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_util.c (record_clock_stats): Make text arg const.
-	* include/ntpd.h (record_clock_stats): Adapt declaration.
-	* ntpd/refclock_oncore.c (oncore_start): Removed superfluous casts.
-	(oncore_msg_Cf): Likewise.
-	(oncore_msg_Fa): Likewise.
-	(oncore_msg_Cj): Likewise.
-	(oncore_msg_Ea): Likewise.
-	(oncore_msg_Bj): Likewise.
+  README
+    1.17 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in (*-*-solaris2.4): Enable declarations of
-	gettimeofday(), settimeofday(); they are `protected' by
-	__cplusplus in .
+  WHERE-TO-START
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Tue Apr 27 21:14:47 1999  Rainer Orth  
+  missing
+    1.6 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* scripts/summary.pl: Use . as default statsdir.
-	(do_loop): Accept new loopstats format with additional sys_error
-	and clock_stability fields.
-	(do_peer): Accept new peerstats format with additional skew field.
+  README.hackers
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Mon Apr 26 01:50:38 1999  Harlan Stenn  
+  README.des
+    1.9 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* Upgraded automake (1.4a) and autoconf (2.14.1)
+  mkinstalldirs
+    1.6 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in (ac_refclock_irig): We no longer need stropts.h.
-	* ntpd/refclock_irig.c: Ditto
+  README.cvs
+    1.9 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Mon Apr 26 17:33:33 1999  Rainer Orth  
+  ntp_update
+    1.9 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in (*-*-irix6*): Don't pass MIPSpro cc-only flag -n32
-	to gcc.
+  install-sh
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Thu Apr 22 15:06:40 1999  Rainer Orth  
+  README.rsa
+    1.6 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_config.c (getconfig): IN_CLASSD() expects address in
-	host byte order, but struct sockaddr_in.s_addr is in network byte
-	order.
-	* ntpd/ntp_io.c (io_multicast_del): Likewise.
+  readme.y2kfixes
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Sat Apr 24 01:00:53 1999  Harlan Stenn  
+  NOTES.y2kfixes
+    1.5 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92h
+  results.y2kfixes
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntptrace/ntptrace.c: -m maxhost patch
-	From: "R. Gary Cutbill" 
+  NEWS
+    1.34 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* util/ntptime.c: Patches.
-	From: Ulrich Windl 
+  acconfig.h
+    1.28 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* html/accopt.htm, html/assoc.htm, html/authopt.htm,
-	html/biblio.htm, html/build.htm, html/clockopt.htm,
-	html/confopt.htm, html/copyright.htm, html/debug.htm,
-	html/exec.htm, html/extern.htm, html/hints.htm, html/index.htm,
-	html/kern.htm, html/miscopt.htm, html/monopt.htm, html/notes.htm,
-	html/ntpd.htm, html/ntpdate.htm, html/ntpdc.htm, html/ntpq.htm,
-	html/ntptime.htm, html/ntptrace.htm, html/patches.htm,
-	html/porting.htm, html/pps.htm, html/rdebug.htm,
-	html/refclock.htm, html/release.htm, html/tickadj.htm,
-	html/hints/solaris.html: Fixed many typos and problems.
-	* acconfig.h (DECL_CFSETISPEED_0, DECL_MRAND48_0, DECL_NLIST_0,
-	DECL_SRAND48_0, DECL_STIME_0): New templates.
-	* include/l_stdlib.h: Include termios.h to get definition of
-	speed_t.
-	(cfsetispeed, cfsetospeed, mrand48, nlist, srand48, stime): New
-	declarations.
-	(openlog): Declare 2- or 3-argument form.
-	* configure.in: Enable declarations of functions missing from
-	Ultrix V4.3 system headers.
-	* ntpd/refclock_oncore.c: Include , Ultrix V4.3
-	 needs it for dev_t.
-	From: Rainer Orth 
+  INSTALL
+    1.6 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntpdc/ntpdc_ops.c: Reality checks.
+  configure.in
+    1.226 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: netbsd has stubs for the timer_* stuff and doesn't
-	support PPSAPI.  IRIG requires  .
-	From: Frederick Bruckman 
+  depcomp
+    1.5 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntpdc/ntpdc_ops.c: (kerninfo)  Report in seconds regardless of
-	kernel precision.  Report kernel flags as text.
-	From: Poul-Henning Kamp 
+  dot.emacs
+    1.6 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-Sun Apr 18 14:26:51 1999  Harlan Stenn  
+  excludes
+    1.4 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92g
+  flock-build
+    1.22 01/10/08 02:09:51 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_refclock.c (refclock_ioctl): We don't want
-	PPS_HARDPPSONASSERT by default.
-	* ntpd/refclock_oncore.c: Prefer timepps.h over sys/timepps.h
-	From: Poul-Henning Kamp 
+  Makefile.am
+    1.17 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-Tue Apr 13 17:32:35 1999  Harlan Stenn  
+  build
+    1.19 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92f
+  acinclude.m4
+    1.6 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_refclock.c (refclock_open): VMIN should be 1, not 0
-	From: Reg Clemens 
+  README.bk
+    1.12 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-Sun Apr 11 18:26:44 1999  Harlan Stenn  
+  config.guess
+    1.9 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_mx4200.c: Patches/improvements
-	* ntpd/ntpd.c (set_process_priority): Lint
-	From: Marc.Brett@westgeo.com
+  config.sub
+    1.9 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-	* util/ntptime.c: Lint, bit definition cleanup
-	From: Ulrich Windl 
+  ChangeLog
+    1.587 01/10/08 02:09:50 stenn@whimsy.udel.edu +0 -0
 
-Wed Apr  7 03:02:23 1999  Harlan Stenn  
+ChangeSet@1.718, 2001-10-08 02:05:47-04:00, stenn@whimsy.udel.edu
+  EOLN_NATIVE.
 
-	* ntpd/refclock_oncore.c: Use timepps.h or sys/timepps.h
-	* configure.in: Look for either timepps.h or sys/timepps.h
-	From: Poul-Henning Kamp 
+  results.y2kfixes
+    1.3 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_io.c (create_sockets): Don't warn about ENXIO.
-	(Several places)
-	From: Andrej Borsenkow 
+  NOTES.y2kfixes
+    1.4 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* libntp/mfp_mul.c (mfp_mul): Lint.
-	Marc.Brett@westgeo.com
+  readme.y2kfixes
+    1.3 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-Sun Apr  4 03:23:53 1999  Harlan Stenn  
+  README.rsa
+    1.5 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92e
-	Dave redesigned the clock state machine.
+  README
+    1.16 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-1999-02-28  Frank Kardel  
+  WHERE-TO-START
+    1.3 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* parseutil/dcfd.c: added DCF77 module powersetup
+  README.hackers
+    1.3 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_parse.c (parse_control): using gmprettydate instead of prettydate()
-	(mk_utcinfo): new function for formatting GPS derived UTC information
-	(gps16x_message): changed to use mk_utcinfo()
-	(trimbletsip_message): changed to use mk_utcinfo()
-	ignoring position information in unsynchronized mode
-	(parse_start): augument linux support for optional ASYNC_LOW_LATENCY
+  TODO
+    1.4 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_control.c (ctl_putclock): cleanup of end of buffer handling
+  README.des
+    1.8 01/10/08 01:57:14 stenn@whimsy.udel.edu +0 -0
 
-	* libparse/parse.c (timepacket): removed unnecessary code
+  mkinstalldirs
+    1.5 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* libparse/clk_trimtsip.c (struct trimble): new member t_utcknown
-	(cvt_trimtsip): fixed status monitoring, bad receiver states are
- 	now recognized
+  NEWS
+    1.33 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* libntp/prettydate.c (gmprettydate): new function for format date
- 	and time with respect to UTC
+  missing
+    1.5 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* libntp/gpstolfp.c (GPSWRAP): update GPS rollover to 990 weeks
+  ChangeLog
+    1.586 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* include/trimble.h (CMD_RUTCPARAM): control variable name unification
+  INSTALL
+    1.5 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* include/ntp_fp.h: added prototype for gmprettydate()
+  ntp_update
+    1.8 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-Sat Feb 27 00:03:16 1999  Harlan Stenn  
+  README.cvs
+    1.8 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* libntp/systime.c: definition
-	* ntpd/ntp_proto.c: sco5_oldclock declaration
-	* configure.in: SCO5_CLOCK for *-*-sco3.2v5*
-	* util/tickadj.c (main): SCO5_OLDCLOCK -> SCO5_CLOCK
-	From: Kees Hendrikse 
+  dot.emacs
+    1.5 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/ntp_config.c (getconfig): Indentation cleanup
-	Deal with 'P' case better
-	* ntpd/ntpd.c: Declare set_process_priority()
-	* ntpd/refclock_dumbclock.c: Lint cleanup
-	From: Marc.Brett@westgeo.com
+  flock-build
+    1.21 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-Wed Feb 24 10:22:51 1999  Harlan Stenn  
+  depcomp
+    1.4 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92d
+  install-sh
+    1.3 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: Dave says we can't enable PARSE clocks by default.
-	Also, Solaris 2.7 still has its kernel bug - disable kernel FLL
-	there.
-	Reported by: Dave Mills 
+  configure.in
+    1.225 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-Tue Feb 23 23:37:44 1999  Harlan Stenn  
+  README.bk
+    1.11 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* libparse/Makefile.am (parsesolaris.o): Devious hack to deal
-	with bug in sys/systm.h .
-	Suggested by: Chaim Frenkel 
+  config.sub
+    1.8 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-Tue Feb 23 20:46:31 1999  Frank Kardel  
+  excludes
+    1.3 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_parse.c: fixed #endifs
-	(stream_receive): fixed formats
+  config.guess
+    1.8 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-Mon Feb 22 00:35:06 1999  Harlan Stenn  
+  build
+    1.18 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in: 4.0.92c
+  acconfig.h
+    1.27 01/10/08 01:57:13 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_chronolog.c: Lint
-	* ntpd/refclock_dumbclock.c: Ditto
-	* ntpd/refclock_oncore.c: Ditto
-	From: Marc.Brett@westgeo.com
+  Makefile.am
+    1.16 01/10/08 01:57:12 stenn@whimsy.udel.edu +0 -0
 
-	* ntpd/refclock_oncore.c (oncore_msg_any): Call GETTIMEOFDAY, not
-	gettimeofday().
-	From: david.higgins@mail.ccur.com
+  acinclude.m4
+    1.5 01/10/08 01:57:12 stenn@whimsy.udel.edu +0 -0
 
-	* configure.in (MCAST): Not in i386-sequent-sysv4
-	Reported by: Joseph Geter 
+  results.y2kfixes
+    1.2 01/10/08 01:57:02 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* util/ntptime.c: Linux cleanup.
-	From: Reg Clemens 
+  WHERE-TO-START
+    1.2 01/10/08 01:57:02 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: Rename SCO5_OLDCLOCK to SCO5_CLOCK
-	* acconfig.h: Ditto
+  README.des
+    1.7 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_proto.c: SCO5_CLOCK stuff
-	(init_proto): Use the SCO5_CLOCK stuff
-	* libntp/systime.c: SCO5_CLOCK stuff
-	(get_systime): Use the SCO5_CLOCK stuff
-	(adj_systime): Use the SCO5_CLOCK stuff
-	From: Kees Hendrikse 
+  flock-build
+    1.20 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_config.c: Added -P option and associated baggage.
-	(getstartup): Update help text
-	(getconfig): Process -P option
-	(getconfig): Update help text
-	* ntpd/ntpd.c (set_process_priority): Created.
-	(service_main): remove process priority stuff - we want to do at
-	after we start up the resolver, so call set_process_priority()
-	after getconfig().
-	From: Kamal A Mostafa 
+  INSTALL
+    1.4 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-1999-02-21  Frank Kardel  
+  readme.y2kfixes
+    1.2 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_util.c (hourly_stats): removed unused variable
+  TODO
+    1.3 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* libntp/ieee754io.c: renamed index to fieldindex to avoid index() name clash
+  configure.in
+    1.224 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/refclock_parse.c (parse_start): add initialization for Linux PPSkit
+  README
+    1.15 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Sun Feb 21 17:53:33 1999  Harlan Stenn  
+  mkinstalldirs
+    1.4 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_io.c (create_sockets): Skip interfaces that are really
-	just aliases.
-	From: "Erik R. Leo" 
+  README.rsa
+    1.4 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: 4.0.92b
+  README.hackers
+    1.2 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntpd.c (service_main): Check for an error return from
-	sched_get_priority_max().
+  NEWS
+    1.32 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Wed Feb 17 03:48:47 1999  Harlan Stenn  
+  ntp_update
+    1.7 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: 4.0.92a
+  README.cvs
+    1.7 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: configure.in requires autoconf 2.13 or later.
-	Reported by Ulrich Windl 
+  missing
+    1.4 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Wed Feb 17 00:12:11 1999  Harlan Stenn  
+  NOTES.y2kfixes
+    1.3 01/10/08 01:57:01 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* acconfig.h: TERMIOS_NEEDS__SVID3
-	* configure.in: Ditto
-	* ntpd/refclock_palisade.h: Ditto
-	* include/ntp_refclock.h: Ditto
-	* ntpd/ntpd.c (service_main): We want sched_get_priority_max().
-	From: Kamal A Mostafa 
+  dot.emacs
+    1.4 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_refclock.c (refclock_open): Zero the entire c_cc[] array.
-	From: Reg Clemens 
+  depcomp
+    1.3 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Tue Feb 16 23:37:49 1999  Harlan Stenn  
+  install-sh
+    1.2 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* Updated ansi2knr
-	Reported by: Marc Brett
+  README.bk
+    1.10 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
 
-Mon Feb 15 02:55:28 1999  Harlan Stenn  
+  build
+    1.17 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: 4.0.92
+  excludes
+    1.2 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_refclock.c: Added refclock_chronolog and
-	refclock_dumbclock.
-	From: Robert McMillin 
+  config.guess
+    1.7 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Sun Feb 14 15:57:53 1999  Harlan Stenn  
+  Makefile.am
+    1.15 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* dropped SCO3 support #defines.
-	* changed SCO5_TICKADJ #define to SCO5_OLDCLOCK
-	* Added code in libntp/systime.c to accumulate changes until a whole
-	  tick can be added or dropped. Adjusted gettimeofday() output
-	  to include the contents of the accumulator.
-	* cleaned up util/tickadj.c; tickadj -As now does the right thing.
-	From: Kees Hendrikse 
+  config.sub
+    1.7 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpq/ntpq.c: Rename delay() to auth_delay()
-	Reported by: Andrej Borsenkow 
+  acconfig.h
+    1.26 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/refclock_palisade.h: Cleanup.
-	From: Marc.Brett@westgeo.com
+  acinclude.m4
+    1.4 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_refclock.c (refclock_ioctl): Typo.
-	From: Reg Clemens 
+  ChangeLog
+    1.585 01/10/08 01:57:00 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* ntpd/ntp_io.c (create_sockets): Only bind a given network once.
-	From: Wolfgang Rupprecht 
+ChangeSet@1.717, 2001-10-08 01:55:18-04:00, stenn@whimsy.udel.edu
+  Re-import the JJY  patch.
 
-Sat Jan 30 11:48:37 1999  Harlan Stenn  
+  html/qth.htm
+    1.2 01/10/08 01:55:17 stenn@whimsy.udel.edu +12 -0
+    JJY entries.
 
-	* configure.in: 4.0.91f
+ChangeSet@1.716, 2001-10-06 15:30:18-04:00, stenn@whimsy.udel.edu
+  More trigger debugging.
 
-Thu Jan 28 22:58:40 1999  Harlan Stenn  
+  BitKeeper/triggers/post-commit.changelog
+    1.4 01/10/06 15:30:18 stenn@whimsy.udel.edu +3 -0
+    More debug stuff.
 
-	* ntpd/refclock_parse.c (CLK_REALTYPE): We really want ttl, not hmode.
-	* ntpd/ntp_config.c (getconfig): "mode" really should update the
-	ttl member, not the hmode member.
+ChangeSet@1.715, 2001-10-06 14:48:38-04:00, stenn@whimsy.udel.edu
+  Debug the post-commit.changelog trigger.
 
-	* ntpd/refclock_local.c: More offset cleanup from Dave.
+  BitKeeper/triggers/post-commit.changelog
+    1.3 01/10/06 14:48:37 stenn@whimsy.udel.edu +4 -0
+    More debug stuff.
 
-Thu Jan 28 00:15:20 1999  Harlan Stenn  
+ChangeSet@1.714, 2001-10-06 13:50:26-04:00, stenn@whimsy.udel.edu
+  Trigger cleanup and debug.
 
-	* configure.in: 4.0.91e
+  BitKeeper/triggers/post-commit.changelog
+    1.2 01/10/06 13:50:25 stenn@whimsy.udel.edu +1 -0
+    Add a delay to the changelog (cvs-all email) trigger so maybe I'll
+    be able to see it happen...
 
-	* ntpd/refclock_local.c: Bugfix.
-	From: Dave Mills
+  BitKeeper/deleted/.del-changelog~bafcae117d0e1606
+    1.2 01/10/06 12:58:27 stenn@whimsy.udel.edu +0 -0
+    Delete: BitKeeper/triggers/changelog
 
-	* ntpd/refclock_palisade.c: Lint/IRIX portability cleanup
-	* ntpd/refclock_palisade.h: Re-enable the declaration of float()
-	* ntpd/ntp_io.c (create_sockets): Initialize size to 0
-	From: Marc.Brett@westgeo.com
+  BitKeeper/deleted/.del-2mirrors~baf8ef547d0494ae
+    1.3 01/10/06 12:57:43 stenn@whimsy.udel.edu +0 -0
+    Delete: BitKeeper/triggers/2mirrors
 
-	* ntpd/refclock_parse.c (CLK_REALTYPE): Use hmode, not ttl.
-	* configure.in (ac_cv_var_no_parenb_ignpar): Not under Linux.
-	Reported by: Thomas Quinot 
+ChangeSet@1.713, 2001-10-06 04:28:47-04:00, stenn@whimsy.udel.edu
+  Grab the updates from the master 2mirrors script.
 
-	* ntpdc/ntpdc.c (my_delay): Renamed, from delay.
-	Reported by: Andrej Borsenkow 
+  BitKeeper/triggers/post-incoming.2mirrors
+    1.2 01/10/06 04:28:47 stenn@whimsy.udel.edu +2 -2
+    Grab the updates from the master 2mirrors script.
 
-Tue Jan 26 00:56:10 1999  Harlan Stenn  
+ChangeSet@1.712, 2001-10-06 04:16:36-04:00, stenn@whimsy.udel.edu
+  2mirrors trigger  is now quiet when we don't run it.
 
-	* configure.in: 4.0.91d
+  BitKeeper/triggers/2mirrors
+    1.2 01/10/06 04:16:36 stenn@whimsy.udel.edu +2 -2
+    Don't show the "starting 2mirrors trigger" message unless we're 
+    on a host that actually runs it.
 
-	* ntpq/ntpq.c: Y2K patches
-	From: Marc.Brett@westgeo.com
+ChangeSet@1.711, 2001-10-06 03:34:37-04:00, stenn@whimsy.udel.edu
+  Recover ntp-stable - update the ignore file and replace the triggers.
 
-	* html/driver29.htm: New version
-	* ntpd/refclock_palisade.c: Ditto
-	* ntpd/refclock_palisade.h: Ditto
-	From: Sven_Dietrich@Trimble.COM
+  BitKeeper/triggers/post-commit.changelog
+    1.1 01/10/06 03:34:36 stenn@whimsy.udel.edu +61 -0
 
-	* upgrade ansi2knr.c
+  BitKeeper/triggers/notify
+    1.1 01/10/06 03:34:36 stenn@whimsy.udel.edu +81 -0
 
-	* Some stuff that Dave did.
+  BitKeeper/triggers/changelog
+    1.1 01/10/06 03:34:36 stenn@whimsy.udel.edu +61 -0
 
-	* configure.in: 4.0.91c
+  BitKeeper/triggers/pre-apply.paranoid
+    1.1 01/10/06 03:34:36 stenn@whimsy.udel.edu +80 -0
 
-	* ntpd/refclock_oncore.c: Prototype cleanup.  Enum cleanup.
-	* ntpd/ntp_proto.c (clock_select): Fix memory leak.
-	* configure.in (ac_cv_struct_ppsclockev): Might need sys/time.h to
-	check for struct clockppsev.  Return pce->serial, not 0;
-	From: Marc.Brett@westgeo.com
+  BitKeeper/triggers/post-incoming.2mirrors
+    1.1 01/10/06 03:34:36 stenn@whimsy.udel.edu +40 -0
 
-	* ntpd/refclock_oncore.c (oncore_msg_En): Clean up.
-	From: John.Hay@mikom.csir.co.za
+  BitKeeper/triggers/00-list
+    1.1 01/10/06 03:34:35 stenn@whimsy.udel.edu +8 -0
 
-Mon Jan 25 11:50:29 1999  Philippe De Muyter  
+  BitKeeper/triggers/2mirrors
+    1.1 01/10/06 03:34:35 stenn@whimsy.udel.edu +40 -0
 
-	* libparse/parse_conf.c (clockformats): Entry added for
- 	clock_wharton_400a.
-	* libparse/clk_wharton.c: New file.
-	* libparse/Makefile.am (libparse_a_SOURCES): clk_wharton.c added;
-	(libparse_kernel_a_SOURCES): kclk_wharton.c added.
-	(kclk_wharton.o): New dependency rule.
-	* ntpd/refclock_parse.c (parse_clockinfo): Entry added for the
-	WHARTON clock (mode 15).
-	* acconfig.h (CLOCK_WHARTON_400A): New configuration macro.
-	* configure.in (CLOCK_WHARTON_400A): Macro defined like other
-	CLOCK_xxx macros.
+  BitKeeper/triggers/changelog
+    1.0 01/10/06 03:34:36 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/changelog
 
-Sun Jan 24 13:51:30 1999  Harlan Stenn  
+  BitKeeper/triggers/post-commit.changelog
+    1.0 01/10/06 03:34:36 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/post-commit.changelog
 
-	* ntpd/ntp_config.c (do_resolve_internal): Missing #ifdef DEBUG
-	From: Sven Dietrich 
+  BitKeeper/triggers/post-incoming.2mirrors
+    1.0 01/10/06 03:34:36 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/post-incoming.2mirrors
 
-	* Makefile.am (SUBDIRS): Lose authstuff
-	* configure.in: Ditto
+  BitKeeper/triggers/pre-apply.paranoid
+    1.0 01/10/06 03:34:36 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/pre-apply.paranoid
 
-Sat Jan 23 15:28:03 1999  Harlan Stenn  
+  BitKeeper/triggers/notify
+    1.0 01/10/06 03:34:36 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/notify
 
-	* configure.in: 4.0.91b
+  BitKeeper/triggers/00-list
+    1.0 01/10/06 03:34:35 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/00-list
 
-Sat Jan 23 15:02:25 1999  Harlan Stenn  
+  BitKeeper/etc/ignore
+    1.6 01/10/06 03:34:35 stenn@whimsy.udel.edu +25 -5
+    Recover the changes to the ignore file.
 
-	* ntpd/refclock_oncore.c: use HAVE_STRUCT_PPSCLOCKEV
-	* acconfig.h: HAVE_STRUCT_PPSCLOCKEV
-	* configure.in (ac_cv_struct_ppsclockev): Added test
+  BitKeeper/triggers/2mirrors
+    1.0 01/10/06 03:34:35 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/triggers/2mirrors
 
-Thu Jan 21 15:35:25 1999  Harlan Stenn  
+ChangeSet@1.710, 2001-10-06 03:09:54-04:00, stenn@whimsy.udel.edu
+  Merge maccarony://home/bk/ntp-stable-hosed
+  into whimsy.udel.edu:/backroom/ntp-stable
 
-	* configure.in: 4.0.91a
+  configure.in
+    1.223 01/10/06 03:09:53 stenn@whimsy.udel.edu +0 -0
+    Auto merged
 
-	* ntpd/refclock_nmea.c (nmea_receive): Call refclock_process()
-	every second (or each time a nmea string is received).
-	From: John Hay 
+  acconfig.h
+    1.25 01/10/06 03:09:52 stenn@whimsy.udel.edu +0 -0
+    Auto merged
 
-	* ntpd/ntp_refclock.c (refclock_ioctl): Use TIOCPPS if we have it.
-	(refclock_ioctl): Use LDISC_CLKPPS, not LDISC_PPS when deciding
-	how to set str.
-	* ntpd/ntp_loopfilter.c: Lose unused ntp_gettime() stuff.
-	* ntpd/ntp_request.c: Ditto.
-	* ntpd/refclock_local.c: Ditto.
-	* ntpd/refclock_shm.c (shm_poll): Fix the refclock_process() call.
-	* ntpd/refclock_oncore.c: patches and cleanup
-	* configure.in: ioctl/PPS checks, ONCORE cleanup
-	* acconfig.h: ONCORE cleanup
-	From: Reg Clemens 
+  README.bk
+    1.9 01/10/06 03:09:52 stenn@whimsy.udel.edu +0 -8
+    Auto merged
 
-	* configure.in (CFLAGS): cc on Sequent wants -Wc,+abi-socket.
-	We also need to figure out why -lsocket isn't being detected;
-	-lsocket is needed.
-	From: Dana Kaempen 
+ChangeSet@1.702.1.1, 2001-10-06 02:03:04-04:00, stenn@whimsy.udel.edu
+  README.bk improvements.
+  JJY driver patch.
 
-	* include/ntp_stdlib.h: AIX portability patches, header cleanup.
-	* ntptrace/ntptrace.c: Ditto.
-	* ntpdate/ntpdate.c: Ditto.
-	* ntpd/refclock_true.c: Ditto.
-	* ntpd/refclock_mx4200.c: Ditto.
-	* ntpd/refclock_jupiter.c: Ditto.
-	* libntp/msyslog.c: Ditto.
-	From: Marc.Brett@waii.com
+  ntpd/refclock_jjy.c
+    1.1 01/10/06 02:02:57 stenn@whimsy.udel.edu +713 -0
 
-Sun Jan 10 15:15:07 1999  Harlan Stenn  
+  libntp/clocktypes.c
+    1.8 01/10/06 02:02:57 stenn@whimsy.udel.edu +2 -0
+    Re-import the JJY driver patch.
 
-	* configure.in: 4.0.91
+  ntpd/Makefile.am
+    1.19 01/10/06 02:02:57 stenn@whimsy.udel.edu +1 -1
+    Re-import the JJY driver patch.
 
-Sat Jan  9 00:11:34 1999  Harlan Stenn  
+  ntpd/ntp_control.c
+    1.38 01/10/06 02:02:57 stenn@whimsy.udel.edu +1 -0
+    Re-import the JJY driver patch.
 
-	* include/ntp_stdlib.h: msyslog() is declared differently if we're
-	not __STDC__.
+  ntpd/refclock_conf.c
+    1.14 01/10/06 02:02:57 stenn@whimsy.udel.edu +8 -1
+    Re-import the JJY driver patch.
 
-	* include/ntp_types.h: It's HAVE_PROTOTYPES, not USE_PROTOTYPES.
-	* include/ntp_machine.h: Ditto.
+  ntpd/refclock_jjy.c
+    1.0 01/10/06 02:02:57 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable-hms/ntpd/refclock_jjy.c
 
-Fri Jan  8 20:47:10 1999  Harlan Stenn  
+  acconfig.h
+    1.23.1.1 01/10/06 02:02:56 stenn@whimsy.udel.edu +3 -0
+    Re-import the JJY driver patch.
 
-	* configure.in: Upgrade to autoconf-2.13
-	Do the prototypes check much earlier, as it might alter CFLAGS and
- 	things which will affect other tests.
+  configure.in
+    1.221.1.1 01/10/06 02:02:56 stenn@whimsy.udel.edu +9 -1
+    Re-import the JJY driver patch.
 
-	* ntpd/ntp_request.c (do_conf): The problem was with a template
-	for "version" on an IRIX C compiler...
-	From: Marc.Brett@waii.com
+  html/refclock.htm
+    1.14 01/10/06 02:02:56 stenn@whimsy.udel.edu +8 -4
+    Re-import the JJY driver patch.
 
-	* libntp/authkeys.c: #include config.h first.
-	Reported by: brian.bumpass@funb.com
+  include/ntp.h
+    1.48 01/10/06 02:02:56 stenn@whimsy.udel.edu +2 -1
+    Re-import the JJY driver patch.
 
-Thu Jan  7 00:24:35 1999  Harlan Stenn  
+  README.bk
+    1.5.1.1 01/10/06 02:02:56 stenn@whimsy.udel.edu +22 -7
+    Resync with latest copy, add new info about getting bitkeeper
+    and using HTTP as the transport protocol.
 
-	* util/tickadj.c (main): return() instead of exit().
-	* ntpd/ntp_request.c (do_conf): Disambiguate ||.
-	* ntpd/ntp_proto.c (clock_select): Initialize variables.
-	From: Marc.Brett@waii.com
+ChangeSet@1.709, 2001-09-20 04:54:45-04:00, stenn@whimsy.udel.edu
+  Clean up a small portability nit from the MPE port.
 
-	* scripts/ntpver.in: Use PATH_SH
+  util/ntp-genkeys.c
+    1.58 01/09/20 04:54:45 stenn@whimsy.udel.edu +4 -0
+    There are a number of platforms that don't use GETTIMEOFDAY;
+    deal with it here, where we need it.
 
-	* configure.in (PATH_SH): Added.
+ChangeSet@1.708, 2001-09-20 02:15:15-04:00, stenn@whimsy.udel.edu
+  HP MPE/iX patch
+  From: "BIXBY,MARK (HP-Cupertino,ex1)" 
 
-Tue Jan  5 19:02:51 1999  Harlan Stenn  
+  html/hints/mpeix
+    1.1 01/09/20 02:15:14 stenn@whimsy.udel.edu +50 -0
 
-	* configure.in: 4.0.90h
+  util/ntp-genkeys.c
+    1.57 01/09/20 02:15:14 stenn@whimsy.udel.edu +8 -5
+    #include cleanup.
+    Use the GETTIMEOFDAY macro instead of making the call directly.
+    Ditto for SRANDOM() and RANDOM().
 
-	* html/driver30.htm: Updated.
-	* html/refclock.htm: Refer to driver30
-	* ntpd/refclock_oncore.c: Vastly improve and make less FreeBSD centric,
-	From: Poul-Henning Kamp  and
-		Reg.Clemens 
+  html/hints/mpeix
+    1.0 01/09/20 02:15:14 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/html/hints/mpeix
 
-	* include/ntp.h: Portability/lint patches
-	* libntp/binio.c: Ditto.
-	* libntp/caljulian.c: Ditto.
-	* libntp/caltontp.c: Ditto.
-	* libntp/ieee754io.c: Ditto.
-	* libntp/md5c.c: Ditto.
-	* libntp/mfp_mul.c: Ditto.
-	* libntp/msyslog.c: Ditto.
-	* libntp/statestr.c: Ditto.
-	* libntp/systime.c: Ditto.
-	* libparse/clk_trimtsip.c: Ditto.
-	* libparse/data_mbg.c: Ditto.
-	* libparse/parse.c: Ditto.
-	* ntpd/ntp_control.c: Ditto.
-	* ntpd/ntp_filegen.c: Ditto.
-	* ntpd/ntp_intres.c: Ditto.
-	* ntpd/ntp_io.c: Ditto.
-	* ntpd/ntp_peer.c: Ditto.
-	* ntpd/ntp_proto.c: Ditto.
-	* ntpd/ntp_util.c: Ditto.
-	* ntpd/ntpd.c: Ditto.
-	* ntpd/refclock_arc.c: Ditto.
-	* ntpd/refclock_chu.c: Ditto.
-	* ntpd/refclock_datum.c: Ditto.
-	* ntpd/refclock_leitch.c: Ditto.
-	* ntpd/refclock_parse.c: Ditto.
-	* ntpd/refclock_usno.c: Ditto.
-	* ntpq/ntpq.c: Ditto.
-	* util/tickadj.c: Ditto.
-	From: Marc.Brett@waii.com
+  ntptrace/ntptrace.c
+    1.14 01/09/20 02:15:14 stenn@whimsy.udel.edu +8 -2
+    #include guarding
 
-Mon Jan  4 00:56:55 1999  Harlan Stenn  
+  ntpdate/ntptimeset.c
+    1.10 01/09/20 02:15:14 stenn@whimsy.udel.edu +6 -1
+    #include cleanup and guarding
 
-	* configure.in: 4.0.90g
+  ntpdate/ntpdate.c
+    1.24 01/09/20 02:15:14 stenn@whimsy.udel.edu +6 -1
+    #include guarding
 
-	* ntpd/ntp_config.c (getconfig): MODE was setting ttl, not hmode.
-	Reported by: Carsten Emde 
+  ntpd/ntp_io.c
+    1.21 01/09/20 02:15:13 stenn@whimsy.udel.edu +8 -4
+    #include guarding
+    Clean up the default local loopback test
 
-Fri Dec  4 01:01:14 1998  Harlan Stenn  
+  ntpd/ntp_proto.c
+    1.94 01/09/20 02:15:13 stenn@whimsy.udel.edu +2 -1
+    MPE does not use a struct timezone tzp.
 
-	* configure.in: 4.0.90f
+  ntpd/ntp_resolver.c
+    1.12 01/09/20 02:15:13 stenn@whimsy.udel.edu +1 -0
+    #include cleanup
 
-	* ntpd/refclock_mx4200.c: New version
-	From: Marc.Brett@waii.com
+  ntpd/ntp_timer.c
+    1.16 01/09/20 02:15:13 stenn@whimsy.udel.edu +3 -1
+    #include guarding
 
-1998-12-02  Harlan Stenn  
+  ntpd/ntpd.c
+    1.34 01/09/20 02:15:13 stenn@whimsy.udel.edu +10 -3
+    #include guarding
+    MPE doesn't have the concept of "root".
 
-	* ntpd/ntp_config.c (do_resolve_internal): If fork fails, say why.
-	Reported by: Jeff_Dennison@admin.tc.faa.gov
+  libntp/strdup.c
+    1.3 01/09/20 02:15:12 stenn@whimsy.udel.edu +3 -1
+    MPE header cleanup
 
-	* ntpd/ntpd.c (ntpdmain):  fork() can return a -1.  Someday we'll
-	report this condition...
+  ntpd/ntp_config.c
+    1.51 01/09/20 02:15:12 stenn@whimsy.udel.edu +2 -0
+    header #include cleanup/guarding
 
-1998-12-02  Harlan Stenn  
+  acconfig.h
+    1.24 01/09/20 02:15:12 stenn@whimsy.udel.edu +3 -0
+    Added DECL_INET_NTOA_0
 
-	* configure.in: 4.0.90e
+  libntp/machines.c
+    1.10 01/09/20 02:15:12 stenn@whimsy.udel.edu +285 -1
+    MPE portability stuff - wrappers for bind(), fcntl(), setitimer(),
+    gettimeofday(), and settimeofday().
 
-	* ntpd/refclock_palisade.c: Reformat code so ansi2knr will work
-	* ntpd/refclock_palisade.h: Ditto
-	From: Marc.Brett@waii.com
+  libntp/adjtime.c
+    1.2 01/09/20 02:15:12 stenn@whimsy.udel.edu +97 -0
+    adjtime() implementation for MPE/iX
 
-Sun Nov 29 21:00:53 1998  Harlan Stenn  
+  include/ntp_machine.h
+    1.8 01/09/20 02:15:12 stenn@whimsy.udel.edu +42 -0
+    MPE portability stuff
 
-	* configure.in: 4.0.90d
+  configure.in
+    1.222 01/09/20 02:15:12 stenn@whimsy.udel.edu +56 -6
+    Various portability and MPE/iX porting patches.
 
-	* configure.in (CFLAGS): Use "-O2 -g3 -n32" by default for Irix6.2
-	and later.
-	Reported by: Jack Bryans 
+  ntpd/ntp_intres.c
+    1.18 01/09/20 02:15:12 stenn@whimsy.udel.edu +1 -0
+    #include cleanup
 
-1998-11-29  Harlan Stenn  
+ChangeSet@1.707, 2001-09-19 20:27:23-04:00, stenn@whimsy.udel.edu
+  README.bk improvements
 
-	* configure.in: 4.0.90c
+  README.bk
+    1.8 01/09/19 20:27:22 stenn@whimsy.udel.edu +2 -1
+    Mention that warnings from autorefonc are expected.
 
-	* ntpd/refclock_oncore.c (oncore_msg_En): Convert to nano
-	From: John Hay 
+ChangeSet@1.706, 2001-09-19 01:40:46-04:00, stenn@whimsy.udel.edu
+  Makefile.am cruft cleanup.
 
-	* include/ntp_request.h (RM_VN_MODE): Add version parameter, so
-	xntpdc will work across v3 and v4.
-	* ntpd/ntp_request.c: Track requested version
-	(req_ack): Use requested version in RM_VN_MODE
-	(more_pkt): Ditto
-	(flush_pkt): Ditto
-	(process_private): Get requested version
-	* ntpd/ntp_intres.c (request): Use default version
-	* ntpdc/ntpdc.c (sendrequest): Ditto
-	From: John Hay 
+  Makefile.am
+    1.14 01/09/19 01:40:46 stenn@whimsy.udel.edu +16 -13
+    More cruft cleanup.
 
-Fri Nov 27 14:27:21 1998  Harlan Stenn  
+ChangeSet@1.705, 2001-09-19 01:26:24-04:00, stenn@whimsy.udel.edu
+  Fix a typo.
 
-	* ntpd/refclock_palisade.c: Lint cleanup
-	* ntpd/refclock_palisade.h: Ditto.
-	From: Marc Brett 
+  README.bk
+    1.7 01/09/19 01:26:24 stenn@whimsy.udel.edu +1 -1
+    Typo.
 
-Mon Nov 23 04:45:03 1998  Harlan Stenn  
+ChangeSet@1.704, 2001-09-19 00:21:06-04:00, stenn@whimsy.udel.edu
+  README.bk improvements
 
-	* configure.in: 4.0.90b
+  README.bk
+    1.6 01/09/19 00:21:06 stenn@whimsy.udel.edu +5 -4
+    Clean it up even more.
 
-	* New code and cleanup for the NT stuff
-	From: Carl Byington 
+ChangeSet@1.703, 2001-09-18 03:20:33-04:00, stenn@whimsy.udel.edu
+  Makefile.am cleanup
 
-Sat Nov 21 21:21:45 1998  Harlan Stenn  
+  Makefile.am
+    1.13 01/09/18 03:20:33 stenn@whimsy.udel.edu +3 -3
+    Add README.bk to the distribution list.
+    Do the .warning message as a BUILT_SOURCES entry, not as a dependency to Makefile.
 
-	* configure.in: 4.0.90a
+ChangeSet@1.702, 2001-09-16 00:25:29-04:00, stenn@whimsy.udel.edu
+  autoreconf updates
 
-	* libntp/systime.c (step_systime): net_set_tod calls clock_settime.
-	* libntp/machines.c (ntp_set_tod): Take a 2nd arg for NT.
-	* include/ntp_machine.h: ntp_set_tod() has 2 args always.
-	* ports/winnt/bldrel.bat: Typo.
-	From: Carl Byington 
+  README.bk
+    1.5 01/09/16 00:25:28 stenn@whimsy.udel.edu +1 -1
+    autoreconf updates
 
-	* ntpd/ntp_intres.c (findhostaddr): h_errno is a #define under AIX.
-	* configure.in:  clock_settime is a stub in AIX4.
-	From: Perry Ross 
+ChangeSet@1.701, 2001-09-16 00:14:53-04:00, stenn@whimsy.udel.edu
+  Make the *.ds[pw] files be EOLN_NATIVE.
 
-	* libntp/Makefile.am (EXTRA_DIST): Lose libntp.mak
-	* ntpd/Makefile.am (EXTRA_DIST): Ditto.
-	* ntpdate/Makefile.am (EXTRA_DIST): Ditto.
-	* ntpdc/Makefile.am (EXTRA_DIST): Ditto.
-	* ntpq/Makefile.am (EXTRA_DIST): Ditto.
-	From: Greg Schueman 
+  ports/winnt/instsrv/Instsrv.dsp
+    1.4 01/09/16 00:07:14 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Sat Nov 21 12:33:16 1998  Harlan Stenn  
+  ports/winnt/libntp/libntp.dsp
+    1.6 01/09/16 00:07:14 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: 4.0.90
+  ports/winnt/ntpd/ntpd.dsp
+    1.11 01/09/16 00:07:14 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	Nano changes from Dave Mills.
+  ports/winnt/ntp.dsw
+    1.5 01/09/16 00:07:13 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Thu Nov 19 04:23:46 1998  Harlan Stenn  
+  ports/winnt/ntpdate/ntpdate.dsp
+    1.6 01/09/16 00:07:13 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* include/ntp_machine.h: STREAM also needs HAVE_SYS_STREAM_H
-	Reported by: Ronald Cole 
+  ports/winnt/ntpdc/ntpdc.dsp
+    1.6 01/09/16 00:07:13 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-Mon Nov 16 19:17:34 1998  Harlan Stenn  
+  ports/winnt/ntpq/ntpq.dsp
+    1.6 01/09/16 00:07:13 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* configure.in: 4.0.73e14
+  ports/winnt/ntptrace/ntptrace.dsp
+    1.6 01/09/16 00:07:13 stenn@whimsy.udel.edu +0 -0
+    Turn on EOLN_NATIVE flag
 
-	* util/ntptime.c (main): Protect STA_NANO
+ChangeSet@1.700, 2001-09-15 03:16:54-04:00, stenn@whimsy.udel.edu
+  ntp-dev-ipv6 update to README.bk
 
-	* ntpd/refclock_oncore.c: General overhaul and simplifications.
-	The new manual clarifies a lot of fine points, and the driver has
-	been suitably simplified.  Uses Site Survey if possible, otherwise
-	does it by hand.  Should also work with non-UT models, as long as
-	they talk the Motorola Binary Protocol.  The driver Doesn't (need
-	to) know where the author lives anymore.
-	From: Poul-Henning Kamp 
+  README.bk
+    1.4 01/09/15 03:16:54 stenn@whimsy.udel.edu +9 -0
+    Talk about the new ntp-dev-ipv6 repo.
 
-	* ntpd/refclock_palisade.h: New version.
-	* ntpd/refclock_palisade.c: New version.
-	From: Sven Dietrich 
+ChangeSet@1.699, 2001-09-13 01:42:48-04:00, stenn@whimsy.udel.edu
+  Ignore some auto* related files.
 
-Sat Oct 24 01:19:21 1998  Harlan Stenn  
+  BitKeeper/etc/ignore
+    1.5 01/09/13 01:38:23 stenn@whimsy.udel.edu +2 -0
+    added config.h.in stamp-h.in
 
-	* configure.in: 4.0.73e13
+ChangeSet@1.698, 2001-09-11 21:41:11-04:00, stenn@whimsy.udel.edu
+  Remove more auto* generated/related files.
+
+  BitKeeper/deleted/.del-config.h.in~3aed0663
+    1.63 01/09/11 21:33:41 stenn@whimsy.udel.edu +0 -0
+    Delete: config.h.in
+
+  BitKeeper/deleted/.del-stamp-h.in~3aed0663
+    1.4 01/09/11 21:33:41 stenn@whimsy.udel.edu +0 -0
+    Delete: stamp-h.in
+
+ChangeSet@1.697, 2001-09-08 20:23:01-04:00, stenn@whimsy.udel.edu
+  Document the mirrors at www.ntp.org.
+
+  README.bk
+    1.3 01/09/08 20:23:01 stenn@whimsy.udel.edu +14 -1
+    Document the mirrors at www.ntp.org.
+
+ChangeSet@1.696, 2001-09-08 19:39:22-04:00, stenn@whimsy.udel.edu
+  Doc updates.
+
+  README.bk
+    1.2 01/09/08 19:39:21 stenn@whimsy.udel.edu +12 -2
+    Say what versions of the auto* tools we need.
+    Say where to find bk and the ntp repos.
+
+ChangeSet@1.695, 2001-09-06 04:09:32-04:00, stenn@whimsy.udel.edu
+  From: David Campbell 
+  Subject: [ntp:bugs] Compiling ntp on Dynix PTX (CFLAGS patch)
+
+  configure.in
+    1.221 01/09/06 04:09:31 stenn@whimsy.udel.edu +2 -2
+    From: David Campbell 
+    Subject: [ntp:bugs] Compiling ntp on Dynix PTX (CFLAGS patch)
+
+ChangeSet@1.694, 2001-09-06 03:36:29-04:00, stenn@whimsy.udel.edu
+  Ignore ~ backup files.
+
+  BitKeeper/etc/ignore
+    1.4 01/09/06 03:36:28 stenn@whimsy.udel.edu +1 -0
+    Ignore ~ backup files.
+
+ChangeSet@1.693, 2001-09-06 03:26:08-04:00, stenn@whimsy.udel.edu
+  From: Hubert Feyrer  
+  Subject: [ntp:bugs] "-u" missing from ntpdate usage statement
+
+  ntpdate/ntpdate.c
+    1.23 01/09/06 03:26:07 stenn@whimsy.udel.edu +1 -1
+    From: Hubert Feyrer  
+    Subject: [ntp:bugs] "-u" missing from ntpdate usage statement 
+
+ChangeSet@1.692, 2001-09-06 02:28:37-04:00, stenn@whimsy.udel.edu
+  Try the new EDIT checkout mode - it's supposed to fix the timestamp problem.
+
+  BitKeeper/etc/config
+    1.3 01/09/06 02:28:36 stenn@whimsy.udel.edu +1 -1
+    Use checkout:EDIT instead of checkout:edit.
+
+ChangeSet@1.691, 2001-08-27 03:49:01-04:00, stenn@whimsy.udel.edu
+  Finish up cleanup from losing generated files.
+  Bump verison number.
+
+  BitKeeper/etc/ignore
+    1.3 01/08/27 03:49:01 stenn@whimsy.udel.edu +22 -0
+    Added COPYRIGHT ElectricFence/Makefile.in Makefile.in aclocal.m4 adjtimed/Makefile.in am.log clockstuff/Makefile.in configure include/Makefile.in kernel/Makefile.in kernel/sys/Makefile.in libntp/Makefile.in libparse/Makefile.in librsaref/Makefile.in ntpd/Makefile.in ntpdate/Makefile.in ntpdc/Makefile.in ntpq/Makefile.in ntptrace/Makefile.in parseutil/Makefile.in scripts/Makefile.in util/Makefile.in to the ignore list
+
+  README.bk
+    1.1 01/08/27 03:49:00 stenn@whimsy.udel.edu +15 -0
+
+  config.h.in
+    1.62 01/08/27 03:49:00 stenn@whimsy.udel.edu +3 -0
+    HAVE_STDINT_H check.
+
+  README.bk
+    1.0 01/08/27 03:49:00 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/README.bk
+
+  clockstuff/Makefile.am
+    1.2 01/08/27 03:49:00 stenn@whimsy.udel.edu +2 -2
+    Portability improvements found by automake 1.5
+
+  configure.in
+    1.220 01/08/27 03:49:00 stenn@whimsy.udel.edu +1 -1
+    Call this  version '0a1.
+
+ChangeSet@1.690, 2001-08-27 03:30:52-04:00, stenn@whimsy.udel.edu
+  .del-aclocal.m4~3aed0663:
+    Delete: aclocal.m4
+  .del-Makefile.in~52231e38:
+    Delete: ElectricFence/Makefile.in
+  .del-Makefile.in~bd702e17:
+    Delete: scripts/Makefile.in
+  .del-Makefile.in~3aed0663~12:
+    Delete: parseutil/Makefile.in
+  .del-Makefile.in~3aed0663~13:
+    Delete: util/Makefile.in
+  .del-Makefile.in~3aed0663~14:
+    Delete: Makefile.in
+  .del-Makefile.in~3aed0663~10:
+    Delete: ntpq/Makefile.in
+  .del-Makefile.in~3aed0663~11:
+    Delete: ntptrace/Makefile.in
+  .del-Makefile.in~3aed0663~6:
+    Delete: libparse/Makefile.in
+  .del-Makefile.in~3aed0663~7:
+    Delete: ntpd/Makefile.in
+  .del-Makefile.in~3aed0663~8:
+    Delete: ntpdate/Makefile.in
+  .del-Makefile.in~3aed0663~9:
+    Delete: ntpdc/Makefile.in
+  .del-Makefile.in~3aed0663:
+    Delete: adjtimed/Makefile.in
+  .del-Makefile.in~3aed0663~1:
+    Delete: clockstuff/Makefile.in
+  .del-Makefile.in~3aed0663~4:
+    Delete: kernel/Makefile.in
+  .del-Makefile.in~3aed0663~5:
+    Delete: libntp/Makefile.in
+  .del-Makefile.in~3aed0663~2:
+    Delete: include/Makefile.in
+  .del-Makefile.in~3aed0663~3:
+    Delete: kernel/sys/Makefile.in
+  .del-Makefile.in~e832209e:
+    Delete: librsaref/Makefile.in
+  .del-COPYRIGHT~3aed0663:
+    Delete: COPYRIGHT
+  .del-configure~3aed0663:
+    Delete: configure
+
+  BitKeeper/deleted/.del-aclocal.m4~3aed0663
+    1.88 01/08/27 02:37:31 stenn@whimsy.udel.edu +217 -160
+    Delete: aclocal.m4
+
+  BitKeeper/deleted/.del-Makefile.in~52231e38
+    1.18 01/08/27 02:35:20 stenn@whimsy.udel.edu +89 -97
+    Delete: ElectricFence/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~bd702e17
+    1.27 01/08/27 02:35:20 stenn@whimsy.udel.edu +30 -39
+    Delete: scripts/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~12
+    1.23 01/08/27 02:35:20 stenn@whimsy.udel.edu +76 -88
+    Delete: parseutil/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~13
+    1.27 01/08/27 02:35:20 stenn@whimsy.udel.edu +150 -169
+    Delete: util/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~14
+    1.43 01/08/27 02:35:20 stenn@whimsy.udel.edu +62 -63
+    Delete: Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~11
+    1.22 01/08/27 02:35:19 stenn@whimsy.udel.edu +76 -87
+    Delete: ntptrace/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~10
+    1.27 01/08/27 02:35:19 stenn@whimsy.udel.edu +78 -89
+    Delete: ntpq/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~6
+    1.27 01/08/27 02:35:19 stenn@whimsy.udel.edu +148 -152
+    Delete: libparse/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~7
+    1.30 01/08/27 02:35:19 stenn@whimsy.udel.edu +273 -260
+    Delete: ntpd/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~8
+    1.31 01/08/27 02:35:19 stenn@whimsy.udel.edu +86 -97
+    Delete: ntpdate/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~9
+    1.27 01/08/27 02:35:19 stenn@whimsy.udel.edu +78 -89
+    Delete: ntpdc/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~1
+    1.22 01/08/27 02:35:18 stenn@whimsy.udel.edu +78 -89
+    Delete: clockstuff/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663
+    1.22 01/08/27 02:35:18 stenn@whimsy.udel.edu +76 -87
+    Delete: adjtimed/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~4
+    1.22 01/08/27 02:35:18 stenn@whimsy.udel.edu +43 -47
+    Delete: kernel/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~5
+    1.31 01/08/27 02:35:18 stenn@whimsy.udel.edu +282 -286
+    Delete: libntp/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~2
+    1.34 01/08/27 02:35:18 stenn@whimsy.udel.edu +35 -42
+    Delete: include/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~3aed0663~3
+    1.21 01/08/27 02:35:18 stenn@whimsy.udel.edu +34 -41
+    Delete: kernel/sys/Makefile.in
+
+  BitKeeper/deleted/.del-Makefile.in~e832209e
+    1.33 01/08/27 02:35:18 stenn@whimsy.udel.edu +89 -95
+    Delete: librsaref/Makefile.in
+
+  BitKeeper/deleted/.del-COPYRIGHT~3aed0663
+    1.22 01/08/27 02:35:16 stenn@whimsy.udel.edu +0 -0
+    Delete: COPYRIGHT
+
+  BitKeeper/deleted/.del-configure~3aed0663
+    1.225 01/08/27 02:35:16 stenn@whimsy.udel.edu +1959 -2108
+    Delete: configure
+
+ChangeSet@1.689, 2001-08-26 04:41:45-04:00, stenn@whimsy.udel.edu
+  Readline support,
+  From: Ollivier Robert 
+
+  ntpq/ntpq.c
+    1.16 01/08/26 03:06:34 stenn@whimsy.udel.edu +30 -14
+    Readline support.
+
+ChangeSet@1.688, 2001-08-23 03:56:20-04:00, stenn@whimsy.udel.edu
+  Ignore A.* directories.
 
-	* ntpdc/ntpdc_ops.c (clkbug): Patches
-	* ntpd/ntp_refclock.c (refclock_buginfo): Patches
-	From: Marc.Brett@waii.com
+  BitKeeper/etc/ignore
+    1.2 01/08/23 02:35:50 stenn@whimsy.udel.edu +1 -0
+    added A.*
 
-Sat Oct 10 20:13:14 1998  Harlan Stenn  
+ChangeSet@1.687, 2001-08-23 03:46:22-04:00, stenn@whimsy.udel.edu
+  Don't include SCCS subdirs in a distribution.
 
-	* configure.in: 4.0.73e12
+  COPYRIGHT
+    1.21 01/08/23 03:46:21 stenn@whimsy.udel.edu +1 -1
+    Regenerated file.
 
-	* ntpd/ntp_util.c (hourly_stats): Added prio_set stuff.
+  Makefile.in
+    1.42 01/08/23 03:46:21 stenn@whimsy.udel.edu +1 -0
+    Regenerated file.
 
-	* ntpd/ntpd.c (ntpdmain): HAVE_SETPGRP_0 typo.
-	* parseutil/dcfd.c (detach): Ditto.
-	* ntpd/ntp_control.c (ctl_putpeer): Sometimes, peer->dstadr is
-	NIL.
-	From: Perry Ross 
+  aclocal.m4
+    1.87 01/08/23 03:46:21 stenn@whimsy.udel.edu +1 -1
+    Regenerated file.
 
-	* ntpd/ntpd.c:
-	Some systems use sys/sched.h, not sched.h (Irix)
-	* configure.in (CFLAGS): nextstep needs -posix.
-	Reported by: Jack Bryans 
+  Makefile.am
+    1.12 01/08/23 03:46:21 stenn@whimsy.udel.edu +1 -0
+    Clean out SCCS subdirs when making a distribution.
 
-Sat Oct  3 02:32:46 1998  Harlan Stenn  
+ChangeSet@1.686, 2001-08-16 02:47:35-04:00, stenn@whimsy.udel.edu
+  Add a marker to the NEWS file.
 
-	* configure.in: 4.0.73e11
+  NEWS
+    1.31 01/08/16 02:47:34 stenn@whimsy.udel.edu +1 -0
+    Add a "marker" to the file so we can easily segregate stable from
+    development changes in the NEWS file.
 
-	* configure.in (ac_refclock_palisade): Needs termios.
+ChangeSet@1.685, 2001-08-16 02:28:43-04:00, stenn@whimsy.udel.edu
+  Final ntp-4.1.0 changes to the NEWS file.
 
-	* libntp/mktime.c: Some systems need sys/types.h
+  NEWS
+    1.30 01/08/16 02:28:43 stenn@whimsy.udel.edu +2 -0
+    Add the final missing bits to the NEWS file for the 4.1.0 release. 
 
-	* configure.in: Added AC_TYPE_SIZE_T and AC_CHECK_TYPE(time_t, long)
-	The time_t stuff should only be needed on Older machines, so the
-	fact that I'm using a long shouldn't be a problem (hollow laugh).
+ChangeSet@1.684, 2001-08-16 01:05:37-04:00, stenn@whimsy.udel.edu
+  Enable auto-checkout.
 
-	* include/l_stdlib.h: Sometimes we need to #include 
+  BitKeeper/etc/logging_ok
+    1.1 01/08/16 01:05:33 stenn@whimsy.udel.edu +1 -0
 
-	* libntp/Makefile.am (../include/des.h): Typo.
+  BitKeeper/etc/logging_ok
+    1.0 01/08/16 01:05:33 stenn@whimsy.udel.edu +0 -0
+    BitKeeper file /backroom/ntp-stable/BitKeeper/etc/logging_ok
 
-Fri Oct  2 20:52:47 1998  Harlan Stenn  
+  BitKeeper/etc/config
+    1.2 01/08/16 01:05:21 stenn@whimsy.udel.edu +2 -0
+    Dave and I want auto-checkout.
 
-	* ntpd/ntp_intres.c (request): Accept responses back thru V2.
+ChangeSet@1.683, 2001-08-01 23:01:12-00:00, stenn@whimsy.udel.edu
+  aclocal.m4, ChangeLog, configure, configure.in:
+    * configure.in: 4.1.0
+  TAG: NTP_4_1_0
 
-Thu Oct  1 00:11:16 1998  Harlan Stenn  
+  configure.in
+    1.219 01/08/01 23:01:12 stenn@whimsy.udel.edu +1 -1
+    * configure.in: 4.1.0
 
-	* configure.in: 4.0.73e9
+  configure
+    1.224 01/08/01 23:01:10 stenn@whimsy.udel.edu +1 -1
+    * configure.in: 4.1.0
 
-	* ntpd/ntpd.c (catch_danger): Added.
-	(ntpdmain): AIX SIGDANGER stuff
-	From: Lars-Owe Ivarsson 
+  ChangeLog
+    1.584 01/08/01 23:01:10 stenn@whimsy.udel.edu +4 -0
+    * configure.in: 4.1.0
 
-	* configure.in:
-	* include/ntp_machine.h:
-	* include/ntp_string.h:
-	* libntp/machines.c:
-	* libparse/clk_hopf6021.c:
-	* libparse/clk_trimtsip.c:
-	* ntpd/refclock_leitch.c:
-	* ntpd/refclock_palisade.c:
-	* ntpd/refclock_parse.c:
-	Here are some patches to suppress warnings from various compilers
-	(IRIX 5.3, MipsPro C 7.1 on IRIX 6.4, AIX 4.1) and loaders (IRIX
-	5.3, IRIX 6.4).  Shouldn't affect functionality at all.
-	From: Marc Brett 
-	(I got similar patches for AIX from Lars-Owe Ivarsson
-	)
-
-Thu Sep 24 21:33:50 1998  Harlan Stenn  
-
-	* configure.in: '73e8
-
-	* configure.in: AIX4 stubs the POSIX timer_ stuff,
-	sched_setscheduler, and mlockall.
-	Reported by: Lars-Owe Ivarsson 
-
-	* configure.in: OpenBSD stubs the POSIX timer_ stuff.
-	Reported by:  sidney august cammeresi iv 
-	(and several other folks whose names I can't find at the moment)
-
-Mon Sep 21 15:35:23 1998  Harlan Stenn  
-
-	* configure.in: '73e7
-
-	* ntpd/refclock_parse.c: Missing declaration
-	From: Marc Brett 
-
-	* include/README: Remove old MCAST descriptions
-
-	* include/Makefile.am (noinst_HEADERS): Lose sun-in.h .
-
-Mon Sep 21 14:50:12 1998  Harlan Stenn  
-
-	* ntpdate/ntpdate.c (timer): Properly format the definition.
-
-Sun Sep 20 23:02:50 1998  Harlan Stenn  
-
-	* configure.in: '73e6
-
-	* include/Makefile.am (noinst_HEADERS): Renamed in.h to sun-in.h
-
-Fri Sep 18 01:05:55 1998  Harlan Stenn  
-
-	* configure.in: '73e5
-
-	* ntpd/refclock_palisade.c: SCO patch
-	From: Kamal A Mostafa 
-
-	* libparse/clk_trimtsip.c (cvt_trimtsip): Fix rollover bug.
-	From: "Michael J. Tubby B.Sc. G8TIC" 
-
-	* libntp/authencrypt.c:
-	* libntp/systime.c:
-	* ntpd/refclock_acts.c:
-	* ntpd/refclock_arbiter.c:
-	* ntpd/refclock_arc.c:
-	* ntpd/refclock_as2201.c:
-	* ntpd/refclock_atom.c:
-	* ntpd/refclock_chu.c:
-	* ntpd/refclock_conf.c:
-	* ntpd/refclock_datum.c:
-	* ntpd/refclock_heath.c:
-	* ntpd/refclock_hpgps.c:
-	* ntpd/refclock_irig.c:
-	* ntpd/refclock_leitch.c:
-	* ntpd/refclock_nmea.c:
-	* ntpd/refclock_palisade.c:
-	* ntpd/refclock_parse.c:
-	* ntpd/refclock_pst.c:
-	* ntpd/refclock_trak.c:
-	* ntpd/refclock_true.c:
-	* ntpd/refclock_usno.c:
-	* ntpd/refclock_wwvb.c:
-	Typos, cleanup, and bugfixes
-	From: Marc Brett 
-
-	* ntpd/ntp_timer.c (timer): Typo.
-	* include/ntp_refclock.h: in refclockstat, clockdesc should be const.
-	* ntpd/ntp_io.c (create_sockets): Typo.
-	* ntpd/ntp_control.c (free_varlist): Use the appropriate cast when
-	calling free().
-	(set_var): Use char *td for non-const char data.
-	(ctl_getitem): Use char * for non-const data.
-	(Many of these reported by Marc Brett)
-
-Sun Sep 13 19:19:09 1998  Harlan Stenn  
-
-	* ntpd/ntpd.c: Added nofork declaration.
-	(ntpdmain): Initialize it...
-	* ntpd/ntp_config.c: added nofork.
-	Updated ntp_options.
-	(getstartup): Updated "usage" string.  Deal with -n flag.
-	(getconfig): Ditto.
-	From: Jeffrey Hutzelman 
-
-	* ntpd/ntp_io.c (open_socket): Use ntoa() to print out the address
-	when bind() fails. (in 2 places)
-	Reported by: "Markus W. Fehr" 
-	Only soft-fail if an interface is unavailable.
-	(create_sockets):  Don't SO_REUSEADDR if the interface is unavailable.
-	From: "Markus W. Fehr" 
-
-	* configure.in:  If we --disable-all-clocks, then don't enable
-	parse clocks by default.
-	Reported by: Marion Hakanson 
-
-Sat Aug 22 23:58:14 1998  Frank Kardel  
-
-	* ntpd/refclock_parse.c (local_input): fixed IO handling for non-STREAM IO
-
-Sun Aug 16 20:13:32 1998  Frank Kardel  
-
-	* libntp/ieee754io.c: debug information only compile for LIBDEBUG case
-
-	* ntpd/refclock_parse.c (gps16x_message): reduced UTC parameter information (dropped A0,A1)
-	made uval a local variable (killed one of the last globals)
-	(sendetx): added logging of messages when in debug mode
-	(trimble_check): added periodic checks to facilitate re-initialization
-	(trimbletsip_init): made use of EOL character if in non-kernel operation
-	(trimbletsip_message): extended message interpretation
-	(getdbl): fixed data conversion
-
-	* libparse/parse_conf.c (clockformats): Trimble TSIP driver now also
-	available for kernel operation
-
-	* libparse/info_trimble.c: re-generated
-
-	* libparse/clk_trimtsip.c (cvt_trimtsip): initial kernel capable version (no more floats)
-	(clock_trimtsip =): new format name
-
-	* libparse/clk_trimtaip.c (clock_trimtaip =): changed format name
-
-	* include/trimble.h (CMD_RSTATTRACK): renamed mode 6 variable name
-
-	* scripts/monitoring/ntploopwatch: moved emacs mode selector
-
-Mon Aug 10 15:32:48 1998  Harlan Stenn  
-
-	* ntpd/refclock_acts.c: Patch cleanup
-	* ntpd/ntp_refclock.c: Patch cleanup
-	* ntpd/ntp_timer.c: Patch cleanup
-	From: qli@huey.udel.edu
-
-Wed Jul 29 15:23:21 1998  Harlan Stenn  
-
-	* libntp/machines.c: IRIX needs time.h
-	Reported by: Judith E Bush 
-
-	* ntpd/ntpd.c (service_main): Better AIX PROCLOCK fix.
-	From: Matt Ladendorf  and
-	Grover Davidson 
-
-Wed Jul 29 01:36:48 1998  Harlan Stenn  
-
-	* include/ntpd.h (MAXINTERFACES): Moved here...
-	* ntpd/ntp_io.c: From here...
-	(create_sockets): Only deal with MAXINTERFACES.
-	(create_sockets): Only deal with specified interfaces.
-
-	* ntpd/ntp_config.c (CONFIG_LISTEN): Added
-	Added ifnum and listenaddrs[]
-	(getconfig): Added defn for "addr"
-	(getconfig): Initialize ifnum.
-
-	* ntpd/ntpd.c (service_main): call init_io after getconfig
-	From: Vebjorn Ljosa 
-
-Wed Jul 29 00:42:28 1998  Harlan Stenn  
-
-	* ntpd/refclock_palisade.c: Use NEED_HPUX9_TIOCM_STUFF
-
-	* acconfig.h (NEED_HPUX9_TIOCM_STUFF):  Added.
-
-	* configure.in (REFCLOCK_PALISADE): Needs termio*.h
-	(NEED_HPUX9_TIOCM_STUFF): Added.
-
-	* ntpd/ntp_io.c (create_sockets): Use strchr instead of strstr.
-
-	* libntp/mktime.c: #include 
-
-	* libntp/ieee754io.c: #include 
-
-Wed Jul 29 00:24:22 1998  Harlan Stenn  
-
-	* ntpd/refclock_acts.c (ACTS_MAXPOLL): 14 -> 18.
-	Import current_nextdate
-	(acts_receive): Update peer->nextdate with current_nextdate
-	(acts_poll): Call acts_timeout() (debugging)
-
-	* ntpd/ntp_refclock.c: Export current_nextdate.
-	(refclock_transmit): Check peer->valid >= NTP_SHIFT - 2, not >.
-	(refclock_transmit): hpoll wiggles, update current_nextdate
-
-	* ntpd/ntp_timer.c: #include "ntp_refclock.h"
-	(MODE_MANUAL): Added.
-	(timer): MODE_MANUAL stuff
-
-	From: qli@huey.udel.edu
-
-Tue Jul 28 23:23:15 1998  Harlan Stenn  
-
-	* configure.in: Check for inet_ntoa in -lbind .
-
-	* ntpd/ntpd.c: #undef PROCLOCK for AIX.
-
-Mon Jul 20 01:06:24 1998  Harlan Stenn  
-
-	* configure.in (AC_TYPE_SIZE_T): Added.
-
-Sat Jul 11 09:38:30 1998  Harlan Stenn  
-
-	* configure.in: 4.0.73e
-
-	* ports/winnt/: Replaced with new code (no SHM or PALISADE)
-	From: Greg Schueman 
-
-Fri Jul 10 12:12:59 1998  Harlan Stenn  
-
-	* configure.in: 4.0.73d
-
-	* include/ntp_machine.h (HAVE_SRANDOM): VxWorks patches
-	(HAVE_RANDOM): Ditto.
-	(CALL): Ditto.
-	From: Casey Crellin 
-
-	* ntpd/refclock_parse.c (local_input): Typo.
-	Reported by: Tony Li 
-
-Wed Jul  8 01:49:01 1998  Harlan Stenn  
-
-	* configure.in: 4.0.73c
-
-	* PARSE patches from Frank Kardel
-
-	* libntp/machines.c (ntp_set_tod): Get it right.
-
-Sun Jul  5 22:15:34 1998  Harlan Stenn  
-
-	* configure.in: 4.0.73a
-
-	* kernel/sys/timex.h (MOD_CANSCALE): Add rest of patch to handle
-	scaling.
-	From: Poul-Henning Kamp 
-
-Wed Jun 10 21:16:01 1998  Harlan Stenn  
-
-	* configure.in: 4.0.73
-
-	* ntpd/ntp_loopfilter.c (local_clock): MOD_CANSCALE patches, and
-	be careful with the integration if we're nearly perfect.
-	From: Poul-Henning Kamp 
-
-	* util/tickadj.c (main): Typo fix...
-	From: Marion Hakanson 
-
-	* ntpd/ntp_io.c (create_sockets): Attempt to ignore alias
-	interfaces.
-	From: Kenneth Maupin 
-
-	* ntpd/ntp_refclock.c: PPS fixes
-	* ntpd/refclock_msfees.c (msfees_start): Portability fixes and
-	PPS/STREAM enhancements
-	From: John Hay 
-
-	* ntpd/ntp_refclock.c (refclock_gtlin): Patch...
-	From: Jonathan Stone 
-
-Sun Jun 28 18:43:30 1998  Frank Kardel  
-
-	* libntp/buftvtots.c (buftvtots): using WORD_BIGENDIAN instead of XNTP_BIG_ENDIAN
-
-	* libparse/clk_trimtsip.c (getflt): fixed ENDIAN issue
-	(getdbl): fixed ENDIAN issue
-	(getint): use get_msb_short()
-	(cvt_trimtsip): use gpstolfp() for conversion
-
-	* libntp/Makefile.am (libntp_a_SOURCES): added gpstolfp.c source
-
-	* libntp/binio.c: added {get,put}_msb_{short,long}() functions
-
-	* include/ntp_fp.h: added gpstolfp() prototype
-
-	* include/binio.h: added binio MSB prototypes
-
-Sat Jun 13 13:48:17 1998  Frank Kardel  
-
-	* parseutil/testdcf.c: signed/unsigned
-	SYSV clock name clash fixed
-
-	* parseutil/dcfd.c: signed/unsigned
-	SYSV clock name clash fixed
-	year wrapping at 1998
-	ctype macros take ints as args
-
-	* ntptrace/ntptrace.c (decodeipaddr): ctype macros take ints as args
-
-	* ntpq/ntpq_ops.c (doprintpeers): signed/unsigned
-
-	* ntpq/ntpq.c: ctype macros take ints as args
-	signed/unsigned
-
-	* ntpdc/ntpdc.c: signed/unsigned
-
-	* ntpd/refclock_usno.c: signed/unsigned
-
-	* ntpd/refclock_true.c (true_send): signed/unsigned, name clashes
-
-	* ntpd/refclock_parse.c: signed/unsigned, name clashes
-
-	* ntpd/refclock_nmea.c (nmea_receive): ctype macros take ints as args
-
-	* ntpd/refclock_heath.c (heath_receive): prototypes (signed/unsigned issues)
-
-	* ntpd/refclock_arc.c: prototypes (signed/unsigned issues)
-
-	* ntpd/refclock_acts.c: prototypes (signed/unsigned issues)
-
-	* ntpd/ntpd.c: prototypes (signed/unsigned issues)
-
-	* ntpd/ntp_util.c (getauthkeys): prototypes (signed/unsigned issues)
-	fix SYSV clock name clash
-
-	* ntpd/ntp_request.c: prototypes (signed/unsigned issues)
-	fix SYSV clock name clash
-
-	* ntpd/ntp_io.c (input_handler): variable naming, signed/unsigned
-
-	* ntpd/ntp_intres.c (readconf): signed/unsigned issues
-
-	* ntpd/ntp_control.c: prototypes (signed/unsigned issues)
-	fix SYSV clock name clash
-
-	* ntpd/ntp_config.c: fix SYSV clock name clash
-        ctype macros take ints as args
-
-	* libparse/parsestreams.c: dirt (debug) removed
-
-	* libparse/parsesolaris.c: more prototypes
-	fix name clashes
-	allow for ansi2knr
-
-	* libparse/parse.c: bcopy/memcpy cleanup
-	fix SYSV clock name clash
-
-	* libparse/clk_trimtsip.c (cvt_trimtsip): fix SYSV clock name clash
-
-	* libparse/clk_trimtaip.c (cvt_trimtaip): fix SYSV clock name clash
-
-	* libparse/clk_schmid.c (cvt_schmid): fix SYSV clock name clash
-
-	* libparse/clk_rcc8000.c (cvt_rcc8000): fix SYSV clock name clash
-
-	* libparse/clk_rawdcf.c (cvt_rawdcf): fix SYSV clock name clash
-
-	* libparse/clk_hopf6021.c (cvt_hopf6021): fix SYSV clock name clash
-
-	* libparse/clk_dcf7000.c (cvt_dcf7000): fix SYSV clock name clash
-
-	* libparse/clk_computime.c: fix SYSV clock name clash
-
-	* libntp/octtoint.c (octtoint): ctype macros take ints as args
-
-	* libntp/mstolfp.c (mstolfp): ctype macros take ints as args
-
-	* libntp/hextolfp.c (hextolfp): ctype macros take ints as args
-
-	* libntp/hextoint.c (hextoint): ctype macros take ints as args
-
-	* libntp/decodenetnum.c (decodenetnum): ctype macros take ints as args
-
-	* libntp/atouint.c (atouint): ctype macros take ints as args
-
-	* libntp/atolfp.c (atolfp): ctype macros take ints as args
-
-	* libntp/atoint.c (atoint): ctype macros take ints as args
-
-	* kernel/sys/parsestreams.h:  STREAM macro gone in favor of HAVE_SYS_STREAM_H
-
-	* include/parse.h: STREAM macro gone in favor of HAVE_SYS_STREAM_H
-
-Fri Jun 12 11:08:53 1998  Frank Kardel  
-
-	* ntpd/ntp_timer.c: prototype fixes (ansi2knr/knr compiler)
-
-	* ntpd/ntp_proto.c (make_keylist): type cast for e(!!!)malloc()
-
-	* libparse/Makefile.am: adjust for ansi2knr
-
-	* libntp/ieee754io.c: ansi2knr compatibility
-
-	* include/ntp_refclock.h: added pps_sample() extern declaration
-	added refclock_process_offset() extern declaration
-
-	* include/ntp.h: fixed function * prototypes
-
-	* ntpd/refclock_parse.c (bind): added input routine
-	(local_input): added input routine
-
-	* ntpd/ntp_io.c (input_handler): direct input processing for
-	refclocks to save input recv buffers
-
-	* include/ntp_refclock.h: added int io_input(struct recvbuf *)
-	pointer to allow direct processing of read refclock data in
-	order to save many bug recv buffers on single character input
-	(problem with "fast" machines)
-
-	* parse_conf.c:  conditional compile macros fixed
-
-	* parse.c:  conditional compile macros fixed
-	printf prototype
-
-	* clk_trimtaip.c:  conditional compile macros fixed
-	printf prototype
-
-	* clk_schmid.c:  conditional compile macros fixed
-	printf prototype
-
-	* clk_rcc8000.c:  conditional compile macros fixed
-	printf prototype
-
-	* clk_hopf6021.c:  conditional compile macros fixed
-	printf prototype
-
-	* clk_dcf7000.c: conditional compile macros fixed
-	printf prototype
-
-	* clk_computime.c: conditional compile macros fixed
-	printf prototype
-
-Sat Jun  6 07:41:54 1998  Frank Kardel  
-
-	* ntpd/refclock_palisade.c: fixed termio.h / termios.h inclusion
-
-	* include/ntp_refclock.h: made refclockproc/clockdesc const
-
-	* ntpd/ntp_control.c (ctl_putpeer): avoided ambigous 'else' (gcc)
-
-	* ntpd/refclock_parse.c (parse_start): added BURST mode initialisation
-
-	* scripts/stats/summary.sh (CLOCK): allow for Y2K log files
-
-	* libparse/clk_rawdcf.c: simplified condidional compile expression
-
-Wed May 27 08:10:43 1998  Frank Kardel  
-
-	* include/Makefile.am (noinst_HEADERS): added new header files
-	mbg_gps166.h binio.h ascii.h ieee754io.h
-
-	* ntpdc/ntpdc.c (sendrequest): fixed info_auth_keyid setting it
-	got accidentally trashed every other round
-
-Mon May 25 22:55:07 1998  Frank Kardel  
-
-	* configure.in: PARSE clocks are enabled by default whenever
-	possible (termio.h or termios.h present)
-	removed RAWDCF_SETDTR feature
-
-	* acconfig.h: removed RAWDCF_SETDTR option (now implicit by
-	compilation and run time configuration)
-
-	* ntpd/refclock_parse.c (rawdcf_init): offer a RAWDCF clock (type 14)
-	that attempts to set the DTR modem line for receiver power
-
-	* libparse/clk_meinberg.c (cvt_meinberg): support current standard
-	Meinberg data formats
-
-Sun May 24 09:43:19 1998  Frank Kardel  
-
-	* libparse/clk_rawdcf.c (pps_rawdcf): trigger pps on zero going
-	edge - that is simpler wiring (Rx->DCD).
-
-	* parseutil/testdcf.c (wday): const keyword
-
-	* parseutil/dcfd.c (cvt_rawdcf): sign issues and calling interfaces
-
-	* ntpq/ntpq.c (MAXVARLEN): adjusted internal buffer length for
-	variable values
-
-	* ntpd/refclock_parse.c: adjust to new io handling (fixed formats
-	only)
-	(mkreadable): don't include >"< in readable ASCII output (-> ntpq
-	parsing)
-	output debug messages to stdout instead of msyslog()
-	fixed version information string
-
-	* ntpd/refclock_atom.c (pps_sample): new auxiliary pps interface
-
-	* libparse/parsestreams.c (parserput): get event status consistent
-	with direct calls
-	(zs_xsisr): simulate CARRIER status to avoid unnecessary M_xHANGUP
-	events
-
-	* libparse/parsesolaris.c (parserput): get event status consistent
-	with direct calls
-	(zs_xsisr): simulate CARRIER status to avoid unnecessary M_xHANGUP
-	events
-
-	* libparse/parse.c: removed old input cruft
-	(parse_restart): new generic input help function
-	(parse_addchar): ditto
-	(parse_end): ditto
-	(pps_one): new generic pps help function
-	(pps_zero): ditto
-
-	* libparse/clk_trimtsip.c (clock_trimtsip =): new input handling
-
-	* libparse/clk_trimtaip.c (clock_trimtaip =): new input handling
-	(inp_trimtaip): new input handler
-
-	* libparse/clk_schmid.c (clock_schmid =): new input handling
-	(inp_schmid): new input handler
-
-	* libparse/clk_rcc8000.c (clock_rcc8000 =): new input handling
-	(inp_rcc8000): new input handler
-
-	* libparse/clk_rawdcf.c (clock_rawdcf =): new input handling
-	(snt_rawdcf): adjusted to new input handling
-	(inp_rawdcf): new input handler
-
-	* libparse/clk_meinberg.c (clock_meinberg): new input handling
-	(gps_input): new input handler
-	(mbg_input): new input handler
-
-	* libparse/clk_hopf6021.c (clock_hopf6021 =): new input handling
-	(inp_hopf6021): new input handler
-
-	* libparse/clk_dcf7000.c (clock_dcf7000 =): new input handling
-	(inp_dcf7000): new input handler
-
-	* libparse/clk_computime.c (clock_computime =): new input handling
-	(inp_computime): new input handler
-
-	* libparse/Makefile.am: link kernel module with libntp.a
-
-	* include/parse.h (struct parse): removed old data structure cruft
-	(new input model) new PARSE_INP* macros for input handling
-	removed old SYNC_* macros from old input model
-	(struct clockformat): removed old parse functions in favor of the
-	new input model
-	updated prototypes
-
-	* include/ntp_refclock.h: prototype for refclock_atom pps_sample()
-	interface
-
-	* acconfig.h: added PPS_SAMPLE define
-	* configure.in (LIBPARSE): added PPS_SAMPLE configuration
-	
-
-	* libntp/systime.c (adj_systime): debug output (> level 6) for
-	adjtime results
-
-	* libntp/mfp_mul.c (mfp_mul): controlled debug output
-
-	* libntp/ieee754io.c (get_byte): controlled debug output
-	(fetch_ieee754): ditto
-	(put_ieee754): ditto
-
-Tue May  5 20:09:51 1998  Harlan Stenn  
-
-	* configure.in: document DES is not usually present.
-
-Wed Apr 29 22:00:22 1998  Harlan Stenn  
-
-	* configure.in: 4.0.72h
-
-	* authstuff/Makefile.am (check-local-rsn): check-local doesn't
-	work with RSAREF...
-	Reported by: "Auteria Wally Winzer Jr." 
-
-	* libntp/machines.c: the settime() choices were ordered badly.
-	Reported by: Michael Joosten 
-
-Sat Apr 25 00:35:53 1998  Harlan Stenn  
-
-	* configure.in (ac_cv_var_no_parenb_ignpar): Undo the kernel PLL
-	block I just installed - Dave wants to control this via
-	KERNEL_FLL_BUG.
-
-Fri Apr 24 20:35:57 1998  Harlan Stenn  
-
-	* libntp/Makefile.am (libntp_a_DEPENDENCIES): Set per libntp_a_LIBADD
-
-	* configure.in: Do a better job of blocking kernel PLL under
-	solaris2.6.
-
-Fri Apr 24 00:41:12 1998  Harlan Stenn  
-
-	* configure.in: 4.0.72f
-	(ac_cv_struct_nlist_n_un): Don't look for ntp_adjtime or
-	ntp_gettime under solaris2.6.
-
-	* ntpd/ntp_proto.c (process_packet): Give verbose error messages
-
-	* include/global.h (PROTOTYPES): Drive via HAVE_PROTOTYPES.
-
-Wed Apr 22 16:55:55 1998  Harlan Stenn  
-
-	* configure.in (ac_cv_var_use_des): Added. 4.0.72e.
-	* libntp/Makefile.am (libntp_a_LIBADD): Added DESOBJS
-
-Tue Apr 21 02:08:06 1998  Harlan Stenn  
-
-	* ntpd/refclock_arc.c (arc_receive): Typo...
-	From: Sam Steingold 
-
-Fri Apr 10 03:05:35 1998  Harlan Stenn  
-
-	* configure.in (ac_refclock_chu): AUDIO_CHU support.  Disabled by
-	default, and currently only supported on SunOS and Solaris.
-	* acconfig.h: AUDIO_CHU
-
-Wed Apr  8 19:53:53 1998  Harlan Stenn  
-
-	* libntp/Makefile.am (EXTRA_DIST): Added mktime.c
-
-	* configure.in:  AC_REPLACE_FUNCS(mktime).
-	(--enable-dst-minutes=60): Added, for (missing) mktime().
-
-	* ntpd/refclock_heath.c (heath_receive): Use mktime() instead of
-	the old hack.
-
-Tue Apr  7 21:15:14 1998  Harlan Stenn  
-
-	* configure.in (LIBOBJS): Hack it before AC_OUTPUT to deal with
-	ANSI2KNR-filtering rules.
-	From: Jim Meyering 
-
-Mon Apr  6 01:40:45 1998  Harlan Stenn  
-
-	* libntp/strerror.c: ANSIfy strerror's definition.
-
-Thu Mar 12 20:24:45 1998  Harlan Stenn  
-
-	* libntp/statestr.c: Only #include  if HAVE_CONFIG_H is
-	#define'd.
-	From: Sven Dietrich 
-
-Wed Mar 11 00:27:32 1998  Harlan Stenn  
-
-	* configure.in: Cygwin needs to check for the advapi32 library.
-	NT doesn't support a root user, so don't bother with getuid().
-	Also, don't bother with umask().
-
-	* ntpd/ntp_io.c: cygwin32 patches
-	* ntpd/ntp_proto.c: Ditto.
-	* ntpd/ntpd.c: Ditto.
-	* ntpd/ntp_timer.c: Ditto.
-	* ntpdate/ntpdate.c: Ditto.
-	* libntp/machines.c: Ditto.
-	* libntp/systime.c: Ditto.
-	* include/ntp_machine.h: Ditto.
-	* include/ntp_unixtime.h: Ditto.
-	From: Sven Dietrich 
-
-Tue Mar 10 22:26:14 1998  Harlan Stenn  
-
-	* configure.in (ac_cv_make_tickadj): Added.
-	Now that tickadj is the only(?) utility that cares about tick and
-	tickadj, we don't need to have NOKMEM and no PRESET_* be fatal.
-
-Sat Mar  7 02:57:17 1998  Harlan Stenn  
-
-	* ntpd/ntp_loopfilter.c (local_clock): Patch STA_FLL check
-	From: Poul-Henning Kamp 
-
-	* various: Renamed ACTS to CLOCK_ACTS, ARBITER to CLOCK_ARBITER,
-	ARCRON_MSF to CLOCK_ARCRON_MSF, AS2201 to CLOCK_AS2201, BANC to
-	CLOCK_BANC, DATUM to CLOCK_DATUM, GPSVME to CLOCK_GPSVME, HEATH to
-	CLOCK_HEATH, HPGPS to CLOCK_HPGPS, IRIG to CLOCK_IRIG, JUPITER to
-	CLOCK_JUPITER, LEITCH to CLOCK_LEITCH, MSFEES to CLOCK_MSFEES,
-	MX4200 to CLOCK_MX4200, NMEA to CLOCK_NMEA, PALISADE to
-	CLOCK_PALISADE, PARSE to CLOCK_PARSE, PPS720 to CLOCK_PPS720, PST
-	to CLOCK_PST, PTBACTS to CLOCK_PTBACTS, SHM_CLOCK to CLOCK_SHM,
-	ONCORE to CLOCK_ONCORE, TPRO to CLOCK_TPRO, TRAK to CLOCK_TRAK,
-	TRUETIME to CLOCK_TRUETIME, USNO to CLOCK_USNO, WWVB to CLOCK_WWVB
-
-	* Makefile.am (ETAGS_ARGS): Added acconfig.h
-
-	* various: Renamed LOCAL_CLOCK to CLOCK_LOCAL.
-
-	* configure.in: First cut at  *-pc-cygwin32 support
-	Requested by: Sven Dietrich 
-
-	* configure.in: gdt-surveying code is gone.  Sigh.
-	Reported by: Poul-Henning Kamp 
-
-Wed Mar  4 21:41:06 1998  Harlan Stenn  
-
-	* many places: Renamed ATOM to CLOCK_ATOM
-
-Tue Mar  3 03:18:13 1998  Harlan Stenn  
-
-	* ntpd/ntp_timer.c (timer): Only call refclock_transmit if
-	REFCLOCK is #define'd.
-	Reported by a bunch of folks.
-
-Mon Mar  2 03:46:07 1998  Harlan Stenn  
-
-	* configure.in (ntp_refclock): Use CLOCK_CHU, which no longer
-	needs any special headers.
-	* ntpd/refclock_chu.c: Call it CLOCK_CHU
-	(chu_receive): Define it correctly.
-
-	* include/winnt/sys/time.h (gettimeofday): Prototypes are OK.
-	(settimeofday): Prototypes are OK.
-	From: JJEVNISEK@qgraph.com
-
-	* ntpq/ntpq_ops.c: varlist name and value aren't const.
-	* ntpdc/ntpdc_ops.c (fudge): The flags are u_val, not val.
-	* ntpdc/ntpdc.c: const cleanup, exit cleanup.
-	* ntpd/refclock_wwvb.c (wwvb_receive): Move the definition of tz
-	somewhere more normal.
-	* ntpd/ntp_request.c (do_trustkey): kp gets u_long data, not
-	u_int32 (but Harlan thinks this patch may be wrong).
-	* ntpd/ntp_refclock.c (refclock_process): clocktime needs
-	offset.l_ui, not offset.l_i .
-	* ntpd/ntp_control.c (set_var): t isn't const.
-	* libntp/a_md5encrypt.c (session_key): Cast 2nd arg to MD5auth_setkey.
-	* include/ntpd.h: ctl_var's text field isn't const.
-	* include/ntp_refclock.h: clockdesc isn't const.
-	From: Marc Brett 
-
-	* ntpd/ntp_loopfilter.c (local_clock): Limit ntv.constant to
-	MAXTC, and log error returns from ntp_adjtime.
-	From: Juha Sarlin 
-
-Mon Mar  2 03:05:23 1998  Harlan Stenn  
-
-	* configure.in (ac_cv_var_kernel_fll_bug): KERNEL_FLL_BUG
-	* acconfig.h: KERNEL_FLL_BUG: added.
-	* ntpd/ntp_loopfilter.c (local_clock): Only avoid STA_FLL if
-	KERNEL_FLL_BUG is #define'd (Solaris2.6)
-
-Sat Feb 21 00:45:10 1998  Harlan Stenn  
-
-	* automake-1.2d.patches: Added ansi2knr.o rules.
-
-	* ntpd/refclock_tpro.c: P() stuff
-
-Fri Feb 20 20:10:20 1998  Harlan Stenn  
-
-	* configure.in: Improve the ${CC} -pipe test (cygwin-32's gcc -pipe
-	silently does nothing).
-	Reported by: Sven Dietrich 
-
-Wed Feb 18 00:51:08 1998  Harlan Stenn  
-
-* configure.in: 4.0.72 released.
-
-* configure.in:AC_REPLACE_FUNCS(strerror), check for poll.h, and deal
-  with the --enable-JUPITER stuff.
-* libntp/Makefile.am (libntp_a_LIBADD): Added (for strerror support).
-* libntp/clocktypes.c: Added REFCLK_GPS_JUPITER.
-* ntpdate/ntpdate.c: poll() support
-* ntpd/Makefile.am: Add refclock_jupiter.c
-* ntpd/refclock_conf.c: Added refclock_jupiter
-* ntpd/refclock_mx4200.c (mx4200_pps): Bugfixes.
-* include/ntp.h (REFCLK_GPS_JUPITER): Added, and bumped REFCLK_MAX.
-  From: Craig Leres 
-
-Mon Feb 16 21:02:42 1998  Harlan Stenn  
-
-	* ntpd/ntp_proto.c: P()
-
-Mon Feb 16 12:43:11 1998  Harlan Stenn  
-
-* include/ntp_types.h: Added P() prototyping hack back in.
-* include/parse.h: Ditto.
-* include/ntpd.h:  Ditto.
-* include/ntp_unixtime.h:  Ditto.
-* include/ntp_stdlib.h: Ditto.
-* include/ntp_select.h: Ditto.
-* include/ntp_refclock.h: Ditto.
-* include/ntp_fp.h: Ditto.
-* include/md5.h: Ditto.
-* include/ntp_filegen.h: Ditto.
-* include/ntp_calendar.h: Ditto.
-* include/l_stdlib.h: Ditto.
-
-	* configure.in (ACTS): Sometimes, TIOCMBIS is in sys/ioctl.h
-	  Reported by Kenneth Jaldehag 
-	* configure.in (HEATH): Ditto.
-	* configure.in (PTBACTS): Ditto.
-	* configure.in (USNO): Ditto.
-
-Sat Feb 14 00:02:14 1998  Harlan Stenn  
-
-	* ntpd/refclock_irig.c (irig_rf): Rename sincos[] to sin_cos[].
-
-Fri Feb 13 22:22:08 1998  Harlan Stenn  
-
-	* include/ntp.h (RANDPOLL): Use random or mrand48.
-	* ntpd/ntp_config.c (do_resolve_internal): Ditto.
-	* ntpd/ntp_peer.c (unpeer): Ditto.
-	* ntpd/ntp_proto.c (make_keylist): Ditto.
-
-	* ntpd/ntpd.c (xntpdmain): Use srandom or srand48.
-
-	* configure.in: Look for {s,}random() and [ms]rand48().
-
-Wed Feb 11 22:50:24 1998  Harlan Stenn  
-
-	* ntpd/ntp_restrict.c (hack_restrict): Renamed restrict()
-	* include/ntpd.h: Ditto
-	* ntpd/ntp_request.c (do_restrict): Ditto
-	* ntpd/ntp_config.c (getconfig):
-	* ntpd/ntp_io.c (create_sockets): Ditto.
-
-1998-01-23  Harlan Stenn  
-
-	* ntpd/refclock_irig.c: Allow either  or
-	 .  From Dave Mills.
-
-	* configure.in: Under SunOS, it's sun/audioio.h .
-
-1998-01-22  Harlan Stenn  
-
-	* html/driver6.html: Updated header file info
-	* html/irig.html: Ditto.
-	* configure.in: sys/bsd_audioirig.h replaced with sys/audioio.h
-	for new irig driver that Dave installed.
-
-1998-01-08  Harlan Stenn  
-
-	* Many places: Lose the P(()) prototype stuff
-
-	* util/tickadj.c (writevar): Make offset an off_t
-	(readvar): Ditto
-	(getoffsets): Make offsets off_t
-
-	* adjtimed/adjtimed.c (GetClockRate): Fix lseek arg 2.
-	(SetClockRate): Ditto
-
-	* Many things in many places from many people.
-
-	* configure.in: Added AC_TYPE_OFF_T
-
-1997-11-26  Harlan Stenn  
-
-	* ntpd/refclock_palisade.c: ANSIfied.
-
-Wed Sep  3 23:51:44 1997  Harlan Stenn  
-
-	* configure.in (AM_C_PROTOTYPES): Added.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Added ansi2knr.
+  aclocal.m4
+    1.86 01/08/01 23:01:10 stenn@whimsy.udel.edu +0 -0
+    * configure.in: 4.1.0
 
diff --git a/contrib/ntp/ChangeLog-4.1.0 b/contrib/ntp/ChangeLog-4.1.0
new file mode 100644
index 0000000..69b566e
--- /dev/null
+++ b/contrib/ntp/ChangeLog-4.1.0
@@ -0,0 +1,6152 @@
+2001-08-01  Harlan Stenn  
+
+	* configure.in: 4.1.0
+
+2001-07-27  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c (oncore_start): Set pps_enable=1, just
+	like the atom driver does.
+	From: reg@dwf.com
+
+	* ntpd/refclock_nmea.c (nmea_ppsapi): Set pps_enable=1, just like
+	the atom driver does.
+	From: Scott Allendorf 
+
+	* ntpd/ntp_config.c (getconfig): CONF_CLOCK_PANIC was using the
+	wrong config flag.
+	From: 
+
+2001-07-10  Harlan Stenn  
+
+	* configure.in: 4.0.99m-rc3
+
+2001-07-06  Harlan Stenn  
+
+	* ntp_update: COPYRIGHT needs a touch.
+	From: Mike Stump 
+
+2001-07-04  Harlan Stenn  
+
+	* html/config.htm: Major cleanup.
+	From: Martin Janzen 	
+
+	* configure.in (rt library check): Don't look for -lrt under
+	Linux.  Under glibc-2.1.2 and -2.2.2 (at least), the POSIX-
+	compatibility real-time library does strange things with threads
+	as other processes and we're getting lots of complaints about it.
+	Reported by: Juha Sarlin 
+	
+2001-06-30  Harlan Stenn  
+
+	* html/driver35.htm: Update email address.
+
+2001-06-25  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c (oncore_msg_BaEaHa): Fix wrong offset for
+	rsm.bad_almanac
+	From: Reynir Siik 
+
+2001-06-12  Harlan Stenn  
+
+	* configure.in: 4.0.99m-rc2
+
+2001-06-10  Harlan Stenn  
+
+	* ntpd/ntp_config.c:
+	* include/ntp_config.h: includefile config keyword support
+	From: Dean Gibson 
+
+2001-06-08  Harlan Stenn  
+
+	* configure.in: 4.0.99m-rc1b
+
+	* ntpd/refclock_true.c (true_debug): Bump some buffer sizes to
+	reduce/eliminate chance of buffer overflow.  Use snprintf()
+	instead of sprintf().  Do a better job of opening the debug file.
+	* ntpd/ntp_control.c (ctl_getitem): Count overflow packets as bad
+	and return a BADFMT.
+	* ntpd/ntp_config.c (save_resolve): call fdopen() with the correct
+	mode.
+	From: Bela Lubkin 
+
+2001-06-03  Harlan Stenn  
+
+	* include/ntp.h (RES_ALLFLAGS): Add RES_DEMOBILIZE.
+	From: Dean Gibson 
+
+	* configure.in: 4.0.99m-rc1a
+
+2001-06-02  Harlan Stenn  
+
+	* ntpd/ntp_refclock.c (refclock_open): Add O_NOCTTY to the open()
+	flags when opening a serial port.
+	Reported by: joseph lang 
+
+2001-05-31  Harlan Stenn  
+
+	* html/notes.htm: Typo fix.
+	From: John Stone 
+
+	* configure.in: 4.0.99m-rc1
+
+	* html/monopt.htm: Typo fix.
+	* html/confopt.htm: Cruft removal.
+	From: John Stone 
+
+2001-05-30  Harlan Stenn  
+
+	* README.cvs: More updates and cleanup.
+
+	* ntpd/ntp_loopfilter.c (loop_config): 
+	Check against STA_NANO instead of (NTP_API > 3) to catch kernels
+	that were rolled while the spec was evolving.
+	From: John.Hay@icomtek.csir.co.za
+
+	* README.cvs: Note that we want to check out NTP into a clean
+	subdir.
+	Reported by jrd@cc.usu.edu (Joe Doupnik)
+
+2001-05-27  Harlan Stenn  
+
+	* configure.in: 4.0.99k40
+
+	* include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
+	to use most recent MAXSTAGE entries when the filter overflows (ie
+	driver poking say once per second with poll > MAXSTAGE) rather
+	than blocking after MAXSTAGE entries (turf oldest rather than turf
+	most recent).
+	From: John Woolner 
+
+	* ntpd/refclock_true.c:
+	   a. Don't cream pp->a_lastcode when we get a  pair 
+	   b. Fix up pp->leap handling to work correctly 
+	   c. clear CEVNT_BADTIME etc warnings when we get good clock 
+	CEVNT_NOMINAL. 
+	From: John Woolner 
+
+	* kernel/sys/pcl720.h:
+	Add support for the XL clock to refclock_true.c 
+	From: Paul A Vixie  
+
+	* ntpd/ntp_loopfilter.c (local_clock): One more attempt at
+	"improving" the panic message.
+
+2001-05-26  Harlan Stenn  
+
+	* configure.in (ac_cv_func_ctty_for_f_setown): BSDI3 needs a ctty
+	for F_SETOWN, too.
+	From: Paul A Vixie 
+
+2001-05-24  Harlan Stenn  
+
+	* html/ntpd.htm: Typo.
+	From: John Stone 
+
+2001-05-23  Harlan Stenn  
+
+	* configure.in: 4.0.99k39
+
+	* ntpd/ntp_loopfilter.c (local_clock): huffpuff cleanup/improvements.
+	(huffpuff): Cleanup/improvements.
+	(loop_config): huffpuff initialization cleanup/improvements.
+	From: Dave Mills, Terje, Mark, and John?
+
+2001-05-22  Harlan Stenn  
+
+	* html/release.htm:
+	* html/ntpd.htm:
+	* html/miscopt.htm:
+	From: Dave Mills: Updates.
+
+2001-05-21  Harlan Stenn  
+
+	* configure.in: 4.0.99k38
+
+	* ntpd/ntp_proto.c (clock_filter): Huff-n-Puff and Popcorn
+	improvements.
+	* ntpd/ntp_loopfilter.c (local_clock): Debug cleanup
+	From: Dave Mills.
+
+	* include/ntp_syscall.h (ntp_gettime): Updated patch from Ulrich.
+	My original attempt was not backwards compatible.
+
+2001-05-17  Harlan Stenn  
+
+	* include/ntp_syscall.h (ntp_gettime): Fill in the tai member.
+	From: Ulrich Windl 
+
+	* configure.in: 4.0.99k37
+
+	* ntpd/ntp_proto.c (clock_filter): Lose "off", xtemp and ytemp,
+	and some obsoleted calculations.  Set the peer->offset and
+	peer->delay from the filter stages.
+
+	* ntpd/ntp_loopfilter.c: Comment/document improvements.
+	(local_clock): correct the offset by one-half the difference
+	between the sample delay and minimum delay.  Lose "mu" from the
+	debug message.
+	From: Dave Mills.
+
+2001-05-15  Harlan Stenn  
+
+	* configure.in: 4.0.99k36
+
+	* ntpd/ntp_loopfilter.c: Huff-n-puff cleanup
+	From: Dave Mills.
+
+2001-05-14  Harlan Stenn  
+
+	* configure.in: 4.0.99k35
+
+	* ntpd/refclock_atom.c (atom_ppsapi): set pps_enable=1 if
+	enb_hardpps.
+	* ntpd/ntp_timer.c: huffpuff support.
+	(init_timer): huffpuff support.
+	(timer): huffpuff support.
+	* ntpd/ntp_proto.c (init_proto): Initialize pps_enable to 0, not 1.
+	* ntpd/ntp_loopfilter.c (CLOCK_HUFFPUFF): Added.
+	Add huff-n-puff filter variables.
+	(local_clock): Lose "pps sync enabled" log noise.
+	(huffpuff): Added.
+	(loop_config): LOOP_MINPOLL and LOOP_ALLAN were missing the
+	trailing break; add LOOP_HUFFPUFF.
+	* ntpd/ntp_config.c: tinker huffpuff added.
+	(getconfig): CONF_CLOCK_HUFFPUFF support.
+	* include/ntpd.h: huffpuff() declaration.
+	* include/ntp_config.h (CONF_CLOCK_HUFFPUFF): Added.
+	* include/ntp.h (HUFFPUFF): Added.
+	(LOOP_HUFFPUFF): Added.
+	From: Dave Mills.
+
+2001-05-11  Harlan Stenn  
+
+	* html/driver20.htm: Reality check.
+	* ntpd/refclock_nmea.c: Comment cleanup
+	From: John Woolner 
+
+	* html/release.htm: Cleanup (at least).
+	* html/refclock.htm: Cleanup (at least).
+	* html/kern.htm: Cleanup (at least).
+	* html/index.htm: Cleanup (at least).
+	* html/extern.htm: Cleanup (at least).
+	* html/driver1.htm: Cleanup (at least).
+	* html/debug.htm: Cleanp (at least).
+	* html/accopt.htm: KoD documentation update.
+	From: Dave Mills.
+
+	* configure.in: 4.0.99k34
+
+	* ntpd/ntp_util.c (record_loop_stats): values are now passed in.
+	* ntpd/ntp_loopfilter.c (local_clock): pass the values to
+	record_loop_stats().
+	* include/ntpd.h: Pass the parameters in to record_loop_stats().
+	With the discipline loop opened (disable ntp) the local clock
+	updates were not being sent to loopstats. That now is.
+	From: Dave Mills.	
+
+2001-05-10  Harlan Stenn  
+
+	* configure.in: 4.0.99k33
+
+	* ntpd/ntp_proto.c (receive): Validate the source port.  Lose
+	NTPv1 support.
+	* ntpd/ntp_loopfilter.c (local_clock): Sanity check sys_poll
+	earlier instead of later.
+	From: Dave Mills.
+
+	* ntpd/refclock_oncore.c (oncore_msg_any): We don't always have
+	GETTIMEOFDAY().
+
+2001-05-09  Harlan Stenn  
+
+	* ntpd/refclock_shm.c (shm_poll): Apply JAN_1970 correction after
+	calling TVTOTS(), just like everybody else does.
+	From: David Malone 
+
+	* ntpd/refclock_ulink.c: fixed 33x quality flag, added more
+	debugging stuff, updated 33x time code explanation.
+	From: s.l.smith (via j.c.lang).
+
+2001-05-08  Harlan Stenn  
+
+	* configure.in: 4.0.99k32
+
+	* ntpd/ntp_loopfilter.c: rstclock now takes a 3rd argument, the
+	last offset.
+	(init_loopfilter): Use it.
+	(local_clock): Use it.  Clean up the code.
+	(loop_config): Use it.
+	(rstclock): Implement it.  Clean up the code.
+	From Dave Mills.
+
+2001-05-06  Harlan Stenn  
+
+	* configure.in: 4.0.99k31
+
+	* ntpdc/ntpdc_ops.c (sysstats): That's 'bad packet format'
+	(instead of '... length'), and 'packets rejected' (instead of
+	'limitation rejects'.
+	* ntpd/ntp_proto.c (receive): PUBKEY fixes.  Move KoD stuff to
+	process_packet().
+	(process_packet):  Move KoD stuff here... 
+	(peer_clear): Unspec the stratum, too.
+	(clock_filter): Don't update peer->epoch here.  Fix the filter
+	test when checking the epoch.
+	(fast_xmit): Send back STRATUM_UNSPEC on a KoD packet.
+	(init_proto): Initialize sys_jitter.
+
+	* ntpd/ntp_loopfilter.c: rstclock() takes 2 parameters now.
+	(init_loopfilter): Use it...
+	(local_clock): Ditto, and change the "mu" calculation.  Improve
+	the jitter test in S_SYNC.  Use peer->epoch (not current_time) to
+	update the last_time.  Update debug info.
+	(rstclock): 2nd arg - the epoch to use.  Use it.
+	(loop_config): update call to rstclock.
+	From: Dave Mills.
+
+2001-05-01  Harlan Stenn  
+
+	* ports/winnt/ntpd/ntpd.dsp: Add cmd_args.c
+	From: Wink Saville 
+
+2001-04-29  Harlan Stenn  
+
+	* ntpq/ntpq.c (tstflags): 11 now.
+	From: John Cochran 
+
+	* ntpd/ntp_proto.c (receive): KoD updates.  Improve the comments.
+	Lose the AM_PROCPKT restrictions test.
+	(peer_xmit): Check/report on no encryption key in packet.
+	(fast_xmit): Use peer_xmit's new packet length check code.
+	From  Dave Mills.
+
+2001-04-28  Harlan Stenn  
+
+	* configure.in: 4.0.99k30
+
+2001-04-27  Harlan Stenn  
+
+	* ntpdc/ntpdc_ops.c: Added "kod", lost "demobilize".
+	* ntpd/ntp_config.c: Added "kod" keyword.  Lose "demobilize" keyword.
+	* html/release.htm: Updated.
+	* html/accopt.htm: Updated.
+	From: Dave Mills.
+
+	* ntpq/ntpq.c: Reorder and add some TEST flag bits.
+	* ntpd/ntp_proto.c (transmit): Also bail if access denied.
+	(receive): Lose RES_DEMOBILIZE and (some?) RES_DONTSERVE and
+	RES_LIMITIED stuff.  Update Kiss-Of-Death (KoD) docs.
+	Call fast_xmit with new 3rd parameter (restrict_mask).
+	Before checking for an authentic packet, check the restrict_mask
+	for RES_{DONTSERVE,LIMITED,NOPEER}.
+	Check restrictions in AM_PROCPKT case.
+	(peer_clear): Don't lose the stratum if the peer->flags don't
+	indicate FLAG_REFCLOCK.
+	(fast_xmit): Take restrict mask as a new argument, and handle
+	KoD.  Reorder some code.
+	From: Dave Mills.
+
+2001-04-26  Harlan Stenn  
+
+	* ntpdc/ntpdc_ops.c: restrict/unrestrict support for version and
+	demobilize.  Implement demobilze.
+	* ntpd/ntp_proto.c (receive): Improve version testing, including
+	RES_DEMOBILIZE support.
+	(fast_xmit): Patches to kiss-of-death packet.
+	* ntpd/ntp_loopfilter.c (local_clock): S_SYNC case now also checks
+	abs(clock_offset) against CLOCK_PGATE*sys_jitter.
+	* ntpd/ntp_config.c: CONF_RES_DEMOBILIZE/demobilize support.
+	* include/ntp_config.h (CONF_RES_DEMOBILIZE): Added.
+	* include/ntp.h (RES_DEMOBILIZE): Added.
+	From Dave Mills.
+
+2001-04-25  Harlan Stenn  
+
+	* html/accopt.htm: Document the "version" parameter
+	From Dave Mills.
+
+	* ntpd/ntp_proto.c (fast_xmit): Implement DENY mode.
+	From Dave Mills.
+
+	* ntpd/ntp_config.c: Add the "allan" tinker variable.
+	From: Juha Sarlin 
+
+	* ntpd/refclock_hopfpci.c (hopfpci_start): Lose the "correct_any"
+	stuff - it's both obsolete and wrong.
+
+	* ntpd/ntp_proto.c (receive): Keep track of packet versions.
+	Implement RES_LIMITED.
+	* include/ntp_config.h (CONF_RES_LIMITED): 
+	* include/ntp.h (RES_LIMITED): Leave the bits in the original
+	order.
+	From Dave Mills.
+
+	* util/timetrim.c:
+	* util/Makefile.am:
+	* ntpdc/ntpdc_ops.c:
+	* ntpd/refclock_nmea.c:
+	* libntp/snprintf.c:
+	* configure.in:
+	* configure:
+	* config.h.in:
+	* aclocal.m4:
+	* acconfig.h:
+	Lint cleanup from: Marc Brett 
+
+	* ntpd/ntp_config.c: Add "version" support.
+	(getconfig): version support.
+	* include/ntp_config.h (CONF_RES_VERSION): Added.
+	* include/ntp.h (RES_VERSION): Added.
+	From: Dave Mills.
+
+	* include/ntp_machine.h (ifreq): WinNT cleanup
+
+2001-04-23  Harlan Stenn  
+
+	* configure.in: 4.0.99k29
+
+	* html/miscopt.htm: Document the "allan" tinker variable.
+	* ntpd/ntp_proto.c (clock_filter): Update comments.  Lose etemp;
+	we now use allan_xpt for this.
+	* ntpd/ntp_loopfilter.c: Added allan_xpt as a tinker variable.
+	Reorganize variables and improve comments.
+	(local_clock): Improve comments, use (new) allan_xpt instead of
+	CLOCK_ALLAN.  Fix test in S_SYNC state.  Update debug info.
+	(rstclock): No longer force allan_xpt to CVLOCK_ALLAN in S_FREQ,
+	S_SYNC, or default case.
+	(loop_config): Document dangerous tinker variables, and add
+	LOOP_ALLAN to the list.
+	* include/ntp_config.h (CONF_CLOCK_ALLAN): Added.
+	* include/ntp.h (LOOP_ALLAN): Added.
+	Allan intercept fixes from Dave Mills.
+
+	* scripts/mkver.in: Use the C locale so  the dates come out in a
+	consistent format.
+	From: ASANO Naoyuki 
+
+	* build: Run "config.status" before the "make" because it probably
+	saves time and trouble.  Probably...
+
+	* flock-build: Try building sequentially.
+
+2001-04-22  Harlan Stenn  
+
+	* configure.in (ac_cv_make_tickadj): Fix it right...
+
+	* util/ntp-genkeys.c: extern config_netinfo, too.
+
+	* util/hist.c:
+	* ntptrace/ntptrace.c:
+	* ntpq/ntpq.c:
+	* ntpdc/ntpdc.c:
+	* ntpdate/ntptimeset.c:
+	* ntpdate/ntpdate.c:
+	* ntpd/refclock_parse.c:
+	* ntpd/refclock_msfees.c:
+	* ntpd/refclock_jupiter.c:
+	* ntpd/ntp_refclock.c:
+	* ntpd/ntp_io.c:
+	* libparse/clk_wharton.c:
+	* libparse/clk_varitext.c:
+	* libparse/clk_trimtaip.c:
+	* libparse/clk_schmid.c:
+	* libparse/clk_rcc8000.c:
+	* libparse/clk_rawdcf.c:
+	* libparse/clk_meinberg.c:
+	* libparse/clk_hopf6021.c:
+	* libparse/clk_dcf7000.c:
+	* libparse/clk_computime.c:
+	Lint.  From: Simon Burge 
+
+2001-04-21  Harlan Stenn  
+
+	* ntpd/refclock_nmea.c (nmea_receive): Fixes.
+	From: John Woolner 
+
+	* util/ntp-genkeys.c: Declare check_netinfo, don't define it.
+	From: Jack Bryans 
+
+	* configure.in (RSASRCS): rsaref2 needs digit.h (I thought I fixed
+	this already).
+	
+	* configure.in (CFLAGS): Disable -Wconversion, enable
+	-Wmissing-prototypes, and allow for -Werror.
+	From: Simon Burge 
+
+	* util/ntp-genkeys.c (main): Reset the standard mask so the
+	symlinks are created with the standard mask.
+
+	* configure.in: 4.0.99k28
+
+	* ntpd/ntpd.c (ntpdmain): Use mode_t for umask value.
+
+	* util/ntp-genkeys.c: Create files with the right umask.
+
+	* util/ntp-genkeys.c: config_file should be declared, not defined.
+	* ntpd/refclock_mx4200.c (mx4200_pps): debug cleanup.
+	* ntpd/refclock_hopfser.c: If we're not using it, provide the _bs.
+	* ntpd/refclock_heath.c (heath_receive): Add missing "break"
+	statements.
+	* ntpd/ntp_proto.c: Lose extra definition of mode_ntpdate.
+	* librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Put RSASRCS
+	on the same line as rsaref.h to improve portability.
+	* libntp/msyslog.c: Lint cleanup.
+	From: Marc.Brett@westerngeco.com
+
+	* util/ntp-genkeys.c:
+	* ntpdate/ntpdate.c:
+	* ntpd/ntp_config.c: Netinfo header reorder.
+	From: Jack Bryans 
+
+	* configure.in: timespec can be found by looking in goofy places
+	under SunOS.
+
+2001-04-20  Harlan Stenn  
+
+	* ntpd/refclock_nmea.c:  PPSAPI cleanup, default to RMC sentences,
+	handle milliseconds, multiple sentences, other good stuff.
+	From: John Woolner , Marc.Brett@westerngeco.com,
+	John.Hay@icomtek.csir.co.za
+
+	* ntpd/ntp_proto.c (receive): In the AM_NEWBCL case, return in all
+	cases at the end.
+	* ntpd/ntp_peer.c (newpeer): Check cast_flags against MDF_BCLNT,
+	not against MDF_BCAST.
+	* ntpd/ntp_loopfilter.c (local_clock): Lose debug info.
+	* ntpd/ntp_crypto.c (crypto_recv): Bugfix.
+	From: Dave Mills.
+
+	* configure.in: 4.0.99k27
+
+	* ntpd/ntp_loopfilter.c (local_clock): Check clock_panic > 0.
+	Check clock_max > 0.
+	* html/ntpd.htm: Cleanup.
+	* html/miscopt.htm: Cleanup.
+	* html/confopt.htm: Cleanup minpoll documentation.
+	From: Dave Mills.
+
+2001-04-19  Harlan Stenn  
+
+	* ntpd/cmd_args.c (getstartup): check_netinfo needs an extern
+	declaration.
+	Reported by: Jack Bryans 
+
+	* configure.in (ac_cv_make_timetrim): Added.
+	* util/Makefile.am (bin_PROGRAMS): MAKE_TIMETRIM
+	Requested by: Jack Bryans 
+
+	* configure.in: 4.0.99k26
+
+	* util/ntp-genkeys.c:
+	* ntpd/refclock_oncore.c:
+	* ntpd/ntp_peer.c:
+	* libntp/msyslog.c:
+	* libntp/audio.c:
+	Lint cleanup.
+	From: Simon Burge 
+
+	* ntpd/ntp_loopfilter.c (local_clock): debug message improvements
+	from Dave Mills.
+
+	* libntp/emalloc.c (emalloc): Tell people we are exiting if we log
+	an out-of-memory condition.
+
+	* util/ntp-genkeys.c (main): Don't allow '#' in a generated MD5
+	key.  Reported by: Dave Tyson 
+
+2001-04-18  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (clock_update): minpoll cleanup.
+	(clock_select): minpoll cleanup.
+	(clock_filter): Bugfixes from Mark Martinec 
+	* ntpd/ntp_loopfilter.c (rstclock): minpoll cleanup.  Debug cleanup.
+	* ntpd/ntp_config.c (getconfig): Initialize/bounds check minpoll
+	using NTP_MINDPOLL insted of sys_minpoll.
+	From: Dave Mills.
+
+2001-04-17  Harlan Stenn  
+
+	* libntp/msyslog.c:
+	* ElectricFence/page.c (stringErrorReport): Follow Rainer's lead
+	and use strerror().
+
+	* ntpd/refclock_shm.c (shm_start): Always use strerror. 
+	* libntp/msyslog.c (msyslog): Use strerror if present. 
+	From: Rainer Orth   
+
+	* libparse/parsesolaris.c (rdchar): Cast ~0 to unsigned long. 
+	* libntp/buftvtots.c (buftvtots): Allow for 8-byte tv_sec, tv_usec 
+	in struct timeval.
+	From: Rainer Orth  
+
+2001-04-16  Harlan Stenn  
+
+	* ntpd/ntp_config.c (getconfig): move "tinker" so it's generally
+	available.
+
+2001-04-15  Harlan Stenn  
+
+	* configure.in: Look for getclock().
+
+	* ntpd/ntp_config.c (getconfig): Squawk if provided minpoll or
+	maxpoll values are out of range.
+
+	* ntpd/ntp_proto.c (poll_update): Some operations can only be done
+	if we're compiling with some REFCLOCKs.
+	From Dave Mills.
+
+	* configure.in (RSASRCS): Added.
+	* librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Use RSASRCS.
+
+	* configure.in: Limit the DECL_HSTRERROR_0 to aix4.3.*.  RSN, we
+	could also limit it to xlc...
+
+	* configure.in: 4.0.99k25
+
+	* html/leap.htm: Added.
+	* html/index.htm: Update.
+	* html/driver7.htm: Update.
+	* html/driver6.htm: Update.
+	* html/driver36.htm: Update.
+	* html/audio.htm: Update.
+	* html/y2k.htm: Removed.
+	From Dave Mills.
+
+2001-04-14  Harlan Stenn  
+
+	* acconfig.h: Lose extra declarations of PACKAGE and VERSION.
+
+	* acconfig.h: 
+	* configure.in:
+	* include/l_stdlib.h: DECL_HSTRERROR_0 needed for xlc under AIX 4.3.2.
+	Reported by: Harald Barth 
+
+	* ntpd/ntp_proto.c (proto_config): cal_enable (PROTO_CAL) is
+	invalid if no refclocks are present.
+	From: Frodo Looijaard 
+
+	* README.cvs: On some systems, the -C option fails.
+
+	* ntpd/refclock_nmea.c:
+	* ntpd/ntp_refclock.c:
+	* html/driver20.htm:
+	PPSAPI patches for NMEA driver.
+	From: John.Hay@icomtek.csir.co.za
+
+        * README.rsa: Describe RSAEuro support, provide alternate rsa.c 
+	patch. 
+	* configure.in: Check for rsaeuro1, RSAOBJS, RSADIR respectively. 
+	* html/build.htm: Hint at rsaeuro1 directory. 
+	* include/global.h (BYTE): Define. 
+	* librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Removed rsaref2 
+	specific sources. 
+	(librsaref_a_LIBADD): Add appropriate objects. 
+	(librsaref_a_DEPENDENCIES): Work around automake limitation. 
+	(stamp-rsaref): Use RSADIR. 
+	* scripts/README: Document ntp-close. 
+	* scripts/Makefile.am (EXTRA_DIST): Distribute it. 
+	* Makefile.am (DISTCLEANFILES): Remove .warning.
+	* librsaref/Makefile.am (DISTCLEANFILES): Remove copied/touched
+	librsaref sources, stamp-rsaref.
+	* ntpdate/Makefile.am (DISTCLEANFILES): Remove version.c.
+	* ntpq/Makefile.am (DISTCLEANFILES): Likewise.
+	* parseutil/Makefile.am (DISTCLEANFILES): Remove $(EXTRA_PROGRAMS).
+	Rainer Orth  
+
+	* ntpd/ntp_control.c: Header cleanup
+
+2001-04-13  Harlan Stenn  
+
+	* configure.in: Properly align --help output.
+	Explain ElectricFence.
+	From: Rainer Orth  
+
+	* ntpd/ntp_loopfilter.c (local_clock): Lose debugging statements.
+	* ntpd/ntp_proto.c (clock_filter): Rewrite.
+	From: Dave Mills
+
+	* ntpd/ntp_control.c (ctl_getitem): msyslog() possible buffer
+	overflow exploit.
+
+	* configure.in: 4.0.99k24
+
+	* html/pic/radio2.jpg:
+	* html/release.htm:
+	* html/refclock.htm:
+	* html/pps.htm:
+	* html/ntpd.htm:
+	* html/miscopt.htm:
+	* html/driver22.htm:
+	* html/confopt.htm:
+	Updated documentation from Dave Mills.
+
+	* util/ntp-genkeys.c: sys_minpoll.
+	* ntpd/refclock_atom.c: Comment additions.
+	* ntpd/ntp_proto.c: mode_ntpdate and peer_ntpdate added.
+	(transmit): We want 3, not 2, consecutive polls.  hpoll logic
+	cleanup.  mode_ntpdate changes.
+	(receive): When setting up a newpeer, use our sys_minpoll, not the
+	peer->ppoll.
+	(clock_update): sys_minpoll changes.  Reorder some case 1 code.
+	Don't exit in case 2.
+	(poll_update): hpoll cleanup.
+	(peer_clear): u_rand.  Use u_rand to randomize the initial poll.
+	* ntpd/ntp_peer.c (newpeer): Bump peer_ntpdate if we're in
+	mode_ntpdate.
+	* ntpd/ntp_loopfilter.c: Initialize sys_poll and sys_minpoll to
+	NTP_MINDPOLL.
+	(local_clock): Clean up some debug/info messages.
+	(rstclock): Use sys_minpoll.
+	(loop_config): KERNEL_PLL sanity checks.  LOOP_MINPOLL support.
+	* ntpd/ntp_crypto.c (crypto_recv): Turn off FLAG_AUTOKEY when we
+	turn off TEST10.
+	* ntpd/ntp_control.c (ctl_getitem): Buffer overflow check.  Clean
+	up some loop logic.
+	* ntpd/ntp_config.c: Added "tinker" and "minpoll".  Use
+	sys_minpoll now, instead of old manifest constant.
+	(save_resolve): Print keyid using decimal, not hex.  From Lars-Owe
+	Ivarsson 
+	* include/ntpd.h: Added peer_ntpdate and sys_minpoll.
+	* include/ntp_config.h (CONF_CLOCK_MINPOLL): Added.
+	* include/ntp.h: keyid cleanup.  LOOP_* cleanup.
+	From Dave Mills.
+
+2001-04-03  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (clock_filter): Swell stuff.
+	From: Mark Martinec 
+
+	* ports/winnt/ntpd/ntpd.dsp:
+	* ports/winnt/ntpd/hopf_PCI_io.c:
+	* ports/winnt/include/hopf_PCI_io.h:
+	* ports/winnt/include/config.h:
+	* ntpd/refclock_hopfser.c:
+	* ntpd/refclock_hopfpci.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/ntp_control.c:
+	* ntpd/Makefile.am:
+	* libntp/clocktypes.c:
+	* include/ntp.h:
+	* include/hopf6039.h:
+	* include/Makefile.in:
+	* include/Makefile.am:
+	* html/pic/fg6039.jpg:
+	* html/refclock.htm:
+	* html/driver39.htm:
+	* html/driver38.htm:
+	* html/copyright.htm:
+	Updated Oncore dudes.
+
+	* configure.in:
+	HOPF drivers and documentation.
+	From: Bernd Altmeier  (with some light
+	hacking from Harlan to clean up indentation and lose the // comments)
+
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_conf.c: Make it go.
+	From: Reg Clemens 
+
+	* configure.in (openssl): Publish and default to RSAREF; hide
+	openssl, and only use it if explicitly requested (at least until
+	we work with it).
+
+2001-04-02  Harlan Stenn  
+
+	* html/y2k.htm:
+	* html/tickadj.htm:
+	* html/release.htm:
+	* html/refclock.htm:
+	* html/quick.htm:
+	* html/pps.htm:
+	* html/ntptrace.htm:
+	* html/ntptime.htm:
+	* html/ntpq.htm:
+	* html/ntpdc.htm:
+	* html/ntpdate.htm:
+	* html/ntpd.htm:
+	* html/miscopt.htm:
+	* html/index.htm:
+	* html/genkeys.htm:
+	* html/exec.htm:
+	* html/driver7.htm:
+	* html/driver22.htm:
+	* html/copyright.htm:
+	* html/confopt.htm:
+	* html/build.htm:
+	* html/authopt.htm:
+	* html/assoc.htm:
+	Updates from Dave Mills.
+
+2001-04-01  Harlan Stenn  
+
+	* configure.in (OPENSSL): Just use -lcrypto.
+	Reported by Dave Mills.
+
+2001-03-31  Harlan Stenn  
+
+	* configure.in: 4.0.99k20
+
+	* ntpd/refclock_heath.c: Add support for GC-1000 II.
+	From Dave Mills.
+
+	* ntpd/ntp_proto.c (transmit): Check peer->unreach.
+	(peer_clear): peer->outdate is a f(BURST_INTERVAL1), not
+	NTP_MINPOLL.
+	* ntpd/ntp_loopfilter.c (local_clock): mode_ntpdate stuff.
+	* ntpd/ntp_crypto.c: OpenSSL/RSAREF support.
+	* ntpd/cmd_args.c: Use -q, not -z, for mode_ntpdate.
+	(getstartup): nofork on mode_ntpdate. Usage update.
+	* include/ntp_crypto.h: OpenSSL/RSAREF support.
+	From: Dave Mills.
+
+	* configure.in (rsaref): Buglet.
+
+2001-03-30  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (clock_update): mode_ntpdate support.
+	* ntpd/ntp_loopfilter.c	(local_clock): mode_ntpdate support.
+	* ntpd/cmd_args.c: Added -z (mode_ntpdate).
+	* include/ntpd.h: mode_ntpdate added.
+	* include/ntp_crypto.h: RSAREF/OPENSSL cleanup.
+	From: Dave Mills.
+
+2001-03-29  Harlan Stenn  
+
+	* config.h.in:
+	* aclocal.m4:
+	* configure.in: Prepare for OpenSSL support
+
+2001-03-28  Harlan Stenn  
+
+	* README.rsa: Note that RSAEURO will not work.
+	Reported by: pieter.delacourt@banksys.be
+
+2001-03-25  Harlan Stenn  
+
+	* include/ntp_if.h:
+	* include/ntp_machine.h:
+	* include/ntp_unixtime.h:
+	* libntp/humandate.c:
+	* libntp/iosignal.c:
+	* libntp/mktime.c:
+	* libntp/prettydate.c:
+	* libntp/systime.c:
+	* libntp/tvtoa.c:
+	* libntp/uglydate.c:
+	* libntp/utvtoa.c:
+	* libparse/clk_computime.c:
+	* libparse/clk_dcf7000.c:
+	* libparse/clk_hopf6021.c:
+	* libparse/clk_meinberg.c:
+	* libparse/clk_rawdcf.c:
+	* libparse/clk_rcc8000.c:
+	* libparse/clk_schmid.c:
+	* libparse/clk_trimtaip.c:
+	* libparse/clk_trimtsip.c:
+	* libparse/clk_varitext.c:
+	* libparse/parse.c:
+	* libparse/parse_conf.c:
+	* ntpd/check_y2k.c:
+	* ntpd/ntp_config.c:
+	* ntpd/ntp_control.c:
+	* ntpd/ntp_intres.c:
+	* ntpd/ntp_io.c:
+	* ntpd/ntp_loopfilter.c:
+	* ntpd/ntp_monitor.c:
+	* ntpd/ntp_proto.c:
+	* ntpd/ntp_refclock.c:
+	* ntpd/ntp_request.c:
+	* ntpd/ntp_resolver.c:
+	* ntpd/ntp_timer.c:
+	* ntpd/ntp_util.c:
+	* ntpd/ntpd.c:
+	* ntpd/refclock_acts.c:
+	* ntpd/refclock_arbiter.c:
+	* ntpd/refclock_arc.c:
+	* ntpd/refclock_as2201.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/refclock_bancomm.c:
+	* ntpd/refclock_chronolog.c:
+	* ntpd/refclock_chu.c:
+	* ntpd/refclock_datum.c:
+	* ntpd/refclock_dumbclock.c:
+	* ntpd/refclock_fg.c:
+	* ntpd/refclock_gpsvme.c:
+	* ntpd/refclock_heath.c:
+	* ntpd/refclock_hpgps.c:
+	* ntpd/refclock_irig.c:
+	* ntpd/refclock_jupiter.c:
+	* ntpd/refclock_leitch.c:
+	* ntpd/refclock_local.c:
+	* ntpd/refclock_msfees.c:
+	* ntpd/refclock_mx4200.c:
+	* ntpd/refclock_nmea.c:
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_pcf.c:
+	* ntpd/refclock_pst.c:
+	* ntpd/refclock_shm.c:
+	* ntpd/refclock_tpro.c:
+	* ntpd/refclock_trak.c:
+	* ntpd/refclock_true.c:
+	* ntpd/refclock_ulink.c:
+	* ntpd/refclock_usno.c:
+	* ntpd/refclock_wwv.c:
+	* ntpd/refclock_wwvb.c:
+	* ntpdate/ntpdate.c:
+	* ntpdate/ntptime_config.c:
+	* ntpdate/ntptimeset.c:
+	* ntpdc/ntpdc.c:
+	* ntpdc/ntpdc_ops.c:
+	* ntpq/ntpq.c:
+	* ntpq/ntpq_ops.c:
+	* ntptrace/ntptrace.c:
+	* parseutil/testdcf.c:
+	* util/hist.c:
+	* util/ntp-genkeys.c:
+	* util/ntptime.c:
+	* util/precision.c:
+	* util/tickadj.c:
+	time.h and sys/time.h cleanup.
+
+2001-03-24  Harlan Stenn  
+
+	* configure.in: '99k19
+
+	* ntpd/refclock_atom.c (atom_ppsapi): PPS API RFC alignment patches.
+	From: Ulrich Windl 
+
+	* util/ntptime.c: MNT options
+	From: Ulrich Windl 
+
+	* ntpd/ntp_refclock.c (refclock_newpeer): Lose "extra" free().
+	From: Ulrich Windl 
+
+	* configure.in: 4.0.99k18 and auto* upgrade
+
+2001-03-14  Harlan Stenn  
+
+	* ntpdc/ntpdc_ops.c (printpeer): No more "valid".
+	* ntpd/ntp_request.c (peer_info): No more "valid".
+	* ntpd/ntp_refclock.c (refclock_transmit): valid/hpoll cleanup.
+	* ntpd/ntp_proto.c (transmit): valid/hpoll and peer->ttl cleanup.
+	peer->valid/oreach cleanup.
+	(receive): Call newpeer() with the pkt->ppoll, not
+	NTP_MINDPOLL (in several places).
+	In AM_NEWPASS, if we have a NULL peer, return.
+	(poll_update): Added xpoll definition, fixed oldpoll definition.
+	Algorithmic improvements.
+	* ntpd/ntp_peer.c (newpeer): Better minpoll/maxpoll
+	initialization.
+	(resetmanycast): That's a poll_update() on an MDF_ACAST, not a
+	poll_clear().
+	* ntpd/ntp_crypto.c: include .
+	(crypto_recv): Leave the crypto_flags alone when wiggling the
+	peer-> stuff.
+	(crypto_cert): Make room for daddy.  Do a real open() on the cert
+	file.  Read the cert.  Initial hack and slash.  Better debug info.
+	* ntpd/ntp_control.c: CP_VALID now does "unreach".
+	(ctl_putpeer): Ditto.
+	* include/ntp_request.h: info_peer gets a placeholder for "valid".
+	* include/ntp_crypto.h (CRYPTO_FLAG_CERT): Comment update.
+	* include/ntp.h: Lose "valid" from struct peer.
+	From: Dave Mills.
+
+2001-03-05  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): hpoll calc logic cleanup.
+	(receive): New cert stuff.
+	(poll_update): Improvements.
+	(peer_clear): New cert stuff.
+	(peer_xmit): New cert stuff.
+	* ntpd/ntp_crypto.c: New cert stuff, documentation cleanup.  Lose
+	extraneous poll_uopdate()s.
+	* ntpd/ntp_control.c: Deal with new cert stuff.
+	* ntpd/ntp_config.c (getconfig): Handle CONF_CRYPTO_CERT.
+	* include/ntp_crypto.h (CRYPTO_FLAG_CERT): Added.
+	(CRYPTO_CERT): Added.
+	(CRYPTO_CONF_CERT): Added.
+	Add declaration for struct value certif.
+	* include/ntp_control.h (CS_CERTIF): Added.
+	(CP_CERTIF): Added.
+	* include/ntp_config.h (CONF_CRYPTO_CERT): Added.
+	* include/ntp.h (TEST10,TEST11): New meaning.  Add certif to
+	struct peer.
+	(FLAG_PROVEN): Added.
+	(MAX_EXT_LEN): Removed.
+	exten grew from 672/4 to 5000/4 for PUBKEY.
+	From: Dave Mills.
+
+2001-03-03  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): Documentation cleanup.
+	(receive): Watch for NULL peer->pubkey.ptr (TEST11).
+	(poll_update): peer->nextdate, not ->outdate. More cleanup around
+	the disabled PUBKEY chunk.
+	* ntpd/ntp_crypto.c (make_keylist): ltemp might be smaller than
+	sys_automax - check peer->kpoll, too.  Other ltemp cleanup.
+	(crypto_recv): fstamp is a PUBKEY-only variable.
+	* include/ntp.h (NTP_AUTOMAX): 13, not 12.
+	From: Dave Mills.
+
+2001-03-01  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): hpoll cleanup.  Call clock_select()
+	after calling poll_update, not before.
+	(receive): Call poll_update after crypto_recv if FLAG_SKEY.
+	(process_packet): Set peer->ppoll Later.
+	(poll_update): peer->hpoll sanity checking.  Set peer->outdate,
+	not ->nextate, when burst > 0.  MDF_ACAST cleanup.
+	(clock_select): Fix hpoll typo in call to poll_update().
+	* ntpd/ntp_crypto.c (crypto_xmit): tstamp's value is a function of
+	PUBKEY.
+	* include/ntp.h (clear_to_zero): #define value is a function of
+	AUTOKEY.
+	From: Dave Mills.
+
+2001-02-28  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): Documentation/code update.
+	(poll_update): Sanity check peer->hpoll.  Improve debug info.
+	(peer_clear): Improve debug info.  Turn off FLAG_ASSOC in addition
+	to FLAG_AUTOKEY.
+	(clock_select): peer->status is CTL_PST_SEL_DISTSYSPEER, and don't
+	call poll_update().  Make each entry in the peer_list a
+	CTL_PST_SEL_SELCAND sooner, too.  Rework similar logic later on.
+	Change debug level on some info.
+	(peer_xmit): Check peer->flags using FLAG_ASSOC, not
+	CRYPTO_FLAG_AUTO in a couple places.  Don't call poll_update() if
+	sendlen > LEN_PKT_NOMAC.
+	* ntpd/ntp_loopfilter.c (local_clock): Improve debug info.
+	Sanity-check sys_poll sooner.
+	* ntpd/ntp_crypto.c: New artwork.
+	(COOKIE_LEN,AUTOKEY_LEN,VALUE_LEN): New.
+	(make_keylist): More debug info.  Use FLAG_ASSOC, not
+	CRYPTO_FLAG_ASSOC.
+	(crypto_recv): More debug info.  Clean up/improve sanity checks on
+	CRYPTO_ASSOC and CRYPTO_RESP packets, and in other places.
+	(crypto_xmit): Clean up/improve sanity checks on CRYPTO_ASSOC and
+	CRYPTO_RESP packets.  Use FLAG_ASSOC, not CRYPTO_FLAG_ASSOC.  More
+	debug info.
+	* include/ntp.h (NTP_CANLOCK): Lose it.
+	(clear_to_zero): is now "assoc".
+	(FLAG_ASSOC): Added.
+	From: Dave Mills
+
+2001-02-23  Harlan Stenn  
+
+	* ntpdate/ntpdate.h (NTP_MAXAGE): Added.
+	* ntpd/ntp_refclock.c (refclock_receive): Cleanup.
+	* ntpd/ntp_proto.c (transmit): Don't reset peer->ppoll in one case.
+	Update peer->hpoll based on CTL_PST_SEL_CORRECT, not FLAG_SYSPEER.
+	Don't update peer->ppoll based on MDF_[BM]CAST.
+	(peer_clear): ppoll is initialized to maxpoll.
+	(clock_select): call poll_update(peer->hpoll) earlier.
+	(peer_xmit): Call poll_update later.
+	* ntpd/ntp_peer.c (peer_config): Rework initial values of [hkp]poll.
+	* ntpd/ntp_loopfilter.c (CLOCK_PHI): Added.  Deal with other
+	(allow_*) stuff.  Treat Windows/NT the same as others regarding
+	panic steps.  Deal with tinker stuff.
+	* ntpd/ntp_config.c: Tinker stuff.
+	* ntpd/cmd_args.c (getCmdOpts): -g now wiggles "allow_panic"
+	(renamed from "correct_any").  -x now wiggles "allow_step"
+	(renamed from "allow_step_backward").
+	* include/ntpd.h: Add tinker variables.  Rename/rework variables
+	associated with "permission to step" and "permission to make a
+	panic correction"
+	* include/ntp_config.h (CONFIG_TINKER): Added.
+	(CONF_CLOCK_MAX): Tinker keyword
+	(CONF_CLOCK_PANIC): Tinker keyword
+	(CONF_CLOCK_PHI): Tinker keyword
+	(CONF_CLOCK_MINSTEP): Tinker keyword
+	* include/ntp.h (NTP_MINCLOCK): Tinker and other cleanup.
+	From: Dave Mills
+
+2001-02-19  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): Don't peer_clear() and reset
+	minpoll unconditionally; make sure the peer is configured.
+	(poll_update): When updating peer->ppoll, check on BCAST and
+	MCAST, not ACAST
+	(peer_clear): PUBKEY cleanup.  Zero out the peer structure
+	earlier. Initialization cleanup/fixes.
+	(peer_xmit): CRYPTO_FLAG_AUTO is in peer->flags now.
+	(key_expire): Debug output.
+	* ntpd/ntp_peer.c (unpeer): PUBKEY cleanup.
+	(newpeer): peer variable setup cleanup.
+	* ntpd/ntp_crypto.c (make_keylist): Keep CRYPTO_FLAG_AUTO in
+	peer->flags, not crypto_flags.
+	(crypto_xmit): Ditto.
+	(crypto_recv): Fix up RV_TSP logic (several places).
+	* include/ntp.h (clear_to_zero): Moved...
+	From: Dave Mills.
+
+2001-02-14  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (peer_xmit): Crypto-related fixes
+	From Dave Mills.
+
+	* ntpd/ntp_crypto.c (crypto_recv): Allocate space for the trailing
+	NUL on the keystr.
+
+2001-01-28  Harlan Stenn  
+
+	* configure.in: 4.0.99k17
+
+	* ntpd/refclock_local.c (STRATUM): 3 -> 5
+	* ntpd/ntp_proto.c: sys_maxd -> sys_selerr, sys_epsil ->
+	sys_syserr.  various cleanups and improvements.
+	From: Dave Mills.
+
+2001-01-19  Harlan Stenn  
+
+	* configure.in: 4.0.99k16
+
+	* config.h.in: Regenerated - became empty somehow.
+	Reported by John.Hay@icomtek.csir.co.za
+
+	* ntpd/ntp_proto.c (clock_select): Fix sdisp calculation.
+	From Dave Mills.
+
+	* util/ntp-genkeys.c:
+	* ntpd/refclock_chu.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/ntpd.c:
+	* ntpd/ntp_loopfilter.c:
+	* ntpd/ntp_io.c:
+	* ntpd/cmd_args.c:
+	* libntp/audio.c:
+	* include/l_stdlib.h:
+	* html/copyright.htm:
+	Lint fixes (Thanks bunches!)
+	From: Marc.Brett@westerngeco.com
+
+2001-01-18  Harlan Stenn  
+
+	* configure.in: 4.0.99k15
+
+	* ntpd/ntp_proto.c (clock_select): Track error[] items sooner.
+	Typo grabbing the dtemp value and in the sdisp calculation.
+	From Dave Mills.
+
+2001-01-17  Harlan Stenn  
+
+	* configure.in: 4.0.99k14
+
+	* ntpd/ntp_proto.c: Change description of sys_rootdelay and
+	sys_rootdispersion.
+	(process_packet): Fix p_del test (bad distance).
+	(process_packet): Fix bad synch distance test.
+	(process_packet): Fix call to clock_filter (p_disp)
+	(clock_update): Fix sys_rootdelay calculation.
+	(clock_filter): Initialize jit to f(sys_precision)
+	(clock_filter): Update jit using distance[i] instead of
+	SQUARE().  peer->jitter uses dtemp instead of SQUARE().
+	(clock_filter): Updated CLOCK_SGATE checks.  When printing debug
+	info, show jitter along with popcorn spike.
+	(clock_select): New sdisp calc.
+	(root_distance): New return value calc.
+	(peer_xmit): xpkt.rootdispersion value change.
+	* include/ntp.h (CLOCK_SGATE): Popcorn spike gate (Whoa, Molly!)
+	From Dave Mills.
+
+2001-01-13  Harlan Stenn  
+
+	* config.sub (Repository): Updated.
+	* config.guess (Repository): Updated.
+
+	* ntpd/ntp_loopfilter.c (local_clock): Just use sys_jitter in the
+	calculation for rootdispersion.
+	From Dave Mills.
+
+2001-01-02  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): Fix documentation. Set
+	peer->outdate and call poll_update in a new place.  Sanity checks
+	in the MODE_BROADCAST case.
+	(clock_select): Track the old peer.  Use the old peer in
+	subsequent checks, where appropriate.  Clean up unpeer() logic.
+	From Dave Mills.
+
+2001-01-01  Harlan Stenn  
+
+	* ntpd/refclock_chu.c: Start using HAVE_AUDIO.
+	* ntpd/ntp_proto.c (clock_select): If about to discard an
+	ephemeral association, do it only if not the system peer.
+	From Dave Mills.
+
+	* html/pic/wingdorothy.gif:
+	* html/pic/bustardfly.gif:
+	* html/pic/boom3a.gif:
+	* html/pic/tonea.gif:
+	* html/pic/stack1a.jpg:
+	* html/pic/pogoa.gif:
+	* html/pic/pogo8.gif:
+	* html/pic/pogo6.gif:
+	* html/pic/pogo5.gif:
+	* html/pic/pogo4.gif:
+	* html/pic/pogo3.gif:
+	* html/pic/pogo1.gif:
+	* html/pic/oz2.gif:
+	* html/pic/flatheads.gif:
+	* html/pic/boom4.gif:
+	* html/pic/boom3.gif:
+	* html/pic/appletree.gif:
+	* html/pic/alice51.gif:
+	* html/pic/alice44.gif:
+	* html/pic/alice35.gif:
+	* html/pic/alice31.gif:
+	* html/pic/alice15b.gif:
+	* html/pic/alice13.gif:
+	* html/pic/alice11.gif:
+	* html/release.htm:
+	* html/rdebug.htm:
+	* html/prefer.htm:
+	* html/porting.htm:
+	* html/ntptrace.htm:
+	* html/ntpq.htm:
+	* html/ntpdate.htm:
+	* html/monopt.htm:
+	* html/kernpps.htm:
+	* html/index.htm:
+	* html/hints.htm:
+	* html/gadget.htm:
+	* html/driver7.htm:
+	* html/copyright.htm:
+	* html/config.htm:
+	* html/build.htm:
+	* html/authopt.htm:
+	* html/assoc.htm:
+	* html/accopt.htm:
+	Cleanup from Dave Mills.
+
+2000-12-30  Harlan Stenn  
+
+	* configure.in: 4.0.99k13
+
+	* ntpd/refclock_wwv.c (wwv_start): Call audio_init with DEVICE_AUDIO.
+	* ntpd/refclock_irig.c (irig_start): Call audio_init with DEVICE_AUDIO.
+	* ntpd/refclock_chu.c: Documentation cleanup.
+	(DEVICE_AUDIO): Added.
+	(fd_audio): Added.
+	(chu_start): Separate audio from serial device.
+	(chu_receive): Rewrite - get data from serial or audio device as
+	appropriate.
+	(chu_audio_receive): Renamed (from chu_receive) to allow both
+	audio and serial capability.
+	(chu_serial_receive): Ditto.
+	(chu_decode): Do the Right Thing based on audio/serial data.
+	* ntpd/ntp_refclock.c (refclock_open): Check for failure using <0
+	instead of ==-1.
+	* libntp/audio.c: Header cleanup, and remove
+	HAVE_STRUCT_AUDIO_INFO_* related fields.
+	(audio_init): Func arg is device to attempt to open.
+	* include/audio.h (audio_init): Now takes a char * argument.
+	From Dave Mills.
+
+	* configure.in (ntp_refclock): HAVE_AUDIO added.  Remove
+	HAVE_STRUCT_AUDIO_INFO_* stuff; Dave rewrote the audio stuff.
+
+2000-12-28  Harlan Stenn  
+
+	* configure.in: 4.0.99k12
+
+2000-12-27  Harlan Stenn  
+
+	* html/release.htm:
+	* html/patches.htm:
+	* html/measure.htm:
+	* html/confopt.htm:
+	* html/clockopt.htm:
+	* html/biblio.htm:
+	* html/authopt.htm:
+	* html/assoc.htm:
+	Updates from Dave Mills.
+
+	* include/ntp_crypto.h: Make sure crypto_flags is visible.
+	From Dave Mills.
+
+2000-12-14  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (process_packet): pleap/pstratum.
+	(peer_xmit): Use CRYPTO_FLAG_AUTO.
+	* ntpd/ntp_crypto.c (make_keylist): Use CRYPTO_FLAG_AUTO. Only
+	sign host name and timestamps if the clock is synched.
+	* include/ntp_crypto.h (CRYPTO_FLAG_AUTO): Added.
+	From: Dave Mills
+
+2000-12-11  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (transmit): Call clock_select in a few new
+	places.  BURST/IBURST cleanup.  Don't turn off FLAG_BURST at the
+	EOburst.
+	(receive): Set peer->unreach = 0 before we call process_packet().
+	(process_packet): ditto, before calling poll_update().  Lose some
+	debugging, MODE_BCLIENT/CLIENT cleanup.
+	(poll_update): Bump nextupdate on FLAG_REFCLOCK, not _REFCLOCK or
+	_IBURST.
+	(peer_clear): Don't set IBURST on MDF_BCLNT.
+	From: Dave Mills.
+
+	* ntpdate/ntpdate.c (alarming): Appease ansi2knr.
+
+2000-12-10  Harlan Stenn  
+
+	* ntpd/ntp_control.c (ctl_putpeer): CP_TTL and CP_TTLMAX
+	MDF_ACAST and MDF_MCAST cleanup.
+
+	* ntpd/refclock_wwv.c (wwv_start): ttlmax/ttl cleanup.
+	* ntpd/refclock_usno.c (usno_timeout): ttlmax/ttl cleanup.
+	* ntpd/refclock_parse.c (CLK_REALTYPE): ttlmax/ttl cleanup.
+	* ntpd/refclock_chu.c (chu_start): ttlmax/ttl cleanup.
+	* ntpd/refclock_acts.c (acts_timeout): ttlmax/ttl cleanup.
+	* ntpd/ntp_refclock.c (refclock_newpeer): Don't do the
+	any_interface -> loopback_interface trick.
+	* ntpd/ntp_proto.c (transmit): Broadcast/manycast cleanup.
+	* ntpd/ntp_peer.c: Cleanup.
+	* ntpd/ntp_io.c: Cleanup.
+	* ntpd/ntp_crypto.c (crypto_recv): AUTOKEY based on BCLNT, not MCAST2.
+	* include/ntpd.h: Declare findbcastinter().
+	* include/ntp.h: struct peer's ttlmax is now max ttl/refclock
+	mode.  ttl is now ttl for manycast mode.
+	(FLAG_MCAST): Reworked several FLAG_ bits.
+	From Dave Mills.
+
+2000-12-05  Harlan Stenn  
+
+	* ntpq/ntpq.c: CP_TTLMAX support.
+	* ntpd/ntp_proto.c (transmit): MDF_ACAST ttl fixes.
+	* ntpd/ntp_peer.c (resetmanycast): Reset ttl if MDF_ACAST.
+	(peer_config): Save max ttl in ttlmax.
+	* ntpd/ntp_control.c: ttlmax support.
+	* include/ntp_control.h (CP_TTLMAX): Added.
+	* include/ntp.h: Added ttlmax to struct peer.
+	Dave Mills.
+
+2000-12-03  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (receive): That any_interface is now an
+	rbufp->dstadr.
+	Various other doc and code cleanup.
+	* ntpd/ntp_peer.c (findmanycastpeer): Fixes
+	From Dave Mills
+
+2000-12-02  Harlan Stenn  
+
+	* ntpd/ntp_request.c (do_conf): call peer_config with
+	any_interface, not 0.
+	* ntpd/ntp_proto.c (transmit): Manycast cleanup
+	* ntpd/ntp_peer.c (findmanycastpeer): manycast cleanup
+	* ntpd/ntp_io.c (sendpkt): Only check ttl if we have a ttl
+	(findinterface): Cleanup
+	* ntpd/ntp_control.c: cleanup
+	* include/ntpd.h: Added resetmanycast.
+	* include/ntp_control.h (CP_TTL): disp -> ttl
+	* ntpq/ntpq.c: disp -> ttl
+	From Dave Mills
+
+2000-11-26  Harlan Stenn  
+
+	* configure.in: 4.0.99k11
+
+	* ntpd/ntp_proto.c (transmit):
+	* ntpd/ntp_peer.c:
+	* ntpd/ntp_io.c:
+	* ntpd/ntp_control.c (ctl_putpeer):
+	* ntpd/ntp_config.c (getconfig):
+	* include/ntpd.h: mcast/ucast interface cleanup.
+	From: Dave Mills
+
+	* include/ntp_request.h: Put data[] as MAXFILENAME+16.  This will
+	fix the conf_peer requests again, but re-break compatibility with
+	old versions of the daemon.  Sigh.
+
+	* util/ntp-genkeys.c (cleanlinks): Don't do it if nosymlinks.
+
+2000-11-19  Harlan Stenn  
+
+	* ntpd/refclock_parse.c (rawdcf_init_1): make Linux happier with
+	some modem control stuff.
+	From: Wolfram Pienkoss  (via Frank Kardel)
+
+	* ntpd/refclock_pcf.c (pcf_poll): isdst fix
+	From: Andreas Voegele 
+
+2000-10-28  Harlan Stenn  
+
+	* configure.in: 4.0.99k10
+
+	* ntpd/refclock_wwvb.c (wwvb_start): Cosmetic reorder.
+	* ntpd/refclock_atom.c (RANGEGATE): Cleanup.  Add ASTAGE.
+	Add ppsparams to struct ppsunit.
+	(atom_start): Init peer->burst to ASTAGE.
+	(atom_shutdown): Multi-handle
+	(atom_pps): Multi-handle
+	(atom_pps): RANGEGATE cleanup
+	(atom_poll): Poll count cleanup.  Error check cleanup.  Burst cleanup.
+	* ntpd/ntp_refclock.c (refclock_transmit): Lose the pre-burst
+	check poll_update().
+	(refclock_sample): Fix the jitter calc.
+	(refclock_receive): Pass the jitter to the clock_filter().
+
+	* ntpd/ntp_proto.c (clock_update): If we lose sync, reset the poll
+	to NTP_MINDPOLL.
+	(poll_update): Poll wiggles.  Make sure peer->nextdate is timely.
+	(clock_select): If we lose sync, reset the poll to NTP_MINDPOLL.
+	* ntpd/ntp_loopfilter.c (local_clock): Show the asocid in debug
+	output.  popcorn debug message changes.  Clamp the poll interval
+	if the system peer has changed.  PPS wiggle changes.
+	From Dave Mills.
+
+2000-10-16  Harlan Stenn  
+
+	* ntpd/refclock_pcf.c (pcf_start):
+	* html/driver35.htm:
+	The radio clock transmits 69 bits with a period of 2.5
+	milliseconds per bit. Thus the driver now sets the default
+	calibration offset to 0.1725 (69 * 2.5 = 172.5).
+	Its now possible to disable the check of the radio clock's
+	synchronisation status bit. Several users requested this option.
+	From: Andreas Voegele 
+
+	* html/refclock.htm:
+	* html/rdebug.htm:
+	* html/prefer.htm:
+	* html/pps.htm:
+	* html/ntpdc.htm:
+	* html/miscopt.htm:
+	* html/ldisc.htm:
+	* html/kern.htm:
+	* html/index.htm:
+	* html/exec.htm:
+	* html/driver22.htm:
+	* html/clockopt.htm:
+	Updates from Dave Mills
+
+	* ntpd/ntp_intres.c (request): Sanity check the size of the response
+
+2000-10-15  Harlan Stenn  
+
+	* ntpq/ntpq_ops.c (dopeers): Dave didn't like the patch to show
+	the units on the times...
+	* ntpdc/ntpdc_ops.c (doset): SYS_FLAG_PPS cleanup
+	* ntpd/refclock_wwv.c (wwv_newchan): Update the peer refid if
+	we're talking to a stratum 0 source
+	* ntpd/refclock_trak.c: Needs PPS
+	* ntpd/refclock_oncore.c: Disable for now
+	* ntpd/refclock_mx4200.c: Needs PPSAPI, not PPS
+	Header cleanup.  PPS interface cleanup.
+	Process sentences with a switch
+	Cleanup and sanity checks
+	* ntpd/refclock_datum.c: header cleanup, light body cleanup
+	* ntpd/refclock_conf.c: CLOCK_TRAK needs PPS
+	MX4200 needs PPSAPI, not PPS
+	Disable ONCORE for now
+	* ntpd/refclock_bancomm.c: Surgery
+	* ntpd/refclock_atom.c: Cleanup
+	(atom_control): added
+	(atom_ppsapi): added
+	* ntpd/ntp_request.c (setclr_flags): SYS_FLAG_PPS cleanup
+	* ntpd/ntp_refclock.c: stropts.h back in in TTYCLK and
+	HAVE_SYS_CLKDEFS_H
+	Get ntp_syscall if KERNEL_PLL
+	Define cal_enable
+	(refclock_receive): Cleanup
+	(refclock_control): sanity check procptr
+	* ntpd/ntp_proto.c (init_proto): pps_enable
+	(proto_config): Turn on/off PPS discipline
+	* ntpd/ntp_loopfilter.c: pps_enable
+	(local_clock): record_loop_stats() if !ntp_enable
+	(local_clock): Turn off PPS if it's not enabled
+	Other cleanup/fixes
+	* ntpd/ntp_config.c: pps and calibrate keywords.  Initialize
+	pps_assert to 0, not 1 (swap assert/clear?)
+	* include/ntpd.h: We have pll_status if KERNEL_PLL
+	Added pps_enable and cal_enable
+	* include/ntp_request.h (SYS_FLAG_PPS): Renamed from
+	SYS_FLAG_AUTHENTICATE
+	* include/ntp.h (PROTO_PPS): Added
+	(PROTO_CAL): Added
+	From: Dave Mills
+
+2000-09-23  Harlan Stenn  
+
+	* include/ntp_refclock.h (stropts.h, sys/clkdefs.h): Harmful and
+	useless file include's turned off.
+	* libntp/iosignal.c (netinet/in.h, sys/sockio.h): Duplicate file
+	include's turned off.
+	* ntpd/ntp_refclock.c (ntp_tty.h): File included.
+	(refclock_open, refclock_ioctl): Use `TTY' from ntp_tty.h.
+	* ntpd/refclock_atom.c: Grab a few headers regardless; if we don't
+	CLOCK_ATOM we provide a stub pps_sample() routine so the WHARTON
+	can be compiled/used.
+	* ntpq/ntpq_ops.c (dopeers, doopeers): Print the units for
+	each column header.
+	Tue Sep 12 16:25:51 2000  Philippe De Muyter  
+
+	* ntpd/refclock_atom.c (atom_start): Lose "temp", because we now
+	initially either CAPTUREASSERT or CAPTURECLEAR.
+	(atom_pps): pps_info_t is our friend.  Update comments to reflect
+	reality.  DTRT with pps_info.  Do some overflow checks.
+	From: Dave Mills.
+
+2000-09-21  Harlan Stenn  
+
+	* configure.in: Much improved Solaris patch-level check for the
+	FLL bug test.
+	From: Marc.Brett@westgeo.com
+
+2000-09-19  Harlan Stenn  
+
+	* include/Makefile.am (noinst_HEADERS): Added ntp_tty.h
+	Reported by Dave Mills
+
+2000-09-16  Harlan Stenn  
+
+	* ntptrace/ntptrace.c:
+	* ntpdate/ntptimeset.c (receive):
+	* ntpdate/ntpdate.c (receive):
+	STRATUM cleanup
+	* ntpd/refclock_atom.c (atom_poll): Autostratum.  Lose the leap.
+	* ntpd/ntp_proto.c: sys_prefer
+	(process_packet): stratum cleanup
+	(clock_select): Autostratum the ATOM
+	* ntpd/ntp_loopfilter.c: pps_update/pps_stratum wiggle.
+	* include/ntpd.h: Lose pps_update, gain sys_prefer
+	* include/ntp.h: STRATUM variable cleanup
+	From Dave Mills
+
+2000-09-13  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c (oncore_get_timestamp): Print debug
+	messages being aware of HAVE_STRUCT_TIMESPEC.
+
+	* ntpd/refclock_atom.c: Have pps_params tag along in the ppsunit
+	structure, where it really belongs.
+	(atom_pps): Use PPS_CAPTURE{ASSERT,CLEAR}
+	From: Dave Mills.
+
+2000-09-12  Harlan Stenn  
+
+	* configure.in (ac_cv_var_atom_ok): Cleanup ATOM/PPSAPI stuff...
+
+	* scripts/ntp-close: Find "close" ntp servers.
+	From: Neal McBurnett 
+
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_oncore.c: Re-enabled oncore driver for HAVE_PPSAPI
+	case only.
+
+2000-09-12  Philippe De Muyter  
+
+        * ntpd/refclock_parse.c (we400a_pollinfo): Useless variable removed.
+        [WHARTON slot]: Set NO_POLL, NO_INIT and NO_DATA; fix `fixed format'
+        and `offset' fields.
+
+	* include/ntp_tty.h: New file
+	* libntp/icom.c: Use it.
+
+	* ntp_update (UPDATE_OPTIONS): Use -d, too.  Fix Pass 1 comment.
+
+2000-09-12  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c: shmem_fname added.  oncore_init_shmem()
+	updated.
+	(oncore_start): Comment cleanup
+	(oncore_read_config): Move call to oncore_shmem_init()
+	(oncore_init_shmem): Prototype change
+	(oncore_init_shmem): Don't exit on errors
+	(oncore_msg_any): timespec/timeval cleanup
+	(oncore_msg_Cj_id): shmem_fname changes
+	(oncore_msg_BaEaHa): saw_At bugfix
+	(oncore_get_timestamp): Added current_mode/current_params.  Commented.
+	Added time_pps_getcap() calls.
+	From: Reg Clemens 
+
+	* ntpd/ntp_io.c (input_handler): Better recvfrom() error message
+	From: Dean Gibson 
+
+	* ntpdc/ntpdc.c (passwd): Get them working again.
+	From: Benjamin Greenwald 
+
+2000-09-11  Harlan Stenn  
+
+	* ntpd/refclock_atom.c:
+	(atom_start):
+	* ntpd/ntp_refclock.c: Comment cleanup.  PPS/PPSAPI cleanup
+	(refclock_open): PPS/PPSAPI cleanup
+	From: Dave Mills
+
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_mx4200.c:
+	HAVE_TIMESPEC -> HAVE_STRUCT_TIMESPEC
+
+	* configure.in: ATOM requires struct timespec, not PPSAPI.  Clean
+	up dependencies accordingly.
+
+2000-09-09  Harlan Stenn  
+
+	* configure.in (ac_cv_var_atom_ok): Improve ATOM configure message
+	PARSE requires ATOM.
+
+	* ntpd/ntpd.c (set_process_priority): Clean up debug messages.
+
+2000-09-07  Harlan Stenn  
+
+	* configure.in: ac_cv_atom_ok, depends on HAVE_PPSAPI.
+	I notice the PARSE clocks require ATOM.  Could be interesting...
+
+2000-09-06  Harlan Stenn  
+
+	* Makefile.in (distdir): Seems to be a bug in an automake library
+	somewhere...
+
+2000-09-05  Harlan Stenn  
+
+	* ntpd/ntp_loopfilter.c (loop_config): V3 API needs MOD_BITS when
+	initializing ntv.modes.  Initialize ntv.{maxerror,esterror,status}
+	earlier.  Clean up KERNEL_PLL code.
+
+2000-09-04  Harlan Stenn  
+
+	* ntpq/ntpq.c: report offset as "offset", not "phase".  Lose
+	compliance.
+	* ntpd/refclock_local.c (local_poll): variance -> jitter
+	* ntpd/refclock_chu.c (chu_major): Lose variance.
+	* ntpd/ntp_util.c (hourly_stats): sys_error -> sys_jitter
+	(record_loop_stats): ditto
+	* ntpd/ntp_request.c (peer_info): variance -> jitter
+	* ntpd/ntp_refclock.c (refclock_sample): variance -> jitter
+	(refclock_receive): variance -> jitter
+	* ntpd/ntp_proto.c (process_packet): variance -> jitter
+	(clock_filter): variance -> jitter
+	(clock_select): variance -> jitter
+	(root_distance): variance -> jitter
+	* ntpd/ntp_peer.c (newpeer): variance -> jitter
+	* ntpd/ntp_loopfilter.c: Cleanup pll_nano selection bogon.
+	Centralize the kernel API data.
+	(local_clock): Lose sys_error.
+	(loop_config): Code cleanup.
+	* ntpd/ntp_control.c: Call offset "offset" and not "phase". Lose
+	CS_COMPLIANCE.  Deal with variance/jitter rename.
+	* include/ntp_refclock.h: Rename variance to jitter in struct
+	refclockproc.
+	* include/ntp_control.h (CS_COMPLIANCE): Lose it.
+	* include/ntp.h: Rename variance to jitter in struct peer.
+	From: Dave Mills
+
+2000-09-01  Harlan Stenn  
+
+	* ntpd/refclock_atom.c: Use the new ppsunit.  Cleanup and improve
+	documentation.
+	* ntpd/ntp_refclock.c (refclock_sample): Don't accumulate
+	variance.
+	From Dave Mills
+
+2000-08-31  Harlan Stenn  
+
+	* html/driver22.htm: Update the docs.
+	* ntpd/refclock_atom.c (atom_start): Open the device if it hasn't
+	been opened already.
+	(pps_sample): Make it more visible.
+	From Dave Mills.
+
+	* configure.in: 4.0.99k8
+
+	Revert to the older automake.
+
+	* configure.in: The PPSAPI headers use "inline", so require a STDC
+	compiler.
+
+	* ntpd/refclock_atom.c (atom_shutdown): Typo
+	From Dave Mills
+
+	* configure.in: Convert to autoconf-2.49
+
+	* ntpd/refclock_atom.c: Header cleanup Comment cleanup.  Lose the
+	TTYCLK stuff.  Convert to PPSAPI.
+	* ntpd/ntp_refclock.c (refclock_newpeer): Move refclock_unpeer().
+	From: Dave Mills
+
+2000-08-29  Harlan Stenn  
+
+	* configure: Fix the autoconf problem...
+
+2000-08-20  Harlan Stenn  
+
+	* configure.in: 99k7
+
+	* util/ntptime.c (main): Report TAI stuff
+	* ntpq/ntpq.c: CS_COMPLIANCE/CS_JITTER cleanup
+	* ntpd/ntp_loopfilter.c (local_clock): sys_error/sys_jitter cleanup.
+	kernel PPL cleanup.
+	* ntpd/ntp_crypto.c: Check NTP_API if we're doing KERNEL_PLL so we
+	can get the TAI stuff.
+	* ntpd/ntp_control.c: CS_COMPLIANCE now reports "error" instead of
+	"jitter".  CS_JITTER now reports jitter.
+	* include/ntpd.h: Added sys_jitter
+	* include/ntp_control.h (CS_JITTER): Added
+	From: Dave Mills
+
+	* ntpd/cmd_args.c (getCmdOpts): Crack -N at pre-scan, as we do the
+	priority wiggle before the final scan.
+	From: Tom Smith 
+	We might do better to move the priority wiggle to after the final
+	scan.  Especially if we want to permit command-line options to
+	have decent control over the priority.  When we rewrite the config
+	file stuff we might go to a multi-scan to solve some of these
+	problems.
+
+2000-08-19  Harlan Stenn  
+
+	* configure.in: '99k6, and manually fix configure.
+
+	* include/ntp_request.h (NTP_MAXHOSTNAME): 144 -> 32
+
+2000-08-18  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): Don't call fclose if stream is NULL.
+
+2000-08-17  Harlan Stenn  
+
+	* html/driver35.htm:
+	* ntpd/refclock_pcf.c: Updates and improvements
+	From: Andreas Voegele 
+
+	* configure.in (ac_cv_struct_ntptimeval): Lose the TAI check - we
+	don't need it since we can check NTP_API.  Re-hack the generated
+	configure script.
+
+	* configure: Manual hack to the ntptimeval.time.tv_nsec stuff
+	because we're running an old autoconf.
+
+2000-08-16  Harlan Stenn  
+
+	* util/ntptime.c: Use: HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC, it's
+	the standard name.
+
+	* configure.in: Look for struct ntptimeval.tai in sys/timex.h
+	Cleanup struct tptimeval member tests.
+
+	* util/ntp-genkeys.c: New command-line arguments
+
+2000-08-14  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): More small steps...
+
+2000-08-13  Harlan Stenn  
+
+	* ntpd/ntp_crypto.c (crypto_rsa): Now that we're using
+	NTP_KEYSDIR, make sure there is a '/ between the dir and the file.
+
+	* util/ntp-genkeys.c (main): More small steps...
+
+2000-08-12  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): Another small step...
+
+	* configure.in: 99k5
+
+	* include/ntp_request.h: Make data[] member of req_pkt 32 again.
+	Bump the version number...
+
+	* ntpd/ntp_loopfilter.c (local_clock): Change 0. to 0 in a couple
+	of places.
+	From Dave Mills
+
+2000-08-11  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): Minimal progress...
+
+2000-08-06  Harlan Stenn  
+
+	* ntpd/check_y2k.c: Make debug definition match ntpd.h's declaration
+
+	* ntpd/Makefile.am (check-local): Use test in favor of [
+
+2000-08-05  Harlan Stenn  
+
+	* configure.in (NTP_KEYSDIR): Typo
+
+2000-08-04  Harlan Stenn  
+
+	* ElectricFence/Makefile.am (check-local): use test instead of [
+
+	* configure.in: AC_REPLACE_FUNCS(strdup)
+	* libntp/strdup.c (strdup): Added.
+	* libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Added strdup.c
+
+	* util/Makefile.am (ntp_genkeys_DEPENDENCIES): Use $U on .o files
+	(ntp_genkeys_LDADD): ditto.
+
+	* ntpd/ntp_crypto.c: Use NTP_KEYSDIR
+
+	* util/ntp-genkeys.c (snifflink): Ignore ENOENT, too.
+
+	* ntpd/ntp_proto.c (peer_xmit): Crypto cleanup
+	* ntpd/ntp_crypto.c: Cleanup
+	* ntpd/ntp_control.c: Join the club
+	* ntpd/ntp_config.c: Call crypto_config() instead; we got rid of
+	crypto_flags.
+	* include/ntp_crypto.h (CRYPTO_FLAG_ENAB): New crypto flags, rework
+	* include/ntp_control.h (CS_FLAGS): Wiggle in.
+	* include/ntp.h: Added crypto peer status to struct peer
+	From Dave Mills
+
+2000-08-03  Harlan Stenn  
+
+	* util/ntp-genkeys.c: Initialize path_keysdir to NTP_KEYSDIR.
+
+	* configure.in (NTP_KEYSDIR): Added
+	* acinclude.m4: Added AC_DEFINE_DIR macro
+
+	* util/ntp-genkeys.c (main): Sanity checks on the file paths.
+
+2000-08-02  Harlan Stenn  
+
+	* util/ntp-genkeys.c (crypto_config): Only #ifdef PUBKEY
+	(PATH_MAX): Try harder...
+
+2000-08-01  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): Use snifflink()
+	(snifflink): Implement...
+
+	* configure.in: Check for readlink()
+
+2000-07-31  Harlan Stenn  
+
+	* util/ntp-genkeys.c (main): Use strdup on the tokens returned
+	from ntp_config...
+	(crypto_config): Fix a typo...
+	(crypto_config): Even more...
+	(usage): Flesh it out.
+
+	* include/ntp_config.h:
+	* ntpd/ntp_config.c: Move a whack of #defines to ntp_config.h so
+	ntp-genkeys.c can see them, too.
+
+	* util/ntp-genkeys.c: Add stubs to work with ../ntpd/ntp_config.o,
+	start hooking things up.
+	(main): debugging
+	(crypto_config): better implementation
+
+
+	* ntpd/ntp_config.c (getconfig):
+	* ntpd/ntpd.c: Initialize "debug" here, not in ntp_config.c
+
+	* util/Makefile.am (ntp_genkeys_LDADD): Added ../ntpd/ntp_config.o
+	* util/Makefile.am (ntp_genkeys_DEPENDENCIES): Added.
+
+2000-07-30  Harlan Stenn  
+
+	* configure.in: 4.0.99k4
+	* util/ntp-genkeys.c: Start hacking for new functionality.
+	* include/Makefile.am (noinst_HEADERS): Added ntp_cmdargs.h and
+	ntp_config.h .
+	* ntpd/ntp_config.c: Grab ntp_cmdargs.h.  Make some new globals
+	(ugh), move ntpd-specific variables and code to cmd_args.c .
+	* ntpd/cmd_args.c: Move command argument processing functions from
+	ntp_config.c to this file.
+	* ntpd/Makefile.am (ntpd_SOURCES): Added cmd_args.c
+	* include/ntpd.h: Move getstartup() to ntp_cmdargs.h
+	* include/ntp_cmdargs.h: New file
+	Begin the hacking fest to make it easier for ntp-genkeys to use
+	ntpd's config processing code.  I really hope this is the lesser
+	of the evils...
+
+2000-07-28  Harlan Stenn  
+
+	* util/ntp-genkeys.c (usage): Added.
+
+	* ntpd/ntp_crypto.c: Cleanup
+	* ntpd/ntp_proto.c (transmit): Add some parens.
+	(peer_xmit): Add ntohl when grabbing sndauto.seq for broadcast.
+	* ntpd/ntp_peer.c (findpeer): Cleanup
+	* ntpd/ntp_loopfilter.c (local_clock): Typo
+	From Dave Mills
+
+	* include/ntp_config.h: Created
+
+	* util/ntp-genkeys.c: Always build, but realize we may not have
+	RSAREF.  Compile parts appropriately.
+
+	* util/Makefile.am (bin_PROGRAMS): Always make ntp-genkeys
+	(ntp-genkeys_LDADD): Use $LIBRSAREF instead of the "real path"
+	* configure.in: Lose MAKE_NTP_GENKEYS
+
+	* configure.in:
+	* util/ntp-genkeys.c:
+	* util/Makefile.am:
+	Renamed ntp_genkeys to ntp-genkeys.
+
+2000-07-27  Harlan Stenn  
+
+	* ntpdate/ntpdate.c (ntpdatemain): Cleanup error message.
+
+	* ntpdate/ntpdate.c (ntpdatemain): Add missing authtrust() call
+	From: Jason Heiss 
+
+	* ntpd/refclock_ulink.c (ulink_receive):
+	* ntpd/ntp_crypto.c:
+	* libntp/authparity.c:
+	Lint/noise cleanup
+	From: Marc Brett 
+
+	* ntpd/ntp_proto.c: Specifically track manycastserver and
+	survivors
+	From: Dave Mills
+
+2000-07-26  Sven Dietrich  
+
+	* ntpd/ntpd.c: remove WINNT priority adjustment to the ports/winnt area
+	where it does not clutter up the main distribution.
+
+2000-07-24  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (receive): dstadr_sin needs  higher visibility
+	From: Dave Mills
+
+	* flock-build: Added baldwin
+
+	* ntpd/ntp_request.c:
+	* ntpd/ntp_proto.c:
+	* ntpd/ntp_peer.c:
+	* ntpd/ntp_io.c:
+	* ntpd/ntp_intres.c:
+	* ntpd/ntp_crypto.c (make_keylist):
+	* ntpd/ntp_control.c:
+	* ntpd/ntp_config.c (CONF_MOD_IBURST, save_resolve):
+	* include/ntpd.h (findpeerbyassoc, newpeer, peer_config, *_interface):
+	* include/ntp_request.h (CONF_FLAG_IBURST):
+	* include/ntp_crypto.h (crypto_xmit, make_keylist):
+	* include/ntp.h (FLAG_IBURST):
+	* html/release.htm:
+	* html/confopt.htm:
+	* html/assoc.htm:
+	Add iburst option, fix broadcast/multicast and some types.
+	From: Dave Mills
+
+2000-07-20  Harlan Stenn  
+
+	* scripts/Makefile.am (bin_SCRIPTS): Install ntp-wait
+
+	* configure.in: 4.0.99k
+
+2000-07-19  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (peer_xmit): PUBKEY cleanup
+
+2000-07-18  Harlan Stenn  
+
+	* configure.in: 4.0.99j5
+
+	* html/ntpd.htm (HREF): Document other missing command-line options
+
+	* html/ntpd.htm (HREF): Document
+	* html/confopt.htm (href): Undocument
+	* ntpd/ntp_config.c (getconfig): -N high for high-priority.
+	Lose the ntp.conf way of setting priority.
+
+	* ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup
+	From Dave Mills
+
+2000-07-17  Harlan Stenn  
+
+	* html/confopt.htm (href): Document it.
+	* ntpd/ntp_config.c (getconfig): CONFIG_PRIORITY support
+	* ntpd/ntpd.c (set_process_priority): Use it.
+
+	* ntpd/ntp_crypto.c: Crypto key stuff
+	* ntpd/ntp_proto.c: pubkey -> pubkey.ptr
+	* ntpd/ntp_control.c (ctl_putpeer): fstamp -> pubkey.fstamp
+	* ntpd/ntp_peer.c:
+	* include/ntpd.h:
+	* include/ntp_types.h:
+	* include/ntp_request.h:
+	* include/ntp_crypto.h:
+	* include/ntp_control.h:
+	* include/ntp.h: Type cleanup
+	From: Dave Mills
+
+2000-07-14  Harlan Stenn  
+
+	* ElectricFence/Makefile.am (check-local): Don't run the tests if
+	we didn't build the programs...
+	(check-local): Same, but watch the return codes...
+
+	* ElectricFence/page.c: #include config.h if it's there.
+	Properly handle the sys_errlist declaration.
+
+	* html/ntpq.htm:
+	* html/index.htm:
+	* html/debug.htm:
+	* html/authopt.htm:
+	Reality check.
+	From Dave Mills
+
+2000-07-13  Harlan Stenn  
+
+	* Makefile.am (SUBDIRS): Added ElectricFence
+	* configure.in (AC_CONFIG_FILES): Added ElectricFence support
+	* ElectricFence: Imporpted.
+
+2000-07-12  Harlan Stenn  
+
+	* util/ntp_genkeys.c (main): Cleanup
+	* ntpd/refclock_wwv.c (wwv_qrz): sqrt -> SQRT
+	* ntpd/refclock_chu.c (chu_rf): sqrt -> SQRT
+	* ntpd/ntpd.c (set_process_priority): Disable  high-priority for now.
+	PUBKEY cleanup.
+	* ntpd/ntp_timer.c: sys_revoketime cleanup.
+	* ntpd/ntp_proto.c (receive): PUBKEY cleanup.  Comment and code
+	cleanup.
+	(process_packet): Comment and code (PUBKEY) cleanup.
+	(peer_xmit): Comment and code cleanup.
+	(fast_xmit): Comment and code cleanup.
+	* ntpd/ntp_peer.c (expire_all): revoketime cleanup.  PUBKEY cleanup.
+	* ntpd/ntp_crypto.c: Comment reorg.  DH parameters are now
+	file-static instead of local to subroutines.
+	(make_keylist): peer->pcookie.key cleanup/fix
+	(crypto_recv): Subroutine documentation cleanup, other cleanup
+	(crypto_xmit): Cleanup/document.
+	(crypto_setup): Cleanup/document.
+	(crypto_agree): Cleanup/document.
+	(crypto_rsa): now static
+	(crypto_dh): now static.  Comment cleanup.  Code cleanup.
+	(crypto_tai): now static.  Code and comment cleanup.
+	(crypto_config): Deal with CRYPTO_CONF_LEAP.
+	* ntpd/ntp_control.c (CS_DHPARAMS): Rename corresponding token to
+	"params".  Remove CS_TAI from def_sys_var[].
+	(ctl_putsys): CS_HOST, CS_DHPARAMSm CS_REVTIME, and CS_LEAPTIME
+	bugfix.  CS_TAI cleanup.
+	* ntpd/ntp_config.c (CONF_CRYPTO_LEAP): Added
+	(getconfig): Added CONF_CRYPTO_LEAP support.
+	* include/ntp_syslog.h: Lose GIZMO stuff.
+	* include/ntp_crypto.h (CRYPTO_CONF_LEAP): Added
+	* include/ntp.h: struct autokey, cookie,value, and pkt changes for
+	signature field.  Update the inline docs on pkt's exten field.
+	From: Dave Mills
+
+
+2000-07-08  Harlan Stenn  
+
+	* ntpd/ntp_util.c (stats_config): If we read a bogus old_drift,
+	use 0 instead of failing.
+
+2000-07-03  Harlan Stenn  
+
+	* README.cvs: Cleanup.
+
+	* ntpd/refclock_datum.c (datum_pts_poll): index -> unit_index
+	* ntpd/ntp_resolver.c (findhostaddr): const cleanup
+	* libntp/recvbuff.c:
+	* libntp/msyslog.c:
+	* libntp/emalloc.c:
+	* libntp/authreadkeys.c:
+	Fix header order.
+	From: Simon Burge 
+
+	* ntpd/ntp_util.c (stats_config): Use HAVE_FINITE and HAVE_ISFINITE
+	* configure.in (ac_cv_struct_ntptimeval_timespec): isfinite()
+	checks for HP-UX11.
+	From: Albert Chin-A-Young 
+
+2000-07-02  Harlan Stenn  
+
+	* flock-build (LIST): Lose malarky, update some machine/OS descriptions
+
+	* configure.in: 4.0.99j4
+
+	* ntpq/ntpq.c: Lose PUBKEY stuff - older ntpq's will complain when
+	they see the info in a packet.
+	* ntpd/ntp_proto.c (peer_xmit): TAI changes.
+	* ntpd/ntp_crypto.c: Fix host/network byteorder stuff.  Follow
+	global->struct changes.  TAI changes.  Bugfixes.
+	* ntpd/ntp_control.c: Follow field reorder/rename.
+	* include/ntp_crypto.h: Move crypto stuff from separate globals
+	into structs.
+	* include/ntp_control.h (CS_HOST): Reorder/rename some fields
+	From: Dave Mills
+
+2000-06-30  Harlan Stenn  
+
+	* ntpd/ntp_peer.c (unpeer): Moved keystr cleanup inside ifdef PUBKEY
+
+	* configure.in: 4.0.99j3
+
+	* html/release.htm:
+	* html/ntpq.htm:
+	* html/authopt.htm:
+	Updates from Dave Mills
+
+	* ntpd/ntp_request.c (dns_a): Don't call crypto_public for now...
+	* ntpd/ntp_proto.c (receive): Follow the TEST wiggles
+	(peer_xmit): TAI support
+	* ntpd/ntp_crypto.c: TAI support
+	* ntpd/ntp_control.c: CS_VERSION  and CS_TAI support
+	* include/ntp_crypto.h (CRYPTO_FLAG_TAI): Added.
+	* include/ntp_control.h (CS_VERSION): Added.
+	* include/ntp.h (TEST4,TEST5,TEST8,TEST9): Wiggle.
+	From: Dave Mills
+
+	* ntpd/Makefile.am (ntpd_SOURCES): Lose refclock_ulink331.c
+	because the new refclock_ulink.c handles it.
+
+2000-06-28  Harlan Stenn  
+
+	* ntpd/ntp_config.c (getconfig): Sanity check the right variable
+	From: Dave Mills.
+
+2000-06-25  Harlan Stenn  
+
+	* configure.in: 4.0.99j2
+
+	* ntpd/ntp_proto.c:
+	* ntpd/ntp_peer.c:
+	* ntpd/ntp_crypto.c:
+	* include/ntp_crypto.h:
+	* include/ntp.h:
+	AUTOKEY/PUBKEY/DH/crypto changes
+	From: Dave Mills
+
+2000-06-23  Harlan Stenn  
+
+	* html/driver34.htm:
+	* ntpd/refclock_ulink.c:
+	* ntpd/refclock_ulink331.c: (removed)
+	Updated for 320/330 series refclocks
+	From: joseph lang 
+
+	* ntpd/refclock_oncore.c: Patches/improvements
+	* html/driver30.htm: New release
+	From: Reg Clemens 
+
+2000-06-17  Harlan Stenn  
+
+	* configure.in: 4.0.99j1
+
+	* ntpdc/ntpdc.c (getcmds):
+	* configure.in:
+	Readline support.
+	From: Aaron Sherman 
+
+	* ntpd/refclock_ulink331.c: Added.
+	Sent in by Doug Grosso 
+	* ntpd/Makefile.am (ntpd_SOURCES): Added refclock_ulink331.c
+
+	* libntp/snprintf.c: Added stdio.h
+	From: Marc Brett 
+
+	* include/ntp.h: struct autokey's siglen is u_int32.  So is the
+	siglen in struct cookie.  So is siglen and value length in struct
+	value. Add fstamp to struct peer.  Resize the exten AUTOKEY field
+	in struct pkt.
+	* include/ntp_crypto.h: crypto_enable -> crypto_flags and a
+	variety of other cleanups.
+	* ntpd/ntp_config.c: crypto_enable -> crypto_flags, and some
+	key/fudge cleanup.
+	* ntpd/ntp_control.c: Much cleanup.
+	* ntpd/ntp_crypto.c: Many changes that Harlan is too tired to
+	properly document.
+	* ntpd/ntp_peer.c: crypto_enable -> crypto_flags
+	(peer_config): Hold off on crypto_public() until some resolver
+	issue is fixed.
+	* ntpd/ntp_proto.c (receive): Disable the reverse DNS lookup for now.
+	(process_packet): Don't record_raw_stats() for now.
+	crypto_enable was renamed to crypto_flags.
+	(peer_xmit): In MODE_ACTIVE or MODE_PASSIVE, only call
+	crypto_xmit() if the peer->cmmd is not CRYPTO_AUTO.  Reset
+	peer->cmmd to 0 when we're thru.
+	Don't reset peer->cmmd to 0 until the end of MODE_CLIENT.
+	* ntpd/ntpd.c: Lose the call to crypto_init().  Instead, call
+	crypto_setup() later on if we have crypto_flags.
+	* util/ntp_genkeys.c: Lose GENLEN; use PRIMELEN/2 .
+	From Dave Mills.
+
+	* ntpd/ntp_crypto.c (crypto_rsa):
+	(crypto_dh):
+	Do some debug logging if readlink() fails with something other
+	than EINVAL (file isn't a symlink).
+
+2000-06-04  James R. Van Zandt  
+
+	* html/miscopt.htm (trap): punctuation
+
+	* html/ntpd.htm (-g): typo
+
+	* html/miscopt.htm (logconfig): List the "clock" event class.
+	"allprefix" should be two words.
+
+2000-05-31  Harlan Stenn  
+
+	* ntpd/ntp_timer.c: Protect 
+
+2000-05-30  Harlan Stenn  
+
+	* ntpd/Makefile.am: Document what we expect from -lm
+
+2000-05-29  Harlan Stenn  
+
+	* configure.in: 4.0.99j
+
+2000-05-22  Harlan Stenn  
+
+	* html/ntptime.htm: More fixes
+	From: Kazu TAKAMUNE 
+
+2000-05-16  Harlan Stenn  
+
+	* build (KEYSUF):
+	* flock-build:
+	* configure.in: Lose the "md5" options from the --with-crypto
+	check; Dave hates it.
+
+	* ntpd/ntp_util.c (stats_config):
+	* ntpd/ntp_loopfilter.c (loop_config):
+	* libntp/systime.c (adj_systime):
+	* include/ntp_proto.h (NTP_MAXFREQ):
+	Renamed MAX_FREQ to NTP_MAXFREQ
+
+	* ntpd/ntpd.c (ntpdmain):
+	* ntpd/ntp_proto.c (receive):
+	(poll_update):
+	* ntpd/ntp_intres.c (addentry):
+	* ntpd/ntp_config.c (getconfig):
+	Lint cleanup
+	From: Marc Brett 
+
+	* include/ntp_stdlib.h:
+	* libntp/systime.c (adj_systime):
+	* ntpd/ntp_loopfilter.c (loop_config):
+	* ntpd/ntp_util.c (stats_config):
+	* ports/winnt/ntpd/nt_clockstuff.c (adj_systime):
+	MAXFREQ -> MAX_FREQ
+	* include/ntp_proto.h: Define MAX_FREQ
+
+2000-05-15  Harlan Stenn  
+
+	* include/ntp_stdlib.h:
+	* libntp/systime.c (adj_systime):
+	* ntpd/ntp_loopfilter.c (loop_config):
+	* ntpd/ntp_util.c (stats_config):
+	* ports/winnt/ntpd/nt_clockstuff.c (adj_systime):
+	sys_maxfreq -> MAXFREQ
+	Per Dave Mills.
+
+2000-05-14  Harlan Stenn  
+
+	* acinclude.m4: Typo...
+
+2000-05-13  Harlan Stenn  
+
+	* libntp/gpstolfp.c (GPSORIGIN): Try new ULONG_CONST macro
+
+	* ntpdate/ntptimeset.c:
+	* ntpdate/ntpdate.h:
+	* ntpd/refclock_oncore.c (oncore_msg_En):
+	* ntpd/ntp_util.c (stats_config):
+	* ntpd/ntp_request.c:
+	* ntpd/ntp_intres.c (findhostaddr):
+	* ntpd/ntp_config.c (getconfig):
+	* libntp/systime.c (adj_systime):
+	* libntp/lib_strbuf.c:
+	* libntp/authparity.c:
+	* libntp/audio.c:
+	Header/lint cleanup
+	From/reported by: Simon Burge 
+
+	* ntpd/ntp_resolver.c (findhostaddr): Compiler noise cleanup
+
+	* ntpd/ntp_intres.c: Compiler noise cleanup
+
+	* html/ntptime.htm: Document reality check
+	From: Kazu TAKAMUNE 
+
+2000-05-12  Harlan Stenn  
+
+	* ntpd/ntp_intres.c (ntp_intres): Quiet some debug messages
+	Reported by: Brian Bergstrand 
+
+2000-05-11  Harlan Stenn  
+
+	* scripts/mkver.in (ConfStr): Use -r if we're using RSAREF,
+	otherwise use -a if we're using autokey, otherwise use no extra
+	suffix.
+
+2000-05-11  Sven Dietrich  
+
+	* ports/winnt/include/config.h: New defines to support AUTOKEY
+	* ports/winnt/include/unistd.h: Added another dummy placeholder.h
+	* ports/winnt/ntpd/ntpd.dsp: Added ntp_crypt.c to makefile
+	* ports/winnt/ntpd/ntpd.c: service_main needs a local hostname[]
+	* html/hints/winnt.htm: Add remark about 4.0.99i not compiling.
+	These changes got WINNT running again. No idea if the keys stuff
+	works however.
+
+2000-05-10  Harlan Stenn  
+
+	* configure.in: 4.0.99i9
+
+	* ntpd/ntp_crypto.c: tstamp and autokey cleanup
+	From: Dave Mills
+
+	* ntpd/ntp_proto.c (clock_update): Only call expire_all() if
+	AUTOKEY
+	From many folks, including Reg Clemens 
+
+2000-05-07  Harlan Stenn  
+
+	* configure.in: 4.0.99i8
+
+	* flock-build: Use new --with-crypto choices
+	* build (KEYSUF): Deal with new --with-crypto
+	* configure.in: --with-crypto={md5,autokey,rsaref};
+	lose --enable-autokey
+
+2000-05-06  Harlan Stenn  
+
+	* build (KEYSUF): Catch --disable-autokey first.
+
+2000-05-05  Harlan Stenn  
+
+	* flock-build: If we don't use autokey, don't use rsaref either.
+
+	* configure.in: 4.0.99i7
+
+	* build (KEYSUF):
+	* flock-build:
+	It's --disable-autokey now
+
+	* configure.in: MD5 is not optional (but AUTOKEY is)
+	* include/ntp_stdlib.h:
+	* libntp/a_md5encrypt.c:
+	* libntp/authkeys.c:
+	(authhavekey):
+	(MD5auth_setkey):
+	(auth_delkeys):
+	(authencrypt):
+	(authdecrypt):
+	* libntp/authreadkeys.c:
+	(authreadkeys):
+	* ntpd/ntp_proto.c (init_proto):
+	* libntp/authusekey.c:
+	MD5 is required.
+
+2000-05-04  Harlan Stenn  
+
+	* configure.in: 4.0.99i6
+
+	* ntpd/ntp_proto.c (transmit): Fix up the UNREACH code.
+	(receive): Lose some debug code.
+	(clock_update): expire_all() if LEAP_NOTINSYNC
+	crypto_xmit() a CRYPTO_AUTO if !FLAG_AUTOKEY instead of recauto.tstamp
+	crypto_xmit() a CRYPTO_PRIV (not CRYPTO_AUTO) based on pcookie.tstamp
+	crypto_xmit() a CRYPTO_AUTO (not CRYPTO_PRIV) based on FLAG_MCAST2
+	and !FLAG_AUTOKEY
+	* ntpd/ntp_crypto.c (crypto_recv): Clean up debug output.
+	Don't AUTOKEY if FLAG_MCAST2
+	From: Dave Mills
+
+	* flock-build: Also make obe withouyt md5 (no AUTOKEY)
+	* build (BDIR): Handle -noautokey build directory suffix
+	* configure.in: Prepare for AUTOKEY in mkver.in
+	* scripts/mkver.in (ConfStr): Indicate in the version string if
+	we're not using AUTOKEY.
+
+2000-05-03  Harlan Stenn  
+
+	* scripts/ntp-wait.in: Fun things with backspaces
+
+	* configure.in: 4.0.99i5
+
+	* ntptrace/ntptrace.c: Protect sys/ioctl.h; grab config.h
+
+	* ntpd/ntp_proto.c (transmit): AUTOKEY and tstamp fixes.
+	(clock_update): Check oleap against LEAP_NOTINSYNC
+	(peer_clear): Free pubkey when we're done
+	Check peer's keynumber against the seq in MODE_BROADCAST.
+	Reorder tstamp changes.
+	* ntpd/ntp_crypto.c (crypto_recv): Check the packet if we get a
+	CRYPTO_RESP and reorder the update of tstamp.
+	(crypto_recv): Don't expire the peer until we're thru with it.
+	* include/ntp.h: AUTOKEY and pkeyid changes
+	From Dave Mills
+
+	* ntpdate/ntpdate.c: Protect sys/ioctl.h
+
+2000-05-01  Harlan Stenn  
+
+	* configure.in: 4.0.99i4
+
+	* include/ntp.h:
+	* include/ntp_crypto.h:
+	* include/ntpd.h:
+	* ntpd/ntp_crypto.c:
+	* ntpd/ntp_proto.c:
+	* ntpd/ntpd.c:
+	* util/ntp_genkeys.c:
+	Dave Mills closed some potential vulnerabilities in the key protocol.
+
+2000-04-28  Harlan Stenn  
+
+	* configure.in: 4.0.99i3
+
+	* ntpd/ntp_proto.c: Just check tstamp, forget about sndauto.seq
+	* ntpd/ntp_crypto.c (crypto_recv): Lose inappropriate ntohl()
+	conversion on tstamp.
+	AUTOKEY if tstamp>0, not !=
+	Stash tstamp before we check pcookie.key (several places)
+	* ntpd/ntp_control.c (ctl_putpeer): In CP_INITSEQ, check
+	recauto.key, not keylist.
+	From: Dave Mills
+
+2000-04-27  Harlan Stenn  
+
+	* configure.in: 4.0.99i2
+
+	* ntpq/ntpq.c: PUBKEY stuff
+	* ntpd/ntp_proto.c (clock_select): nreach, and better survivor pick.
+	* ntpd/ntp_peer.c (newpeer): Better nextdate choice.
+	* ntpd/ntp_control.c (ctl_putsys): Buglet in CS_HOSTNAM code.
+	From Dave Mills.
+
+2000-04-24  Harlan Stenn  
+
+	* build (IAM): Show hostname if we trip a buildkey check.
+
+2000-04-23  Harlan Stenn  
+
+	* build: deal with optional 1st argument (SIG), which must match
+	the contents of .buildkey
+
+	* flock-build: Generalize, implement SIG and .buildkey, and drive
+	list from LIST, which the user can override.
+
+2000-04-21  Harlan Stenn  
+
+	* configure.in: 4.0.99i1
+	Dave updated some docs, implemented the kpoll variable, and
+	wiggled a host/network byte order thing in the crypto key code.
+
+2000-04-16  Harlan Stenn  
+
+	* ntpd/refclock_wwvb.c (wwvb_receive): Grab any character (instead
+	of just a space) before the DSTchar.
+	From: Dave Mills
+
+2000-04-11  Harlan Stenn  
+
+	* configure.in: 4.0.99i
+
+	Dave made some documentation updates.
+
+2000-04-08  Harlan Stenn  
+
+	* flock-build: Add malarky.  By default, --enable-parse-clocks.
+	Start 2 builds, one with and the other without rsaref.
+
+	* configure.in: 4.0.99h6
+	Dave improved the crypto stuff some more.
+
+2000-04-05  Harlan Stenn  
+
+	* ntpd/refclock_acts.c (acts_receive): Do a better job with year
+	conversions and leap-year checks.  The PTB stuff caught this.
+	Reported by: Daniel.Aeby@eam.admin.ch
+
+2000-04-02  Harlan Stenn  
+
+	* ntpd/refclock_atom.c (atom_pps): Bugfix
+	From: Philippe Charnier 
+
+2000-03-30  Harlan Stenn  
+
+	* libparse/clk_wharton.c (cvt_wharton_400a): Do not return
+	CVT_NONE when receiving the early warning bit set.
+	From: Philippe De Muyter  
+
+	* configure.in: 4.0.99h5
+	Dave made more changes to the auth key stuff.
+
+2000-03-29  Harlan Stenn  
+
+	* configure.in: 4.0.99h4
+	Dave made a bunch of changes/fixes to the auth key stuff.
+
+2000-03-22  Harlan Stenn  
+
+	* ntpd/ntp_resolver.c: Typos.
+
+2000-03-21  Harlan Stenn  
+
+	* configure.in: 4.0.99h3
+
+	* ntpd/ntp_intres.c: Use LOG_INFO instead of LOG_DEBUG.
+	* ntpd/ntp_resolver.c: Ditto.
+
+2000-03-20  Harlan Stenn  
+
+	* util/Makefile.am (ntp_genkeys_LDADD): Might need snprintf (-lntp)
+
+	* librsaref/Makefile.am (stamp-rsaref): nodist_HEADERS are not
+	supoprted yet.  Hack around it.
+
+	* ntpd/ntp_resolver.c (findhostaddr): hstrerror isn't always available.
+
+	* configure.in: Look for hstrerror.
+
+	* util/ntp_genkeys.c (main): Use snprintf, not sprintf.
+
+	* ntpd/ntp_crypto.c: Use gethostname, not uname
+	* util/ntp_genkeys.c: Ditto
+	From: Dave Mills
+
+2000-03-19  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (receive): Rename ntp_res_send() to
+	  ntp_res_name() and adjust the number of arguments.
+	* ntpd/ntp_resolver.c (ntp_res_name): Ditto
+	* include/ntpd.h: Ditto
+
+	* ntpd/ntp_resolver.c: Add de_done to the dns_entry structure.
+
+2000-03-18  Harlan Stenn  
+
+	* configure.in: 4.0.99h2
+
+	* libparse/Makefile.am (info_trimble.c): Use $(srcdir)/foo.sed
+	instead of foo.sed .
+
+	* librsaref/Makefile.am (stamp-rsaref): Copy each file to the build
+	directory, not to the source directory.  This sucks; it wastes
+	space (but it's more portable).
+
+	* configure.in (ac_busted_vpath_in_make): Add FreeBSD.  I bet all
+	systems that use pmake will need this.
+	(ac_busted_vpath_in_make): Remove FreeBSD - I found a workaround.
+
+	* Makefile.am: General cleanup
+
+	* configure.in: 4.0.99h1
+
+	* ntpd/ntp_resolver.c: Lose unneeded header.
+
+2000-03-17  Harlan Stenn  
+
+	* libntp/snprintf.c: #include 
+
+	* libntp/Makefile.am (EXTRA_libntp_a_SOURCES): Use it correctly...
+
+2000-03-16  Harlan Stenn  
+
+	* libntp/Makefile.am (EXTRA_DIST): Added snprintf.c
+
+	* configure.in: Look for (and provide if it's missing) snprintf()
+
+	* ntpd/ntp_request.c (dns_a): Call crypto_public with the resolved
+	name and the peer pointer.
+	(dns_a): crypto_public() is only available if PUBKEY is #defined.
+
+	* ntpd/ntp_crypto.c (crypto_public): sprintf is Evil.  Use snprintf.
+	(crypto_setup): Ditto
+	(crypto_read): Ditto
+
+	* ntpd/ntp_resolver.c (ntp_res_send): Lose some debugging noise.
+
+	* ntpd/ntp_config.c (getconfig): Lose testing code.
+
+	* ntpd/ntp_request.c (dns_a): Fix buglet in hostname length check.
+
+2000-03-16  Harlan Stenn  
+
+	* ntpd/ntp_request.c (dns_a): Start cracking the returned information.
+
+2000-03-15  Harlan Stenn  
+
+	* ntpd/ntp_resolver.c (ntp_res): Authenticate the keyid.
+
+	* ntpd/ntp_crypto.c (crypto_line): Fix definition
+	(crypto_read): Ditto.
+
+	* ntpd/ntp_config.c (getconfig): Move req_keyid generation here.
+
+	* librsaref/Makefile.am (BUILT_SOURCES): Cleanup more nodist_ stuff.
+
+2000-03-14  Harlan Stenn  
+
+	* build (RSASUF): If we have rsaref2/ and are building
+	--without-rsaref, note it as a build-directory suffix.
+
+	* configure.in: 4.0.99h
+	Crypto merge
+
+	* librsaref/Makefile.am (nodist_librsaref_a_SOURCES): Added nodist_
+
+2000-02-28  Harlan Stenn  
+
+	* configure.in: Lose the changequote calls and fix the quoting.
+	Reported by: Akim Demaille 
+
+	* ntpd/ntp_request.c: Log various error conditions.
+
+2000-02-27  Harlan Stenn  
+
+	* configure.in: 4.0.99g
+
+	* ntpd/ntpd.c: Only log EINTR if debug > 2.
+
+2000-02-25  Harlan Stenn  
+
+	* scripts/mkver.in (ConfStr): Use `-r' when configured with crypto.
+
+	* ntpd/refclock_wwvb.c (wwvb_receive): Undo the previous chagne.
+
+2000-02-24  Harlan Stenn  
+
+	* ntpd/refclock_wwvb.c (wwvb_receive): LENWWVB0 can return 6 or 7
+	fields.
+	From: Michael Sinatra 
+	with a cleanup from Ulrich.
+
+	* scripts/mkver.in (ConfStr): Make RSAREF appear as part of the
+	version.
+
+2000-02-21  Sven Dietrich 
+
+	* ports/winnt/include/config.h: Enable MD5 and RANDOM by default
+	* ports/winnt/libntp/SetSystemTime.c: Fix warning and const declaration
+	From: Carl Byington 
+
+2000-02-21  Harlan Stenn  
+
+	* Makefile.am (SUBDIRS): Make librsaref right after includes so we
+	can copy any needed header files over.
+
+	* libntp/Makefile.am (INCLUDES): Also look in librsaref for des.h
+	* ntpd/Makefile.am (INCLUDES): Ditto
+	* util/Makefile.am (INCLUDES): Ditto
+
+	* librsaref/Makefile.am (librsaref_a_SOURCES): Use the des.h from
+	the rsaref2 distribution.
+
+	* include/Makefile.am (noinst_HEADERS): No, we don't want des.h
+
+2000-02-20  Harlan Stenn  
+
+	* include/Makefile.am (noinst_HEADERS): Add des.h
+
+2000-02-19  Harlan Stenn  
+
+	* ntpd/ntp_config.c (do_resolve_internal): Try Real Hard to
+	generate a full random key.
+	From: Carl Byington 
+
+	* include/ntp.h: Now we know we have either mrand48() or random().
+	* configure.in: If we have mrand48, use it.  Otherwise, use (and
+	provide if necessary) random().
+	* libntp/Makefile.am (EXTRA_DIST): random.c
+	* libntp/random.c: Added.
+
+2000-02-18  Harlan Stenn  
+
+	* librsaref/Makefile.am (stamp-rsaref): Typo
+
+	* configure.in (ac_cv_func_ctty_for_f_setown): Yes for OpenBSD
+	(ac_cv_var_ntp_syscalls): Fix quoting of description
+	From: Jonathan Rozes 
+
+	* librsaref/Makefile.am: Fix stamp-rsaref dependency order.
+
+	* configure.in: 4.0.99f
+
+2000-02-17  Harlan Stenn  
+
+	* ntpd/refclock_mx4200.c: Remove the DOP-weighted position
+	averaging code and revert to a simple mean average.  The weighted
+	average consistently produced a *worse* result.  Go figure.
+	* html/mx4200data.htm: Cleanup, reflect current reality.
+	* html/driver9.htm: Cleanup, reflect current reality.
+	* html/copyright.htm: Cleanup, and credit where credit is due.
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_oncore.c: Cleanup/fixes
+	* html/driver30.htm: Cleanup
+	* html/Oncore-SHMEM.htm: Cleanup
+	From: Reg Clemens 
+
+2000-02-16  Sven Dietrich 
+
+	* winnt/scripts/mkver.bat:    Frederick Czajka [w2k@austin.rr.com]
+	  winnt/ntpq/ntpq.dsp:        modified mkver.bat to eliminate the
+	  winnt/ntpd/ntpd.dsp:	      need to have Perl installed and the
+	  winnt/ntpdc/ntpdc.dsp:      PERL environment variable to be set.
+	  winnt/ntpdate/ntpdate.dsp:
+	  winnt/ntptrace/ntptrace.dsp:    Thanks, Frederick!
+
+	* ntpd/refclock_nmea.c: Correctly interpret the quality indicator.
+
+2000-02-15  Harlan Stenn  
+
+	* ntpd/refclock_nmea.c: Correctly interpret the quality indicator.
+	Deal with the time supplied in centiseconds.  GPGCA/GPGGA cleanup.
+	From: Andrew Hood 
+
+	* libparse/Makefile.am (K_CFLAGS): Use instead.  Add NEED_NTP_BOPS.
+
+2000-02-10  Harlan Stenn  
+
+	* scripts/ntp-wait.in: Intensify, including some suggestions from
+	Ulrich.
+
+	* configure.in: 4.0.99e
+
+	* scripts/ntp-wait.in: Lose cruft, sleep after each try.
+
+	* scripts/ntp-restart: It's ntpd now.  Also, call ntp-wait.
+
+	* configure.in (AC_CONFIG_*): New scripts that use PATH_PERL
+
+	* scripts/Makefile.am (noinst_SCRIPTS): Added ntp-wait
+	(noinst_SCRIPTS): Added all of the scripts that now use PATH_PERL
+
+	* configure.in: Get the path to perl
+	(AC_CONFIG_*): Added scripts/ntp-wait
+
+	* ntptrace/ntptrace.c (DoTrace): If the server's srcadr is 0.0.0.0
+	then we haven't synced yet.  Note and punt.
+	Reported by: Bdale Garbee ,http://bugs.debian.org/56551
+
+2000-02-09  Harlan Stenn  
+
+	* ports/winnt/include/config.h: Typo (CLOCK_PALISADE comment)
+	From: Carl Byington 
+
+	* configure.in: Disable kernel_fll_bug for Generic_105181-17 under
+	Solaris-2.6
+	From: Juergen Georgi 
+
+2000-02-07  Harlan Stenn  
+
+	* configure.in: 4.0.99d
+
+	* html/Oncore-SHMEM.htm: New document
+	* html/driver30.htm: Cleanup and improvements
+	From: Reg Clemens 
+
+2000-01-30  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c: Patches/improvements
+	From: Reg Clemens 
+
+2000-01-29  Harlan Stenn  
+
+	* configure.in: 4.0.99c
+
+2000-01-28  Harlan Stenn  
+
+	* configure.in: Autoconf update...
+
+	* ntpdate/ntpdate.c (ntpdatemain): Typo
+	From: Jack Bryans 
+
+	* Makefile.am (EXTRA_DIST): Add flock-build.  Probably UDel specific...
+
+2000-01-23  Harlan Stenn  
+
+	* ntpd/check_y2k.c (main): Reformat for ansi2knr
+
+	* configure.in (AC_OUTPUT): Revert to obsolete form until automake
+	catches up.
+
+2000-01-22  Harlan Stenn  
+
+	* configure.in: Use AC_CHECK_TYPES((s_char)) instead of
+	AC_CHECK_TYPE.
+	(ac_cv_var_kernel_fll_bug): Generic_106541-08 is apparently OK, too.
+
+	* scripts/Makefile.am (EXTRA_DIST): Need to explicitly distribute
+	mkver.in and ntpver.in now, apparently.
+	* configure.in: Search for the various audio_info members so the
+	printing in audio_show is less of a circus.  This required an
+	autoconf upgrade.  Major sigh.
+
+	* libntp/audio.c (audio_show): Clean up (more) properly.
+
+2000-01-21  Sven Dietrich 
+
+	* Add pointer to html/hints/winnt.htm to INSTALL file
+	* Fix NT makefiles to accomodate at least one weird
+	  version of Visual C that can't handle the LFs without
+	  the DOS CR also.
+
+2000-01-20  Sven Dietrich 
+
+	* Update Copyright in Palisade driver to 2000
+	* Fix Palisade MIN & MAX POLL to optimal values
+
+2000-01-19  Harlan Stenn  
+
+	* html/driver7.htm: Patches from Dave Mills
+	* html/driver36.htm: Patches from Dave Mills
+
+	* html/copyright.htm: Added Kamal Mostafa
+
+2000-01-19  Harlan Stenn  
+
+	* configure.in: 4.0.99b
+
+2000-01-18  Harlan Stenn  
+
+	* ntpd/refclock_chu.c: NCHAN is used with generic ICOM.
+
+	* ntpd/refclock_wwv.c: Use new audio stuff
+	* ntpd/refclock_irig.c: Use new audio stuff
+	* ntpd/refclock_chu.c: Use new audio stuff
+	* ntpd/ntp_proto.c: Clean up
+	* ntpd/ntp_loopfilter.c (local_clock): Clean up error message
+	* include/icom.h: Number of arguments changed
+	* libntp/Makefile.am (libntp_a_SOURCES): Added audio.c
+	* libntp/audio.c: New file
+	* include/Makefile.am (noinst_HEADERS): audio.h added
+	* include/audio.h: New file
+	From: Dave Mills 
+
+	* scripts/freq_adj: Added.  FreeBSD frequency adjustment script.
+
+	* configure.in: Do a better job on my oncore_ok check for SCO.
+
+2000-01-15  Harlan Stenn  
+
+	* configure.in: 4.0.99a
+
+	* scripts/ntpsweep: New version
+	* html/copyright.htm: Added Hans Lambermont
+	From: Hans Lambermont 
+
+2000-01-14  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c (oncore_start): Only dance with the
+	pps_device if it's there.
+	From: reg@dwf.com
+
+	* configure.in: ONCORE is OK if ac_cv_hdr_def_tiocdcdtimestamp=yes
+
+	* build: Just overwrite the log file each time; sometimes NFS goes
+	a little goofy.
+
+	* ntpd/refclock_fg.c: Syntax/punctuation cleanup
+
+2000-01-13  Harlan Stenn  
+
+	* scripts/ntpsweep: New version
+	From: Hans Lambermont 
+
+	* ntpd/refclock_fg.c: New version
+	* html/driver37.htm: New version
+	From: Dmitry Smirnov 
+
+2000-01-12  Harlan Stenn  
+
+	* README.des: Cleanup
+
+2000-01-12  Harlan Stenn  
+
+	* configure.in: 4.0.99
+
+	* html/driver36.htm: Cleanup
+	* html/monopt.htm: Ditto
+	From: Dave Mills 
+
+	* ntpd/ntp_intres.c (ntp_intres): Put "NTP_INTRES running" at a
+	higher debug level
+
+2000-01-11  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c: More improvements
+	From: Dave Mills 
+
+2000-01-10  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c: Bugfixes/improvements
+	From: Dave Mills 
+
+	* configure.in: Get the quoting right on the sys_errlist check.
+	From documentation by: Akim Demaille 
+
+2000-01-08  Harlan Stenn  
+
+	* configure.in:  cannot be detected...
+	* ntpd/ntp_io.h: ...but every OS has it
+	* ntpd/refclock_oncore.c: Lint removal
+	* ntpq/ntpq_ops.c: Lint removal
+	* ntpq/refclock_chu.c: chu_major() is not an audio routine (?), lint
+	* libntp/icom.c: AIX doesn't have 
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_chu.c: NetBSD needs sys/ioctl.h
+	(chu_debug): NetBSD-specific debug output.
+	From: Frederick Bruckman 
+
+2000-01-06  Harlan Stenn  
+
+	* configure.in: 4.0.98m
+	I skipped `l' - it looks like a `1'.
+
+	* html/driver7.htm: Doc update
+	* html/driver36.htm: Ditto
+	* html/audio.htm: Ditto
+
+	* ntpd/refclock_wwv.c: Dvae snuck another fix/change in on me.
+
+	* configure.in: 4.0.98k
+
+	* ntpd/refclock_chu.c (chu_start): Call icom_init with the speed
+	* ntpd/refclock_wwv.c (wwv_start): Ditto, plus other improvements.
+	* libntp/icom.c (icom_init): Add speed parameter
+	* include/icom.h: Update declaration
+	From: Dave Mills 
+
+	* include/Makefile.am (noinst_HEADERS): Added icom.h
+	From: Frederick Bruckman 
+
+2000-01-05  Harlan Stenn  
+
+	* configure.in: 4.0.98j
+
+	* ntpd/refclock_wwv.c (timecode): Make definition == declaration
+	(wwv_newchan): Ditto
+	(wwv_corr4): Dave fixed the declaration.
+
+	* flock-build: Add rackety to the flock - it runs SunOS 4.1.3/cc
+
+	* ntpd/refclock_wwv.c: Undo that declaration cleanup for now...
+
+	* ntpd/ntp_io.c (open_socket): TOS support
+	From: Marc.Brett@westgeo.com
+
+2000-01-04  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c: Declaration cleanup
+	* ntpd/refclock_fg.c (fg_receive): Not all sprintf's are created
+	equal...
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_wwv.c: Dave Cleaned and Improved things.
+	* ntpd/ntp_loopfilter.c (local_clock): Dave fixed something.
+
+	* ntpd/refclock_wwv.c: Rename max to p_max or s_max as appropriate
+	to avoid native SunOS compiler collision.
+	(wwv_epoch): Make declaration == definition
+	(wwv_rsec): Ditto
+	(wwv_newchan): Ditto
+	(wwv_qsy): Ditto
+	(timecode): Ditto
+
+	* ntpd/refclock_oncore.c (oncore_init_shmem): Use a cast to widen
+	mmap's NIL offset.
+
+	* ntpd/refclock_chu.c (chu_rf): Make declaration == definition.
+	Rename min/max to es_min/es_max to avoid native SunOS compiler
+	collision.
+	(chu_uart): Make declaration == definition.
+
+	* libntp/icom.c (sndpkt): Make declaration and definition equivalent.
+	(doublefreq): Ditto.
+
+	* ntpd/refclock_oncore.c (MAP_FAILED): Some systems do not #define
+	this.
+
+	* ntpd/refclock_wwv.c:
+	* ntpd/refclock_chu.c:
+	* libntp/icom.c:
+	* libntp/Makefile.am:
+	* include/icom.h:
+	* html/driver7.htm:
+	* html/driver36.htm:
+	Support for ICOM.  The WWV/H driver, by the way, is getting truly
+	awesome.  The CHU autotune function works okay as it is.  I'd like
+	to find somebody else to test the audio drivers just to make sure
+	I haven't done something stupid.  There is a new define ICOM
+	intended for the driver autotune function; however, I crafted the
+	thing in much the same way as the refclock_atom.c thing - it tries
+	to open /dev/icom and, if that fails, goes quietly to sleep.
+	From: Dave Mills 
+
+2000-01-03  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c (oncore_read_config): Patches and cleanup
+	From: Poul-Henning Kamp 
+	more isascii() stuff from HMS.
+
+	* ntpd/refclock_fg.c (fg_receive): Cast.
+	From: Tom Smith 
+
+	* ntpd/map_vme.c (map_vme): tx.access_result indicates failure on
+	< 0, not <= 0.  A fix that apparently did not get brought over
+	from the ntp3 base.
+	From: Michael Barone 
+
+	* configure.in: Move the ONCORE_SHMEM_STATUS check and definition
+	here.
+
+	* ntpd/refclock_oncore.c (oncore_init_shmem): Some systems do not
+	have MAP_HASSEMAPHORE.
+
+	* ntpd/refclock_oncore.c: Drive ONCORE_SHMEM_STATUS based on
+	HAVE_SYS_MMAN_H .  If this needs finer checks, do it in
+	configure.in .
+	(oncore_read_config): Add the isascii() checks; older versions of
+	Unix don't guarantee correct behavior of is*() without it.
+
+	* ntpd/refclock_oncore.c: Add proof-of-concept support for
+	  delivering receiver data stream to other processes through
+	  a memory-mapped file.
+	  From: Poul-Henning Kamp 
+
+2000-01-02  Harlan Stenn  
+
+	* configure.in (ac_refclock_chu): Provide the CHU driver by
+	default, and by default prefer the AUDIO version.  We used to
+	limit this to SunOS or Solaris; now we drive by the availability
+	of the audioio header file.
+	Select the IRIG and WWV audio drivers the same way.
+
+	* flock-build: build ignores the -l flag; lose it.
+	(BUILD_ARGS): added.
+	* build: Remove unused -l stuff (LOG variable).
+
+	* ntpd/ntp_refclock.c: HAVE_PPSAPI header cleanup
+	From: Reg Clemens 
+
+2000-01-01  Harlan Stenn  
+
+	* configure.in (CLOCK_WWV): Require  or 
+
+1999-12-29  Harlan Stenn  
+
+	* configure.in: 4.0.98i
+
+	* ntpd/refclock_gpsvme.c: Fixes
+	From: Michael Barone 
+	Patch severely hacked by HMS to "make it conform".  I hope I
+	didn't break anything.
+
+	* scripts/ntpsweep: Nifty utility
+	From: Hans.Lambermont@nl.origin-it.com
+
+	* ntpd/refclock_fg.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/ntp_control.c:
+	* ntpd/Makefile.am:
+	* libntp/clocktypes.c:
+	* include/ntp.h:
+	* html/refclock.htm:
+	* html/driver37.htm:
+	* configure.in:
+	* acconfig.h:
+	Forum Graphic GPS clock support
+	From: Dmitry Smirnov 
+
+	* configure.in: Default to compile the IRIG, CHU and WWV/H
+	drivers and compile the CHU driver for audio, not modem.
+	Requested by Dave Mills.
+
+	* html/audio.htm:
+	* html/driver36.htm:
+	* html/qth.htm:
+	Dave wrote these to go along with the changes I checked in yesterday.
+
+1999-12-28  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_chu.c:
+	* ntpd/ntp_refclock.c:
+	* ntpd/ntp_loopfilter.c:
+	* html/refclock.htm:
+	* html/pps.htm:
+	* html/index.htm:
+	* html/driver7.htm:
+	* html/driver6.htm:
+	* html/copyright.htm:
+
+	I indulged an old agenda to polish up some programs originally
+	written for a DSP evaluation board. The result is a really hot
+	audio driver for the NIST WWV/WWVH time/frequency station plus a
+	makeover for the CHU audio driver. Currently, they and their IRIG
+	audio driver buddy use the SunOS/Solaris audio interface, which is
+	clean and simple. I hook the line in jack to a shortwave radio and
+	these drivers (driver 7 for CHU and driver 36 for WWV) and the
+	drivers do the rest. The WWV/H driver is really hot - I am
+	currently watching the ionosphere move from the doppler that shows
+	up on the tick modulation tracked by the program. During midday
+	when the F2 layer settles down, the program closes in on a few
+	tens of microseconds of spare jitter and wander.  This watch on
+	whichever 15/20 MHz signal sounds the best. At night on 5/10 MHz
+	and even 2.5 HMz where the multipath, interference and noise are
+	much worse, the driver bangs around somewhat more.
+
+	The CHU driver makeover discovered a few broken bones after all
+	these years, but its majority decoder is back in business. For
+	various reasons to icky to reveal here, its 103-modem demodulator
+	is not quite as good as the chip, but it comes close and hey,
+	2025/2125 FSK is just not a good idea for HF radio. This driver is
+	not nearly as sophisitcated as the WWV/H driver, but here a few
+	hundred miles south of Ottawa, it does a passably good job.
+
+	I tell you this in the hopes of getting somebody interested in
+	porting the audio interface to other machines, in particular
+	Linux, FreeBSD and anything else with a sound card. When the
+	ionosphere stays cool, the WWV/H driver is as good as anything
+	else around here and with much less jitter than a serial port. The
+	only downside is all the audio drivers chew up a modest fraction
+	of cycles for the DSP routines - a few percent on the newer
+	silicon, up to half the cycles on an old Sparc IPC. Whattheheck,
+	these old machines aren't doing anything else around here except
+	serving time, and even when sucking cycles for DSP they still mind
+	the PPS microseconds.
+
+	The audio driver documentation had a makeover, too.
+	From: Dave Mills 
+
+1999-12-20  Harlan Stenn  
+
+	* configure.in: 4.0.98h
+
+1999-12-19  Harlan Stenn  
+
+	* libntp/syssignal.c: Small cleanup to Marc's patch.
+
+	* ntpd/ntp_refclock.c:
+	* ntpd/refclock_atom.c: Header cleanup
+	* html/driver30.htm: Cleanup and improvements.
+	From: Reg Clemens 
+
+	* ntpd/ntp_refclock.c:
+	* ntpd/refclock_jupiter.c:
+	* ntpd/refclock_msfees.c:
+	* ntpd/refclock_mx4200.c:
+	Portability (Solaris) patches
+	* ntpd/refclock_mx4200.c:
+	Self-survey improvements, cleanup for, PPS re-activation
+	* libntp/syssignal.c:
+ 	Fix for "interrupted system call" (EINTR) failure of the PPS
+	ioctl(TIOCGPPSEV) call in Solaris.  Not sure why it was
+	interrupted, but this works around the failure.  Not sure if
+	the (now silent) interrupt affects the timing accuracy.
+		THERE IS A CHANCE THIS PART OF THE PATCH MAY ADVERSELY
+		AFFECT OTHER SYSTEMS!
+	* scripts/ntp-status: Added.
+	From: Marc.Brett@westgeo.com
+
+	* ntpdate/ntpdate.c: Deal with multiple addresses.
+	From: Jeffrey C Honig 
+
+	* ntpd/refclock_conf.c: Replaced macro SHM with CLOCK_SHM.
+	* ntpd/refclock_shm.c (shm_poll): Take clock time in UTC.
+		pp->day starts at 1, t->tm_yday starts at 0.
+	From: Jakob Stoklund Olesen 
+
+1999-12-16  Harlan Stenn  
+
+	* NEWS: Updated ONCORE instructions
+	From: Kamal A Mostafa 
+
+1999-12-13  Harlan Stenn  
+
+	* configure.in: 4.0.98g
+
+	* ntpd/refclock_oncore.c: Cleanup and fixes
+	From: Reg Clemens  and Kamal A Mostafa 
+
+1999-12-11  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c: Cleanup/checkin of the current state of affairs.
+	From: Dave Mills 
+
+	* ntpd/refclock_oncore.c: #elif conversion.  I can only hope I did
+	it right.
+
+	* ntpd/refclock_oncore.c: Various patches
+	From: Reg Clemens  and Kamal A Mostafa 
+
+1999-12-09  Harlan Stenn  
+
+	* ntpd/ntp_proto.c (default_get_precision): Use the right arg type
+	to pass "sizeof freq" to sysctlbyname().
+	From: Ollivier Robert 
+
+	* ntpd/refclock_wwv.c: Cleanup and fixes.
+	From: Dave Mills 
+
+1999-12-08  Harlan Stenn  
+
+	* ntpd/refclock_wwv.c: Cleanup and fixes
+	* ntpd/refclock_conf.c: WWV declaration cleanup.
+	From: Dave Mills 
+
+1999-12-07  Harlan Stenn  
+
+	* libparse/clk_rawdcf.c (cvt_rawdcf): Buglet.
+	From: Frank Kardel 
+
+1999-12-06  Harlan Stenn  
+
+	* ntpd/Makefile.am (ntpd_SOURCES): Added refclock_wwv.c
+
+	* ntpd/refclock_wwvb.c:
+	* ntpd/refclock_wwv.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_chu.c:
+	* libntp/clocktypes.c:
+	* include/ntp.h: Dave cleaned some things up
+	Dave cleaned some things up (WWVB -> SPECTRACOM, CHU -> CHU_AUDIO,
+	WWV_AUDIO)
+
+	* acconfig.h: REFCLOCK_WWVB -> REFCLOCK_SPECTRACOM, added REFCLOCK_WWV
+	* configure.in: Deal with it.
+
+1999-12-05  Harlan Stenn  
+
+	* ntpd/ntp_refclock.c (refclock_open): More PPS cleanup
+	From: Dave Mills 
+
+	* ntpq/ntpq.c:
+	* ntpq/ntpq_ops.c:
+	Make `ntpq -pn' independent of DNS, ad advertised.
+	From: Kamal A Mostafa 
+
+	* ntpd/refclock_mx4200.c (mx4200_start): make missing 3rd
+	parameter a 0.
+
+1999-12-04  Harlan Stenn  
+
+	* ntpd/ntp_refclock.c (refclock_open): "flags" processing cleanup
+	(refclock_open): PPS device initialization cleanup
+	* include/ntp_refclock.h (LDISC_CHU):
+	(LDISC_PPS): Clean up comments
+	From: Dave Mills 
+
+1999-12-03  Sven Dietrich 
+
+	* libntp/mexit.c: Moved WINNT port specific file to ports/winnt/libntp
+	* ports/winnt/libntp/libntp.dsp: Fix WinNT makefile for new source loc.
+
+1999-12-03  Harlan Stenn  
+
+	* libntp/Makefile.am (libntp_a_SOURCES): Lose mexit.c - Sven will
+	move it to the winnt port area.
+
+1999-12-03  Sven Dietrich 
+
+	* libntp/systime.c: Removed adjtime hack for WINNT
+	* ports/winnt/ntpd/nt_clockstuff.c: Winnt double precision adjtime
+	* ports/winnt/inlcude/clockstuff.h: Remove no longer needed externs
+
+1999-12-02  Harlan Stenn  
+
+	* libparse/Makefile.in: Manually hacked to remove the
+	libparse_kernel.a.[co] cruft
+
+	* libparse/Makefile.am (k*.o): Generate these form the Makefile,
+	not from separate .c files
+
+	* html/tickadj.htm:
+	* html/notes.htm:
+	* html/hints/solaris.html:
+	Point to the new dosynctodr report.
+
+	* html/hints/solaris.xtra.S99ntpd:
+	Update.  Should be rewritten to take advantage of the new -g
+	switch and perhaps a loop to wait until ntpd hits a reasonable
+	"state".
+
+	* html/hints/solaris-dosynctodr.html: New information
+	From: "John W. Sopko Jr." 
+
+1999-12-01  Harlan Stenn  
+
+	* libntp/authkeys.c (auth_moremem): Clear memory allocated for sk.
+	From: Hugo Mildenberger 
+
+1999-12-01  Sven Dietrich 
+
+	* libntp/recvbuff.c: Unused functions cleanup
+	* ntpd/ntpd.c: ProcessorAffinity, IO cleanup
+	* ports/winnt/instsrv/instsrv.c: Service name changed to NTP
+
+	NT port shouldn;t hop between CPUs. Set affinity to first processor.
+	Service name was NetworkTimeProtocol. Too long. Now NTP.
+
+1999-12-01  Harlan Stenn  
+
+	* scripts/plot_summary.pl: Improved option parsing.  Fixed one
+	minor Perl compatibility error.
+	* scripts/summary.pl: Official revision for NTPv4: Parse new
+	statistic file formats correctly, provide error checking for bad
+	input files, and guard against negative arguments to sqrt()
+	because of numeric effects.  Use one pattern to select valid
+	statistic files.  Add selectable output directory
+	(``--output-directory'') and improved option parsing.  Directory
+	with statistic files (now settable also with
+	``--input-directory'') defaults to ``/var/log/ntp''.
+	From: Ulrich Windl  
+
+	* html/driver8.htm:
+	* libparse/clk_computime.c:
+	* libparse/clk_dcf7000.c:
+	* libparse/clk_hopf6021.c:
+	* libparse/clk_meinberg.c:
+	* libparse/clk_rawdcf.c:
+	* libparse/clk_rcc8000.c:
+	* libparse/clk_schmid.c:
+	* libparse/clk_trimtaip.c:
+	* libparse/clk_trimtsip.c:
+	* libparse/data_mbg.c:
+	* libparse/kclk_computime.c:
+	* libparse/kclk_dcf7000.c:
+	* libparse/kclk_hopf6021.c:
+	* libparse/kclk_meinberg.c:
+	* libparse/kclk_rawdcf.c:
+	* libparse/kclk_rcc8000.c:
+	* libparse/kclk_schmid.c:
+	* libparse/kclk_trimtaip.c:
+	* libparse/kclk_trimtsip.c:
+	* libparse/kparse.c:
+	* libparse/kparse_conf.c:
+	* libparse/parse.c:
+	* libparse/parse_conf.c:
+	* libparse/parsesolaris.c:
+	* libparse/parsestreams.c:
+	* ntpd/refclock_parse.c:
+	Mods and updates
+	From: Frank Kardel 
+
+	* acconfig.h: PCF refclock
+	* configure.in:
+	* html/driver35.htm:
+	* html/refclock.htm:
+	* include/ntp.h:
+	* libntp/clocktypes.c:
+	* ntpd/Makefile.am:
+	* ntpd/ntp_control.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_pcf.c:
+	From: Andreas Voegele 
+
+	* acconfig.h: DECL_STIME_1
+
+	* configure.in (iCFLAGS): Use -std1 for alpha*-dec-osf* if we are
+	using "cc".
+	Reported by: Tom Smith 
+
+1999-11-30  Harlan Stenn  
+
+	* include/l_stdlib.h: DECL_SYSTIME_1 --- a long *
+	* configure.in: Use it for DEC OSF[45]
+	Reported by: Tom Smith 
+
+	* ntpd/refclock_parse.c: Add missing declarations
+	* ntptrace/ntptrace.c: Ditto
+	* ntpd/ntp_proto.c: Ditto
+	* ntpd/refclock_palisade.c: Ditto
+	From: Jonathan Stone 
+
+1999-11-18  Sven Dietrich  
+	* Win NT port updates
+	* ntpd.dsp: makefile only builds supported refclocks
+	* config.h: cleanup, undefine unsupported clock_atom
+	* win32_io, clock_NMEA: foundation for future refclock support
+	* recvbuff, transmitbuff, IOcompletionport: streamline packet handler
+	* html/hints/winnt.htm: Added up-to-date html docs for WINNT
+
+1999-11-17  Harlan Stenn  
+
+	* html/copyright.htm: Credit Jack for his work.
+
+	* html/pic/*: Save a *ton* of space on the pictures.
+	From: Jack Sasportas 
+
+1999-11-16  Harlan Stenn  
+
+	* configure.in :  changequote for osf[45] test.
+	Reported by: Tom Smith 
+
+	* ntp_update: Ignore stuff in any A.* directory.
+
+1999-11-15  Harlan Stenn  
+
+	* configure.in: Clean up header checks for sys/syssgi.h and
+	sys/select.h .  Originally, we did not check for sys/select.h
+	under some versions of SCO (see xntp3-5).  Somewhere in ntp4 we
+	dropped the SCO check and added the check for sys/syssgi.h,
+	exclusive of checking for sys/select.h.  Marc Brett can't think of
+	a reason why we should not be checking for sys/select.h, so let's
+	look for it now.
+
+1999-11-13  Harlan Stenn  
+
+	* ntpdate/ntpdate.c: Add the ability for ntpdate to query a
+	multicast address.  We use the response to the multicast address
+	to learn new servers which we then add to the peer list and query.
+	In changing this I made the list of peers a linked list.
+
+	To be complete I should detect a broadcast address and make it
+	behave the same way.  But that requires a scan of the interface
+	list which is more complicated that I want to deal with...
+
+	Fix a bug, allowing ntpdate to compile if SLEWALWAYS and STEP_SLEW
+	are both defined.
+
+	From: Jeffrey C Honig 
+
+	* ntpd/ntp_refclock.c: sys/sio.h and SCO5_CLOCK cleanup
+	From: Kamal A Mostafa 
+
+	* ntpd/ntp_loopfilter.c: Let -g do a "correct any" for the first
+	time adjustment.
+	From: Dave Mills 
+
+	* configure.in: sys/sio.h needs to be checked independently.
+	Reported by: Kamal A Mostafa 
+
+1999-11-11  Harlan Stenn  
+
+	* configure.in: 4.0.98f
+
+	* configure.in: DECL_PLOCK_0 and DECL_STIME_0 are for dec-osf5*, too
+	* ntpd/ntpd.c: 	DEC OSF cleanup (editorial comments by HMS)
+	From: Tom Smith 
+
+	* ntpd/ntp_refclock.c: MAXUNIT bugfix
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/ntp_refclock.c:
+	* ntpd/ntpd.c:
+	* ntpd/refclock_arc.c:
+	* ntpd/refclock_as2201.c:
+	* ntpd/refclock_atom.c:
+	* ntpdc/ntpdc.c:
+	* ntpq/ntpq.c:
+	Code cleanup.
+	From: Marc.Brett@westgeo.com
+
+	* include/ntp_stdlib.h:
+	* libntp/systime.c:
+	* ntpd/ntp_proto.c:
+	Replaced the 'sco5_oldclock' variable with 'systime_10ms_ticks'.
+	Cleared libntp/systime.c and include/ntp_stdlib.h of references
+	to SCO5_CLOCK and RELIANTUNIX_CLOCK (moved to ntpd/ntp_proto.c).
+	From: Kamal A Mostafa 
+
+	* configure.in: alpha-dec-osf4* -> alpha*-dec-osf4*|alpha*-dec-osf5*
+	From: Tom Smith 
+
+	* configure.in: Look for .  If TIOCDCDTIMESTAMP is
+	there, we have TTYCLK.
+	* acconfig.h: Lose old AIOCTIMESTAMP stuff
+	Reported by: Kamal A Mostafa 
+
+1999-11-10  Harlan Stenn  
+
+	* ntpd/ntpd.c (set_process_priority): Clean up nice() and setpriority()
+
+1999-11-09  Harlan Stenn  
+
+	* Makefile.am (EXTRA_DIST): Added README.cvs
+	Reported by: Kamal A Mostafa 
+
+1999-11-08  Harlan Stenn  
+
+	* configure.in: 4.0.98e
+
+1999-11-07  Harlan Stenn  
+
+	* configure.in: Lose AIOCTIMESTAMP tests
+
+	* ntpd/ntpd.c: lose select() EINTR debug warning
+	* ntpd/ntp_refclock.c: AIOCTIMESTAMP -> TIOCDCDTIMESTAMP.  Watch
+	CLK_SETSTR.
+	* ntpd/refclock_atom.c: fdpps is only there for PPS or PPSAPI.
+	AIOCTIMESTAMP is gone now.
+	From: Kamal A Mostafa 
+
+	* configure.in (HAVE_MLOCKALL): Deal with dec-osf5 realities
+	* ntpd/refclock_ulink.c (ulink_poll): Fix cast.
+	* libntp/machines.c (ntp_set_tod): Use a long* for the argument to
+	stime().
+	Reported by: Tom Smith 
+
+	* ntpd/ntpd.c (set_process_priority): Use whatever we have until
+	something works.
+
+	* ntpd/ntp_loopfilter.c: Keep clock_frequency changes in a temp
+	variable so we can record it to loopstats (near as HMS can tell).
+	From: Dave Mills 
+
+1999-11-06  Harlan Stenn  
+
+	* acconfig.h: RELIANTUNIX_CLOCK
+	* configure.in (ac_cv_var_tickadj): RELIANTUNIX_CLOCK
+	* libntp/systime.c (adj_systime): Reliant patches
+	From: Andrej Borsenkow 
+
+1999-11-05  Harlan Stenn  
+
+	* ntpd/refclock_parse.c (parse_start): ASYNC_PPS_CD_NEG cleanup
+	* configure.in (ac_cv_make_ntptime): OK on Linux
+	From: 
+
+	* configure.in: NetBSD has PPSAPI now
+	F_SETOWN is needed for NetBSD
+	From: Jonathan Stone 
+
+1999-11-02  Harlan Stenn  
+
+	* configure.in: 4.0.98d
+
+	* ntpd/refclock_parse.c: Cleanup/fixes
+	From: John Hay 
+
+	* ntpd/refclock_parse.c: Lose #include "ntp_select.h"
+	* ntpd/ntpd.c: Lose #include "ntp_select.h"
+	* ntpd/ntp_io.c: Lose #include "ntp_select.h"
+	* ntpd/ntp_intres.c: Lose #include "ntp_select.h"
+	* libntp/iosignal.c: Lose #include "ntp_select.h"
+	* include/ntpd.h: #include "ntp_select.h" for declaration of activefds
+	Reported by: Christian Krackowizer 
+
+1999-11-01  Harlan Stenn  
+
+	* configure.in: 4.0.98c
+
+	* libntp/syssignal.c: Don't warn about SA_RESTART
+	* libntp/recvbuff.c: Fix free buffer count
+	From: Jeffrey C Honig 
+
+	* html/pps.htm:
+	* html/howto.htm:
+	* html/confopt.htm:
+	* html/clockopt.htm:
+	* html/uthopt.htm:
+	Updates.
+	From: Dave Mills 
+
+	* ntpd/refclock_wwvb.c: burst fixes
+	* ntpd/refclock_ulink.c: burst fixes
+	* ntpd/refclock_tpro.c: burst and NSTAGE fixes
+	* ntpd/refclock_pst.c: burst fixes
+	* ntpd/refclock_irig.c: SAMPLE -> SAMPLES
+	* ntpd/refclock_heath.c: burst fixes
+	* ntpd/refclock_dumbclock.c: burst fixes
+	* ntpd/refclock_chronolog.c: burst fixes
+	* ntpd/refclock_bancomm.c: burst fixes
+	* ntpd/refclock_atom.c: burst fixes
+	* ntpd/refclock_as2201.c: burst fixes
+	* ntpd/ntp_refclock.c: PPSAPI, code, and comment cleanup/fixes
+	* ntpd/ntp_proto.c: Broadcast/restrict cleanup
+	* ntpd/ntp_loopfilter.c: Cleanup and fixes
+	* libntp/gpstolfp.c: Lose the UL qualifiers - old compilers hate them
+	From: Dave Mills 
+
+1999-10-31  Harlan Stenn  
+
+	* configure.in: TIOCSPPS cleanup
+
+1999-10-20  Harlan Stenn  
+
+	* configure.in: 4.0.98b
+
+	* ntpd/refclock_atom.c: AIOCTIMESTAMP patch
+	* ntpd/ntpd.c: SCO clock patch
+	* ntpd/ntp_request.c: noselect patch
+	* ntpd/ntp_refclock.c: AIOCTIMESTAMP patch
+	* ntpd/ntp_proto.c: noselect patch
+	* ntpd/ntp_intres.c: noselect patch
+	* ntpd/ntp_config.c: noselect patch
+	* include/ntp_request.h: noselect patch
+	* include/ntp.h: noselect patch
+	From: Kamal A Mostafa 
+
+	* configure.in:
+	* acconfig.h: TTYCLK_AIOCTIMESTAMP
+	Stuff for Kamal
+
+	* ntpd/refclock_atom.c (atom_pps): make "result" initialization
+	uglier, but more bulletproof.
+
+	* configure.in (sys/timepps.h): Fixed.
+	From: John Hay 
+
+1999-10-19  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c: Rename instance.state to instance.o_state
+
+	* refclock_oncore.c:
+	* refclock_mx4200.c:
+	* refclock_chu.c:
+	* refclock_atom.c:
+	* ntp_refclock.c:
+	* ntp_peer.c:
+	* ntp_loopfilter.c:
+	* include/ntp_refclock.h:
+	Various cleanup and fixes
+	From: Dave Mills 
+
+1999-10-17  Harlan Stenn  
+
+	* ntpd/ntp_config.c (CONFIG_FILE): NT changes
+	From: Sven Dietrich 
+
+1999-10-16  Harlan Stenn  
+
+	* configure.in: sys/timepps.h verification changes
+
+	* ntpd/refclock_atom.c (atom_poll): PPS cleanup
+	From: Dave Mills 
+	(atom_pps): Portability patch
+	From: John Hay 
+
+
+	* libntp/msyslog.c:
+	* libntp/gpstolfp.c:
+	Lint cleanup
+	From: Jonathan Stone 
+
+	* parseutil/dcfd.c:  abs() -> l_abs(), time.h (AIX 4.3.2 patches)
+	From: Dana Kaempen 
+
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/ntp_refclock.c:
+	PPS cleanup
+	From: John.Hay@mikom.csir.co.za
+
+	* util/ntptime.c:
+	* ntpdate/ntptimeset.c:
+	* ntpdate/ntpdate.c:
+	* ntpd/refclock_trak.c:
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_mx4200.c:
+	* ntpd/refclock_msfees.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/ntp_control.c:
+	* ntpd/ntp_config.c:
+	* configure.in:
+	* configure:
+	PPS, Solaris 7, cleanup patches
+	From: Marc.Brett@westgeo.com
+
+	* ports/winnt/ntptrace/ntptrace.dsp:
+	* ports/winnt/ntpq/ntpq.dsp:
+	* ports/winnt/ntpdc/ntpdc.dsp:
+	* ports/winnt/ntpdate/ntpdate.dsp:
+	* ports/winnt/ntpd/refclock_trimbledc.c:
+	* ports/winnt/ntpd/ntpd.dsp:
+	* ports/winnt/ntpd/ntp_iocompletionport.c:
+	* ports/winnt/ntpd/nt_clockstuff.c:
+	* ports/winnt/libntp/util_clockstuff.c:
+	* ports/winnt/libntp/libntp.dsp:
+	* ports/winnt/libntp/SetSystemTime.c:
+	* ports/winnt/instsrv/instsrv.c:
+	* ports/winnt/include/sys/ioctl.h:
+	* ports/winnt/include/termios.h:
+	* ports/winnt/include/config.h:
+	* ports/winnt/include/clockstuff.h:
+	* ports/winnt/ntp.dsw:
+	* ntpd/refclock_shm.c:
+	* ntpd/refclock_palisade.c:
+	* ntpd/ntpd.c:
+	* ntpd/ntp_timer.c:
+	* ntpd/ntp_refclock.c:
+	* libntp/systime.c:
+	* libntp/machines.c:
+	NT patches
+	From: Sven Dietrich 
+
+1999-10-15  Harlan Stenn  
+
+	* ntpd/refclock_wwvb.c:
+	* ntpd/refclock_usno.c:
+	* ntpd/refclock_ulink.c:
+	* ntpd/refclock_tpro.c:
+	* ntpd/refclock_pst.c:
+	* ntpd/refclock_parse.c:
+	* ntpd/refclock_palisade.c:
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_mx4200.c:
+	* ntpd/refclock_msfees.c:
+	* ntpd/refclock_jupiter.c:
+	* ntpd/refclock_irig.c:
+	* ntpd/refclock_heath.c:
+	* ntpd/refclock_chu.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/refclock_as2201.c:
+	* ntpd/refclock_arc.c:
+	* ntpd/refclock_arbiter.c:
+	* ntpd/refclock_acts.c:
+	* ntpd/ntp_refclock.c:
+	* include/ntp_refclock.h:
+	Bunches of fixes.
+	From: Dave Mills 
+
+1999-10-10  Harlan Stenn  
+
+	* html/driver16.htm: New version
+	* ntpd/refclock_bancomm.c: New version
+	From: "Cliff, Gary" 
+	"Ramasivan, Ganesh" 
+
+	* ntpd/refclock_ulink.c (ulink_receive): Cleanup
+	(ulink_poll): Cleanup
+	* ntpd/refclock_atom.c (atom_pps): SunOS timespec/timeval cleanup
+	From: Marc.Brett@westgeo.com
+
+	* INSTALL: Point NT folks at ports/winnt
+	Reported by: Stephen Gildea 
+
+	* include/ntp_stdlib.h: Noise abatement
+	* include/ntpd.h: Noise abatement
+	Reported by: "W. David Higgins" 
+
+	* configure.in: DECL_STDIO_0 with gcc under solaris.
+
+	* include/l_stdlib.h: DECL_TOUPPER_0
+	DECL_STRERROR_0
+
+	* configure.in: Fix a bunch of implicit declarations for SunOS
+
+	* html/release.htm: cleanup - we still provide MD5.
+	Reported by: Winslowe Lacesso 
+
+1999-10-09  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/ntp_refclock.c:
+	PPS API code updated to the current spec
+	From: Dave Mills
+
+	* configure.in (ac_cv_make_tickadj): Don't make tickadj starting
+	with solaris2.5
+	Requested by: Dave Mills
+
+1999-10-04  Harlan Stenn  
+
+	* configure.in: We might need -lsocket for the -lnsl check.
+
+1999-09-19  Harlan Stenn  
+
+	* ntpd/refclock_ulink.c: Typos in C++ comment
+	Reported by: Thomas.Tornblom@Sun.SE
+
+	* configure.in: 4.0.98a
+
+	* ntpd/ntp_config.c (getconfig): Fix typo.
+	From: "David E. Myers" 
+	From: David Godfrey 
+	From: Geoffrey Sisson 
+
+1999-09-17  Harlan Stenn  
+
+	* configure.in: 4.0.98
+
+	NetInfo support:
+
+	* config.guess
+	* config.sub
+	Add Mac OS (versions 10 and up).
+
+	* acconfig.h
+	* config.h.in
+	* configure.in
+	Check for NetInfo API; add HAVE_NETINFO macro and friends.
+
+	* include/ntp.h
+	* ntpd/ntp_config.c
+	* ntpdate/ntpdate.c
+	Add support for reading configuration from NetInfo.
+
+	* ntpd/ntp_config.c
+	Get rid of unnecessary eol variable in tokenizer.
+
+	* html/notes.htm
+	* html/ntpd.htm
+	* html/ntpdate.htm
+	Document NetInfo functionality.
+
+	* util/tickadj.c
+	Use HAVE_KVM_OPEN conditional around kvm.h include.
+
+	From: Wilfredo Sanchez 
+
+1999-09-15  Harlan Stenn  
+
+	* acconfig.h:
+	* config.h.in:
+	* configure.in:
+	* html/driver34.htm:
+	* html/refclock.htm:
+	* include/ntp.h:
+	* libntp/clocktypes.c:
+	* ntpd/Makefile.am:
+	* ntpd/ntp_control.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_ulink.c:
+	Ultralink driver
+	From: Dave Strout 
+
+1999-09-14  Harlan Stenn  
+
+	* configure.in: ReliantUNIX patches
+	From: Andrej Borsenkow 
+
+	* ntpd/refclock_atom.c: PPS cleanup
+	* ntpd/ntp_refclock.c (refclock_ioctl): PPS cleanup
+	From: Dave Mills 
+
+	* ntptrace/ntptrace.c (ReceiveBuf): addserver() can return NIL.
+	Reported by: "Alan J. Wylie" 
+
+	* libntp/ieee754io.c:
+	* ntpd/ntp_proto.c:
+	* ntpd/ntp_refclock.c:
+	Lint cleanup.
+	From: Marc.Brett@westgeo.com
+
+1999-09-12  Harlan Stenn  
+
+	* ntpd/ntp_refclock.c (refclock_ioctl): Declaration cleanup.
+
+	* ntpd/ntp_proto.c (init_proto): msyslog kern_enable at LOG_DEBUG.
+
+	* ntpd/refclock_atom.c: Add missing declaration.
+
+1999-09-11  Harlan Stenn  
+
+	* configure.in (ac_cv_make_ntptime): Just look for struct
+	ntptimeval, not timespec or nsec (Solaris 2.7 should get ntptime
+	and it uses msec).
+	(ac_cv_var_oncore_ok): Reorder so it's a "normal" clock
+
+	* configure.in: Solaris Kernel FLL bug fixed in 106541-07
+
+1999-09-02  Harlan Stenn  
+
+	* configure.in: 4.0.97f
+
+	* ntptrace/ntptrace.c:
+	* ntpdate/ntptimeset.c:
+	* ntpdate/ntptime_config.c:
+	* ntpdate/ntpdate.c:
+	* util/ntptime.c:
+	* parseutil/dcfd.c:
+	* libparse/parsestreams.c:
+	* libparse/parse_conf.c:
+	* libparse/parse.c:
+	* libparse/clk_varitext.c:
+	* libparse/clk_trimtsip.c:
+	* libparse/clk_trimtaip.c:
+	* libparse/clk_schmid.c:
+	* libparse/clk_rcc8000.c:
+	* libparse/clk_rawdcf.c:
+	* libparse/clk_meinberg.c:
+	* libparse/clk_hopf6021.c:
+	* libparse/clk_dcf7000.c:
+	* libparse/clk_computime.c:
+	* libntp/msyslog.c:
+	* libntp/iosignal.c:
+	* libntp/syssignal.c:
+	* adjtimed/adjtimed.c:
+	* ntpd/refclock_shm.c:
+	* ntpd/refclock_parse.c:
+	* ntpd/refclock_palisade.c:
+	* ntpd/refclock_mx4200.c:
+	* ntpd/refclock_jupiter.c:
+	* ntpd/refclock_datum.c:
+	* ntpd/ntpd.c:
+	* ntpd/ntp_util.c:
+	* ntpd/ntp_timer.c:
+	* ntpd/ntp_request.c:
+	* ntpd/ntp_refclock.c:
+	* ntpd/ntp_monitor.c:
+	* ntpd/ntp_loopfilter.c:
+	* ntpd/ntp_io.c:
+	* ntpd/ntp_intres.c:
+	* ntpd/ntp_filegen.c:
+	* include/l_stdlib.h:
+	 and errno declaration cleanup.
+
+	* ntpd/map_vme.c: cleanup some spacing.
+
+1999-09-01  Harlan Stenn  
+
+	* configure.in: 4.0.97e
+
+	* configure.in (ac_cv_struct_sigaction_has_sa_sigaction):
+	* acconfig.h: Ditto
+	* parseutil/dcfd.c (main): Use it.
+ 	From: HOSAKA Eiichi 
+
+1999-08-29  Harlan Stenn  
+
+	* configure.in: 4.0.97d
+
+	* include/ntp_stdlib.h: Clean up previous NeXT patch.
+	From: Jack Bryans 
+
+	* ntpd/refclock_parse.c: Permit RTS to power a DCF77.
+	From: Carsten Paeth 
+
+	* ntpd/refclock_oncore.c (oncore_start): This makes the Oncore run
+	on systems without hardpps().
+	From: Poul-Henning Kamp 
+
+1999-08-28  Harlan Stenn  
+
+	* configure.in: 4.0.97c
+
+	* configure.in (ac_cv_make_ntptime):  Typo.
+	From: Ulrich Windl 
+
+1999-08-26  Harlan Stenn  
+
+	* configure.in: 4.0.97b
+
+	* libntp/iosignal.c:
+	* ntpd/ntp_peer.c:
+	* ntpd/refclock_nmea.c:
+	* ntpdate/ntptime_config.c:
+	* ntpdate/ntptimeset.c:
+	AIX, Irix, and SunOS lint cleanup
+	From: Marc.Brett@westgeo.com
+
+1999-08-24  Harlan Stenn  
+
+	* configure.in 4.0.97a
+
+	* configure.in (AC_OUTPUT): added scripts/Makefile
+	* Makefile.am (SUBDIRS): Added scripts
+	* scripts/Makefile.am: Added
+
+1999-08-23  Harlan Stenn  
+
+	* ntpd/refclock_nmea.c: Patches for:
+        Trimble OEM Ace-II receiver. Low cost PCB with single
+        voltage input, external active antenna and two serial
+        ports with either NMEA and ITAPs output. Programmable
+        to be tuned for 'time' accuracy in fixed station config.
+	From: Nick Hibma 
+
+1999-08-21  Harlan Stenn  
+
+	* ntpd/ntp_config.c: Added listen_to_virtual_ips support (-L flag)
+	* ntpd/ntp_io.c: Ditto
+
+1999-08-19  Harlan Stenn  
+
+	* ntpd/ntp_intres.c (request): Lint cleanup
+	* ntpd/ntp_control.c (ctl_putclock): Ditto
+	* libntp/recvbuff.c (getrecvbufs): Ditto
+	(get_free_recv_buffer): Ditto
+	* libntp/systime.c (adj_systime): Ditto
+
+1999-08-18  Harlan Stenn  
+
+	* configure.in: 4.0.97
+
+	* libntp/systime.c:
+	* ntpd/ntp_loopfilter.c:
+	* ntpd/ntpd.c:
+	* ports/winnt/libntp/nt_clockstuff.c:
+	From: Sven Dietrich 
+
+	* README.cvs: Updated.
+
+	* configure.in:
+	* include/ntp_machine.h:
+	* libntp/mexit.c:
+	* ntpd/ntp_config.c:
+	* ntpd/ntp_peer.c:
+	* ntpd/ntp_restrict.c:
+	* ntpd/refclock_arc.c:
+	* ntpdate/ntpdate.c:
+	Irix, SunOS, AIX, lint patches
+	From: Marc.Brett@westgeo.com
+
+	* util/ansi2knr.c: New release (fix for bug reported by Marc Brett)
+	From: "L. Peter Deutsch" 
+
+	* include/ntp_stdlib.h: NeXT portability patch
+	From: Jack Bryans 
+
+	* configure.in:
+	* dot.emacs: (cleanup)
+	* ntpdate/Makefile.am:
+	* ntpdate/ntpdate.h:
+	* ntpdate/ntptime_config.c:
+	* ntpdate/ntptimeset.c:
+	ntptimeset patches.
+	From: Jeffrey Hutzelman 
+
+	* ntpd/refclock_parse.c (local_input): ts.l_ui -> ts.fp.l_ui
+
+1999-08-11  Harlan Stenn  
+
+	* configure.in: 4.0.96p1
+
+	* ntpd/ntpd.c (sys/resource.h): Include this file only #if
+ 	HAVE_SYS_RESOURCE_H.
+	(set_process_priority): Use TIOCNOTTY only if it is #define'd.
+	* ntpd/refclock_parse.c (STREAM): STREAM does not imply HAVE_TERMIOS.
+	(termios.h, termio.h, fcntl.h): Do not include those files here;
+	they are already included by ntp_refclock.h or ntp_io.h.
+	* ntpd/refclock_leitch.c (sgtty.h, termios.h, termio.h): Do not
+	include those files here; they are already included by ntp_refclock.h.
+	* ntpdate/ntpdate.c (sys/resource.h) : Include that file only #if
+	HAVE_RESOURCE_H.
+	From: Philippe De Muyter 
+
+	* ntptrace/ntptrace.c (input_handler): Make it a "normal" function
+	definition.
+	Reported by: GIANNI_CATANIA@hp-italy-om6.om.hp.com
+
+	* configure.in:  pc-cygwin32 -> pc-cygwin* because of a change in
+	B20.
+	From: Stephen Gildea 
+
+1999-08-09  Harlan Stenn  
+
+	* configure.in: 4.0.96
+
+	* parseutil/dcfd.c (main): Replace SA_ONSTACK and SV_ONSTACK with
+	HAVE_SIGACTION and HAVE_SIGVEC, respectively.  HP-UX provides both
+	of the former but only one of the latter...
+
+1999-08-08  Harlan Stenn  
+
+	* configure.in: Better tests for -lnsl and -lsocket
+	From: Albert Chin-A-Young 
+
+	Works for me - handle openlog() and -lgen the same way.
+
+	* Makefile.am (EXTRA_DIST): Add in the y2k notes
+
+	* parseutil/dcfd.c: Renamed drift_comp to accum_drift
+
+	* configure.in: Added MAKE_CHECK_Y2K support; check_y2k needs libparse.
+	* ntpd/Makefile.am (check_PROGRAMS): Use MAKE_CHECK_Y2K
+	* ntpd/Makefile.am (check-local): Added.
+	* parseutil/Makefile.am (check-local): Added.
+
+	* include/ntp.h: Y2KFixes
+	* libparse/parse.c: Ditto
+	* ntpd/Makefile.am (check_PROGRAMS): Ditto
+	* ntpd/refclock_acts.c: Ditto
+	* ntpd/refclock_arc.c (arc_receive): Ditto
+	* ntpd/refclock_heath.c: Ditto
+	* ntpd/refclock_hpgps.c: Ditto
+	* parseutil/Makefile.am (check-local): Ditto
+	* parseutil/dcfd.c (check_y2k): Ditto
+	* NOTES.y2kfixes: Ditto
+	* readme.y2kfixes: Ditto
+	* results.y2kfixes: Ditto
+	* ntpd/check_y2k.c: Ditto
+	From: y2k@y2k.labs.att.com
+
+1999-08-07  Harlan Stenn  
+
+	* configure.in: Look for sys/ppstime.h.
+
+1999-07-31  Harlan Stenn  
+
+	* ntpd/ntp_io.c (create_sockets): Typo.
+	From: Doug Wells 
+
+1999-07-29  Harlan Stenn  
+
+	* configure.in (ac_cv_struct_ntptimeval): Explicitly look for
+	struct ntptimeval.
+	(ac_cv_var_kernel_pll): Require struct ntptimeval.
+	Linux.  Grrr.
+	Reported by: Ronald Kuetemeier 
+
+1999-07-27  Harlan Stenn  
+
+	* configure.in: 4.0.95
+
+	* ports/winnt: New release
+	From: Sven Dietrich 
+
+1999-07-26  Harlan Stenn  
+
+	* libntp/machines.c (ntp_set_tod): Bugfix
+	From: Andrej Borsenkow 
+
+1999-07-25  Harlan Stenn  
+
+	* configure.in: 4.0.94b
+
+	* acconfig.h:
+	* configure.in:
+	* libparse/Makefile.am:
+	* libparse/parse_conf.c:
+	* libparse/clk_varitext.c:
+	* libparse/kclk_varitext.c:
+	* ntpd/refclock_parse.c: VARITEXT parse clock
+	* ntpdate/ntpdate.c: bugfix
+	From: Tony McConnell 
+
+1999-07-24  Harlan Stenn  
+
+	* include/ntp_syscall.h (ntp_gettime): Make it static
+	* configure.in: Added AC_C_INLINE
+	Reported by: "Charles C. Fu" 
+
+1999-07-23  Harlan Stenn  
+
+	* include/ntpd.h:
+	* libntp/machines.c:
+	* libntp/systime.c:
+	* ntpd/ntp_config.c:
+	* ntpd/ntp_filegen.c:
+	* ntpd/ntp_io.c:
+	* ntpd/ntp_proto.c:
+	* ntpd/ntp_timer.c:
+	* ntpdate/ntpdate.c: Windows NT port cleanup
+	From: Sven Dietrich 
+
+1999-07-22  Harlan Stenn  
+
+	* libntp/authkeys.c:
+	* libntp/ieee754io.c:
+	* libntp/iosignal.c:
+	* libntp/machines.c:
+	* libntp/mexit.c:
+	* libntp/recvbuff.c:
+	* ntpd/ntp_filegen.c:
+	* ntpd/ntp_loopfilter.c:
+	* ntpd/ntp_request.c:
+	* ntpd/ntp_timer.c:
+	* ntpd/ntpd.c: Compile/lint cleanup
+	From: Allen Smith 
+
+1999-07-21  Harlan Stenn  
+
+	* configure.in: 4.0.94a
+
+	* configure.in (ac_cv_make_ntptime): Add tv_nsec check.
+
+	* include/Makefile.am (noinst_HEADERS): Forgot ntp_syscall.h
+	From: John.Hay@mikom.csir.co.za
+
+	* configure.in: 4.0.94
+
+	* Makefile.am (SUBDIRS): librsaref
+	(dist-hook): Lose CVS subdirs in the distribution tarball
+
+	* include/Makefile.am (noinst_HEADERS): Added iosignal.h, recvbuff.h
+
+	* Makefile.am (dist-hook): Don't call dos2unix anymore
+
+1999-07-20  Harlan Stenn  
+
+	* acconfig.h:
+	* util/ntptime.c: FreeBSD nano patches
+	From: Per Hedeland  and
+	Allen Smith 
+
+	* include/ntp.h:
+	include/ntp_fp.h:
+	include/ntp_io.h:
+	include/ntp_machine.h:
+	include/ntp_refclock.h:
+	include/ntp_stdlib.h:
+	include/ntpd.h:
+	libntp/Makefile.am:
+	libntp/emalloc.c:
+	libntp/machines.c:
+	libntp/mexit.c:
+	libntp/msyslog.c:
+	libntp/statestr.c:
+	libntp/syssignal.c:
+	libntp/systime.c:
+	libparse/parse.c:
+	libparse/parse_conf.c:
+	ntpd/ntp_control.c:
+	ntpd/ntp_intres.c:
+	ntpd/ntp_io.c:
+	ntpd/ntp_proto.c:
+	ntpd/ntp_refclock.c:
+	ntpd/ntp_request.c:
+	ntpd/ntp_timer.c:
+	ntpd/ntp_util.c:
+	ntpd/ntpd.c:
+	ntpd/refclock_nmea.c:
+	ntpd/refclock_palisade.c:
+	ntpd/refclock_palisade.h:
+	ntpd/refclock_shm.c:
+	ntpdate/ntpdate.c:
+	ntptrace/ntptrace.c: Cleanup
+	* libntp/recvbuff.c:
+	libntp/iosignal.c:
+	include/iosignal.h:
+	include/recvbuff.h: Added
+	From: Sven_Dietrich@Trimble.COM
+
+	* README: Add README.cvs
+
+	* configure.in (ac_cv_var_struct_ntptime_val_timespec): Typo.
+	From: John Hay 
+
+1999-07-19  Harlan Stenn  
+
+	* Makefile.am (EXTRA_DIST): Lose ntpmak; "build" does a better job.
+
+	* ntpq/Makefile.am (version.o): Use mkver
+	* ntptrace/Makefile.am (version.o): Ditto
+	* ntpdate/Makefile.am (version.o): Ditto
+	* ntpd/Makefile.am (version.o): Ditto
+	* ntpdc/Makefile.am (version.o): Ditto
+
+	* configure.in (AC_OUTPUT): scripts/mkver
+
+	* scripts/mkver.in: Created.  Note RSAREF in the version string
+
+1999-07-18  Harlan Stenn  
+
+	* README.des: Updated.
+
+	* ntpq/Makefile.am (LDADD): Add LIBRSAREF
+
+	* ntpdc/Makefile.am (LDADD): Add LIBRSAREF
+
+	* ntpdate/Makefile.am (LDADD): Add LIBRSAREF
+
+	* ntpd/Makefile.am (LDADD): Add LIBRSAREF
+
+	* configure.in (AC_OUTPUT): Added librsaref/Makefile
+	Added tests for making/using librsaref.a
+	Lose old DES stuff; AC_DEFINE(DES) if we find the rsaref stuff.
+
+1999-07-11  Harlan Stenn  
+
+	* ntpd/refclock_trak.c (trak_receive): disambiguate expression.
+	At least now it is unambiguous.  It may even still be correct.
+	Reported by: Tom Smith 
+
+	* ntp_update (UPDATE_OPTIONS): Typo.
+
+1999-07-07  Harlan Stenn  
+
+	* ntp_update: Check out copyright.htm before COPYRIGHT
+
+	* ntpd/ntp_config.c: Support for PPS assert/clear/hardpps
+	* ntpd/ntp_refclock.c (refclock_ioctl): Ditto
+	(refclock_gtlin): Ditto
+	* html/clockopt.htm: Document.
+	From: John Hay 
+
+        * html/monopt.htm: We have four types of files now
+        * ntpd/refclock_oncore.c: If debug is on, tell when
+        we are waiting for a valid almanac
+	From: Poul-Henning Kamp 
+
+	* include/ntp_machine.h (HAVE_TERMIOS): STREAMS does not imply
+	HAVE_TERMIOS !!!
+	* include/parse.h (timercmp): Macro defined if needed.
+	* ntpd/ntp_config.c (SIGCHLD): Macro defined as SIGCLD if needed.
+	(sys/wait.h): File included only if HAVE_SYS_WAIT_H.
+	* configure.in (sys/wait.h): File added to AC_CHECK_HEADERS list.
+	From: Philippe De Muyter  
+
+1999-06-23  Harlan Stenn  
+
+	* ntpd/refclock_irig.c (irig_debug): NetBSD patches
+	From: Frederick Bruckman 
+
+	* util/ntptime.c (main): ntx.freq bugfix (-f option)
+	From: Frederick Bruckman 
+
+1999-06-22  Harlan Stenn  
+
+	* configure.in: Fix typo with DECL_H_ERRNO test
+
+	* ntpd/ntp_loopfilter.c: Lose syscall decl, it's handled in
+	l_stdlib.h now.
+	* ntpd/ntp_request.c: Ditto
+	* util/ntptime.c: Ditto
+
+Mon May 31 18:49:49 1999  Rainer Orth  
+
+	* ntpd/ntp_proto.c (proto_config): Don't set sys_bclient on
+	PROTO_MULTICAST_ADD, only caller can decide; remove wrong set on
+	PROTO_MULTICAST_DEL.
+
+Mon May 31 18:49:49 1999  Rainer Orth  
+
+	* ntpd/refclock_parse.c (stream_receive): Cast size_t to int to
+	match format.
+	(local_receive): Likewise.
+	(trimbletaip_event): Likewise.
+	(stream_receive): Cast struct timeval members to long to match
+	format.
+	(local_receive): Likewise.
+
+	* ntpd/ntp_util.c (stats_config): Cast size_t to int to match
+	format.
+
+	* libparse/clk_rawdcf.c (cvt_rawdcf): Cast ptr difference to int
+	to match format.
+	* ntpd/refclock_parse.c (gps16x_poll): Likewise.
+
+	* ntpd/ntp_filegen.c (filegen_open): Use long format, cast arg to
+	match.
+
+	* ntpd/refclock_parse.c (list_err): Use long format to match arg.
+	(parse_statistics): Likewise.
+	(gps16x_message): Likewise.
+	(cvt_ts): Use long format, cast args to match.
+	(parse_start): Add missing arg.
+	(gps16x_message): Swap args to match format.
+
+	* ntpd/ntpd.c (ntpdmain): Cast uid to long, adapt format.
+
+	* ntpd/ntp_intres.c (readconf): Use long format to match arg.
+	* ntpd/ntp_io.c (getrecvbufs): Likewise.
+	* ntpd/ntp_proto.c (default_get_precision): Likewise.
+
+	* ntpd/ntp_loopfilter.c (local_clock): Cast clock_panic to int to
+ 	match format.
+
+	* ntpd/ntp_io.c (io_multicast_add): Print s_addr member, not
+	struct in_addr, to match format.
+
+	* include/ntp_stdlib.h: Declare msyslog() as printf-like for gcc
+	format checking.
+
+Fri May 28 16:39:35 1999  Rainer Orth  
+
+	* ntpdc/ntpdc_ops.c (iostats): Align timereset line.
+
+	* ntpq/ntpq_ops.c (doopeers): Properly align header.
+
+	* ntpdc/ntpdc_ops.c (debug): Removed declaration, already in
+	ntp_stdlib.h.
+	* ntpq/ntpq_ops.c: Likewise.
+
+	* ntpdate/ntpdate.c (debug): Declare volatile to match
+	ntp_stdlib.h.
+	* ntpdc/ntpdc.c, ntpq/ntpq.c, ntptrace/ntptrace.c, util/tickadj.c,
+	util/ntptime.c: Likewise.
+
+	* include/parse.h (debug): Don't declare to avoid clash with
+	ntp_stdlib.h.
+
+	* include/Makefile.am (noinst_HEADERS): Add new ntp_syscall.h.
+
+	* configure.in: Also check for -lrt for POSIX.1c functions.
+
+Wed May 26 21:03:30 1999  Rainer Orth  
+
+	* configure.in: Removed -Wwrite-strings from CFLAGS.
+
+	* ntpdc/ntpdc.c (help): Remove superfluous cast.
+	* ntpq/ntpq.c (help): Likewise.
+
+Tue May 25 18:00:49 1999  Rainer Orth  
+
+	* ntpq/ntpq_ops.c (struct varlist): name cannot be const char *
+	since it may be malloc'ed.
+
+	* ntpdc/ntpdc.c (sendrequest): Declare pass as const char *, don't
+	loose const in cast.
+	* ntpq/ntpq.c (sendrequest): Likewise.
+
+	* ntpd/ntp_control.c (ctl_getitem): Remove superfluous cast.
+	* include/ntpd.h (struct ctl_var): text cannot be const char *
+	since it's malloc'ed.
+
+1999-06-22  Harlan Stenn  
+
+	* include/l_stdlib.h: Don't include , add	forward
+	declaration of struct in_addr instead.
+	From: Rainer Orth 
+
+	Patch:
+
+	* include/l_stdlib.h: Fixed syscall() declaration.
+	* configure.in: Updated test to match.
+
+	* configure.in: Check if we need to declare errno and h_errno.
+	Check for  which may provide a h_errno declaration and
+	 which the latter needs.
+	* acconfig.h: Provide the necessary templates.
+
+	* include/ntp_syscall.h: New file, hides various implementations
+	of ntp_adjtime() and ntp_gettime() syscalls.
+	* ntpd/ntp_loopfilter.c: Use it.
+	* ntpd/ntp_request.c: Likewise.
+	* ntpd/refclock_local.c: Likewise.
+	* util/ntptime.c: Likewise.
+
+	* include/l_stdlib.h: Include , declare inet_ntoa if
+	necessary.
+	Moved syscall() declaration here.
+
+	* kernel/sys/parsestreams.h: Include  for it's
+	definition of struct ppsclockev.
+	Include  unconditionally for definition of
+	CIOGETEV via TIOCGPPSEV.
+	* kernel/sys/ppsclock.h: Protect struct ppsclockev from
+	redefinition.
+
+	* include/ntp_refclock.h: Protect it from multiple inclusion.
+	* include/ntp_fp.h: Likewise.
+	* include/ntp.h: Likewise.
+
+	* include/ntpd.h: Include ntp_refclock.h for MAXDIAL declaration.
+	* libntp/authkeys.c: Include ntpd.h for current_time declaration.
+
+	* include/ntpd.h (getauthkeys, auth_agekeys, rereadkeys): Moved
+	prototypes to ntp_stdlib.h
+
+	* include/ntp_stdlib.h: Declare variables exported by libntp.
+	* include/ntpd.h: Likewise for ntpd.
+
+	* libntp/authkeys.c (key_hash, authnokey, authfreekeys,
+	cache_flags): Made static.
+	* libntp/systime.c (tvu_maxslew, tsf_maxslew, sys_clock_offset,
+	sys_residual): Likewise.
+	* ntpd/ntp_intres.c (confentries): Likewise.
+	* ntpd/ntp_loopfilter.c (clock_offset, clock_panic): Likewise.
+	(pll_nano): Likewise. Removed duplicate definition.
+	* ntpd/ntp_peer.c (peer_free, current_association_ID,
+	assocpeer_calls, init_peer_starttime): Likewise.
+	* ntpd/ntp_proto.c (sys_offset, sys_authdly): Likewise.
+	* ntpd/ntp_request.c (numrequests, numresppkts, errorcounter):
+	Likewise.
+	* ntpd/ntp_restrict.c (res_calls, res_found, res_not_found,
+	res_timereset, res_limited_refcnt): Likewise.
+	* ntpd/ntpd.c (was_alarmed, worker_thread): Likewise.
+
+	* ntpq/ntpq_ops.c: Moved declaration of external variable from
+	ntpq.c to file scope.
+
+	* adjtimed/adjtimed.c: Moved declarations of external variables to
+	ntpd.h and ntp_stdlib.h.
+	* clockstuff/propdelay.c: Likewise.
+	* libntp/a_md5encrypt.c, libntp/authencrypt.c, libntp/authkeys.c,
+	libntp/mfp_mul.c, libntp/msyslog.c, libntp/systime.c: Likewise.
+	* ntpd/ntp_config.c, ntpd/ntp_control.c, ntpd/ntp_filegen.c,
+	ntpd/ntp_intres.c, ntpd/ntp_io.c, ntpd/ntp_loopfilter.c,
+	ntpd/ntp_monitor.c, ntpd/ntp_peer.c, ntpd/ntp_proto.c,
+	ntpd/ntp_refclock.c, ntpd/ntp_request.c, ntpd/ntp_restrict.c,
+	ntpd/ntp_timer.c, ntpd/ntp_util.c, ntpd/ntpd.c,
+	ntpd/refclock_acts.c, ntpd/refclock_arbiter.c, ntpd/refclock_arc.c,
+	ntpd/refclock_as2201.c, ntpd/refclock_atom.c,
+	ntpd/refclock_bancomm.c, ntpd/refclock_chronolog.c,
+	ntpd/refclock_chu.c, ntpd/refclock_datum.c,
+	ntpd/refclock_dumbclock.c, ntpd/refclock_gpsvme.c,
+	ntpd/refclock_heath.c, ntpd/refclock_hpgps.c, ntpd/refclock_irig.c,
+	ntpd/refclock_jupiter.c, ntpd/refclock_leitch.c,
+	ntpd/refclock_local.c, ntpd/refclock_msfees.c,
+	ntpd/refclock_mx4200.c, ntpd/refclock_nmea.c,
+	ntpd/refclock_oncore.c, ntpd/refclock_palisade.h,
+	ntpd/refclock_parse.c, ntpd/refclock_pst.c, ntpd/refclock_shm.c,
+	ntpd/refclock_tpro.c, ntpd/refclock_trak.c, ntpd/refclock_true.c,
+	ntpd/refclock_usno.c, ntpd/refclock_wwvb.c: Likewise.
+	* ntpdate/ntpdate.c: Likewise.
+	* ntpdc/ntpdc.c, ntpdc/ntpdc_ops.c: Likewise.
+	* ntpq/ntpq.c: Likewise.
+	* ntptrace/ntptrace.c: Likewise.
+	* util/ntptime.c, til/tickadj.c: Likewise.
+	From: Rainer Orth 
+
+	* include/ntp_machine.h: Removed superfluous yy/mm/dd comments.
+	* include/ntpd.h: Likewise.
+	* libntp/authencrypt.c: Likewise.
+	* libntp/a_md5encrypt.c: Likewise.
+	* libntp/caljulian.c: Likewise.
+	* libntp/ymd2yd.c: Likewise.
+	* libntp/syssignal.c: Likewise.
+	* libntp/ymd2yd.c: Likewise.
+	* ntpd/ntp_control.c: Likewise.
+	* ntpd/ntp_io.c: Likewise.
+	* ntpd/ntp_timer.c: Likewise.
+	* ntpdate/ntpdate.c: Likewise.
+	* ntpq/ntpq_ops.c: Likewise.
+	* ntpd/ntp_peer.c (findpeer): Wrap debug output in DEBUG/debug.
+	From: Rainer Orth 
+
+	* dot.emacs: Removed wrong indentation of substatements.
+	Wrap in c-style.
+	From: Rainer Orth 
+
+	* ntpd/refclock_palisade.c: Patches from Marc Brett
+	* ntpd/refclock_palisade.h: Ditto.
+	* util/hist.c: Ditto.
+
+Tue Jun  1 00:40:04 1999  Harlan Stenn  
+
+	* build: mips-dec-ultrix4.4 hates "set -e"
+
+	* flock-build: Created
+
+	* build: added -l option
+
+Mon May 31 20:28:40 1999  Harlan Stenn  
+
+	* README: Removed auto{make,conf}.patch files
+
+Tue May 25 01:20:53 1999  Harlan Stenn  
+
+	* Makefile.am ($(srcdir)/COPYRIGHT): Added
+	(EXTRA_DIST): Remove auto*.patches
+
+Thu May 20 01:03:00 1999  Harlan Stenn  
+
+	* Makefile.am (dist-hook): Call dos2unix on the .htm files
+
+	* ntpd/refclock_palisade.h: Clean up declarations.
+
+	* configure.in (ac_cv_struct_ntptimeval_timespec): Added.
+	(ac_cv_make_ntptime): Only if ntptimeval does not use timespec.
+
+	* util/tickadj.c: Linux Patches
+	From: Reg Clemens 
+
+Wed May 19 01:18:24 1999  Harlan Stenn  
+
+	* configure.in: 4.0.93a
+
+	* ntpd/refclock_palisade.h: Restore some lost patches
+	From: Kamal A Mostafa 
+
+Sun May 16 13:18:32 1999  Philippe De Muyter  
+
+	* libparse/clk_wharton.c (cvt_wharton_400a, inp_wharton_400a): Expect
+	serial output format number 1, not 5.
+	(clock_wharton_400a) : Likewise.
+	* ntpd/refclock_parse.c (parse_clockinfo): For Wharton 400a clock,
+	do not poll, but expect a message every second.
+	* html/parsedata.htm : Entry added for Wharton 400a clock.
+	* html/driver8.htm : Entry fixed for Wharton 400a clock.
+
+Sun May 16 02:59:46 1999  Harlan Stenn  
+
+	* configure.in: 4.0.93
+
+Sat May 15 18:53:47 1999  Harlan Stenn  
+
+	* configure.in (ntp_refclock): ONCORE requires PPSAPI, CIOGETEV,
+	or TIOCGPPSEV.
+	Reported by: Reg Clemens 
+
+Fri May 14 23:58:35 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92h2
+
+	* configure.in (ac_cv_make_ntptime): Not under Linux.  Yes, it
+	works for some people.  We're tired of the complaints from the
+	others.
+
+Fri May 14 18:58:59 1999  Rainer Orth  
+
+	* libntp/authreadkeys.c (authreadkeys): Reject autokey keys.
+	Include ntp.h for NTP_MAXKEY definition, ntp_fp.h for types used
+	in ntp.h.
+
+Wed May 12 23:02:22 1999  Rainer Orth  
+
+	* libntp/authkeys.c (auth_delkeys): Don't remove autokey keys,
+	leave info on KEY_TRUSTED flag alone.
+	Include ntp.h for NTP_MAXKEY definition.
+
+Thu May 13 02:19:02 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92h1
+
+	* configure.in: patch for ReliantUNIX
+ 	From: Andrej Borsenkow 
+
+	* ntpd/refclock_oncore.c: Patches
+	From: Reg Clemens 
+
+Thu Apr 29 14:01:04 1999  Rainer Orth  
+
+	* html/*.htm: Remove unnecessary  .  Cleanup 

+	sections.
+
+	* configure.in: Properly align configure --help output.
+	* html/config.htm: Include this version, removing Netscape  
+	cruft.
+
+Wed Apr 28 15:08:55 1999  Rainer Orth  
+
+	* kernel/sys/parsestreams.h: Only include  if
+	struct ppsclockev is missing from system headers.
+
+	* util/tickadj.c (getoffsets): Define kernels[] only if used.
+	(openfile): Rename fd to avoid shadowing global fd.
+	(writevar): Likewise.
+	(readvar): Likewise.
+
+	* parseutil/dcfd.c (read_drift): drift_file is const char *.
+	(update_drift): Likewise.
+	(adjust_clock): Likewise.
+	(main): Likewise.
+
+	* ntpd/refclock_parse.c (gps16x_poll): Adapt format to match
+	parse->localstate type.
+
+	* ntpd/ntp_refclock.c (refclock_gtlin): Only define gotit label
+	if used.
+
+	* include/l_stdlib.h (openlog, syslog): char * args are const.
+
+	* configure.in (*-*-osf4*): Enable declaration of stime().
+
+	* ntpd/refclock_oncore.c (oncore_msg_any): Cast args to long to
+	match prototype.
+	(oncore_msg_En): Likewise.
+
+	* include/ntp_refclock.h (struct refclockstat): Declare p_lastcode
+	as const char *.
+
+	* ntpq/ntpq_ops.c (struct varlist): Define name as const.
+
+	* ntpdc/ntpdc.c (tokenize): Define cp as const char *, remove
+	wrong cast instead.
+
+	* ntpd/ntp_util.c (record_clock_stats): Make text arg const.
+	* include/ntpd.h (record_clock_stats): Adapt declaration.
+	* ntpd/refclock_oncore.c (oncore_start): Removed superfluous casts.
+	(oncore_msg_Cf): Likewise.
+	(oncore_msg_Fa): Likewise.
+	(oncore_msg_Cj): Likewise.
+	(oncore_msg_Ea): Likewise.
+	(oncore_msg_Bj): Likewise.
+
+	* configure.in (*-*-solaris2.4): Enable declarations of
+	gettimeofday(), settimeofday(); they are `protected' by
+	__cplusplus in .
+
+Tue Apr 27 21:14:47 1999  Rainer Orth  
+
+	* scripts/summary.pl: Use . as default statsdir.
+	(do_loop): Accept new loopstats format with additional sys_error
+	and clock_stability fields.
+	(do_peer): Accept new peerstats format with additional skew field.
+
+Mon Apr 26 01:50:38 1999  Harlan Stenn  
+
+	* Upgraded automake (1.4a) and autoconf (2.14.1)
+
+	* configure.in (ac_refclock_irig): We no longer need stropts.h.
+	* ntpd/refclock_irig.c: Ditto
+
+Mon Apr 26 17:33:33 1999  Rainer Orth  
+
+	* configure.in (*-*-irix6*): Don't pass MIPSpro cc-only flag -n32
+	to gcc.
+
+Thu Apr 22 15:06:40 1999  Rainer Orth  
+
+	* ntpd/ntp_config.c (getconfig): IN_CLASSD() expects address in
+	host byte order, but struct sockaddr_in.s_addr is in network byte
+	order.
+	* ntpd/ntp_io.c (io_multicast_del): Likewise.
+
+Sat Apr 24 01:00:53 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92h
+
+	* ntptrace/ntptrace.c: -m maxhost patch
+	From: "R. Gary Cutbill" 
+
+	* util/ntptime.c: Patches.
+	From: Ulrich Windl 
+
+	* html/accopt.htm, html/assoc.htm, html/authopt.htm,
+	html/biblio.htm, html/build.htm, html/clockopt.htm,
+	html/confopt.htm, html/copyright.htm, html/debug.htm,
+	html/exec.htm, html/extern.htm, html/hints.htm, html/index.htm,
+	html/kern.htm, html/miscopt.htm, html/monopt.htm, html/notes.htm,
+	html/ntpd.htm, html/ntpdate.htm, html/ntpdc.htm, html/ntpq.htm,
+	html/ntptime.htm, html/ntptrace.htm, html/patches.htm,
+	html/porting.htm, html/pps.htm, html/rdebug.htm,
+	html/refclock.htm, html/release.htm, html/tickadj.htm,
+	html/hints/solaris.html: Fixed many typos and problems.
+	* acconfig.h (DECL_CFSETISPEED_0, DECL_MRAND48_0, DECL_NLIST_0,
+	DECL_SRAND48_0, DECL_STIME_0): New templates.
+	* include/l_stdlib.h: Include termios.h to get definition of
+	speed_t.
+	(cfsetispeed, cfsetospeed, mrand48, nlist, srand48, stime): New
+	declarations.
+	(openlog): Declare 2- or 3-argument form.
+	* configure.in: Enable declarations of functions missing from
+	Ultrix V4.3 system headers.
+	* ntpd/refclock_oncore.c: Include , Ultrix V4.3
+	 needs it for dev_t.
+	From: Rainer Orth 
+
+	* ntpdc/ntpdc_ops.c: Reality checks.
+
+	* configure.in: netbsd has stubs for the timer_* stuff and doesn't
+	support PPSAPI.  IRIG requires  .
+	From: Frederick Bruckman 
+
+	* ntpdc/ntpdc_ops.c: (kerninfo)  Report in seconds regardless of
+	kernel precision.  Report kernel flags as text.
+	From: Poul-Henning Kamp 
+
+Sun Apr 18 14:26:51 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92g
+
+	* ntpd/ntp_refclock.c (refclock_ioctl): We don't want
+	PPS_HARDPPSONASSERT by default.
+	* ntpd/refclock_oncore.c: Prefer timepps.h over sys/timepps.h
+	From: Poul-Henning Kamp 
+
+Tue Apr 13 17:32:35 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92f
+
+	* ntpd/ntp_refclock.c (refclock_open): VMIN should be 1, not 0
+	From: Reg Clemens 
+
+Sun Apr 11 18:26:44 1999  Harlan Stenn  
+
+	* ntpd/refclock_mx4200.c: Patches/improvements
+	* ntpd/ntpd.c (set_process_priority): Lint
+	From: Marc.Brett@westgeo.com
+
+	* util/ntptime.c: Lint, bit definition cleanup
+	From: Ulrich Windl 
+
+Wed Apr  7 03:02:23 1999  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c: Use timepps.h or sys/timepps.h
+	* configure.in: Look for either timepps.h or sys/timepps.h
+	From: Poul-Henning Kamp 
+
+	* ntpd/ntp_io.c (create_sockets): Don't warn about ENXIO.
+	(Several places)
+	From: Andrej Borsenkow 
+
+	* libntp/mfp_mul.c (mfp_mul): Lint.
+	Marc.Brett@westgeo.com
+
+Sun Apr  4 03:23:53 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92e
+	Dave redesigned the clock state machine.
+
+1999-02-28  Frank Kardel  
+
+	* parseutil/dcfd.c: added DCF77 module powersetup
+
+	* ntpd/refclock_parse.c (parse_control): using gmprettydate instead of prettydate()
+	(mk_utcinfo): new function for formatting GPS derived UTC information
+	(gps16x_message): changed to use mk_utcinfo()
+	(trimbletsip_message): changed to use mk_utcinfo()
+	ignoring position information in unsynchronized mode
+	(parse_start): augument linux support for optional ASYNC_LOW_LATENCY
+
+	* ntpd/ntp_control.c (ctl_putclock): cleanup of end of buffer handling
+
+	* libparse/parse.c (timepacket): removed unnecessary code
+
+	* libparse/clk_trimtsip.c (struct trimble): new member t_utcknown
+	(cvt_trimtsip): fixed status monitoring, bad receiver states are
+ 	now recognized
+
+	* libntp/prettydate.c (gmprettydate): new function for format date
+ 	and time with respect to UTC
+
+	* libntp/gpstolfp.c (GPSWRAP): update GPS rollover to 990 weeks
+
+	* include/trimble.h (CMD_RUTCPARAM): control variable name unification
+
+	* include/ntp_fp.h: added prototype for gmprettydate()
+
+Sat Feb 27 00:03:16 1999  Harlan Stenn  
+
+	* libntp/systime.c: definition
+	* ntpd/ntp_proto.c: sco5_oldclock declaration
+	* configure.in: SCO5_CLOCK for *-*-sco3.2v5*
+	* util/tickadj.c (main): SCO5_OLDCLOCK -> SCO5_CLOCK
+	From: Kees Hendrikse 
+
+	* ntpd/ntp_config.c (getconfig): Indentation cleanup
+	Deal with 'P' case better
+	* ntpd/ntpd.c: Declare set_process_priority()
+	* ntpd/refclock_dumbclock.c: Lint cleanup
+	From: Marc.Brett@westgeo.com
+
+Wed Feb 24 10:22:51 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92d
+
+	* configure.in: Dave says we can't enable PARSE clocks by default.
+	Also, Solaris 2.7 still has its kernel bug - disable kernel FLL
+	there.
+	Reported by: Dave Mills 
+
+Tue Feb 23 23:37:44 1999  Harlan Stenn  
+
+	* libparse/Makefile.am (parsesolaris.o): Devious hack to deal
+	with bug in sys/systm.h .
+	Suggested by: Chaim Frenkel 
+
+Tue Feb 23 20:46:31 1999  Frank Kardel  
+
+	* ntpd/refclock_parse.c: fixed #endifs
+	(stream_receive): fixed formats
+
+Mon Feb 22 00:35:06 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92c
+
+	* ntpd/refclock_chronolog.c: Lint
+	* ntpd/refclock_dumbclock.c: Ditto
+	* ntpd/refclock_oncore.c: Ditto
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_oncore.c (oncore_msg_any): Call GETTIMEOFDAY, not
+	gettimeofday().
+	From: david.higgins@mail.ccur.com
+
+	* configure.in (MCAST): Not in i386-sequent-sysv4
+	Reported by: Joseph Geter 
+
+	* util/ntptime.c: Linux cleanup.
+	From: Reg Clemens 
+
+	* configure.in: Rename SCO5_OLDCLOCK to SCO5_CLOCK
+	* acconfig.h: Ditto
+
+	* ntpd/ntp_proto.c: SCO5_CLOCK stuff
+	(init_proto): Use the SCO5_CLOCK stuff
+	* libntp/systime.c: SCO5_CLOCK stuff
+	(get_systime): Use the SCO5_CLOCK stuff
+	(adj_systime): Use the SCO5_CLOCK stuff
+	From: Kees Hendrikse 
+
+	* ntpd/ntp_config.c: Added -P option and associated baggage.
+	(getstartup): Update help text
+	(getconfig): Process -P option
+	(getconfig): Update help text
+	* ntpd/ntpd.c (set_process_priority): Created.
+	(service_main): remove process priority stuff - we want to do at
+	after we start up the resolver, so call set_process_priority()
+	after getconfig().
+	From: Kamal A Mostafa 
+
+1999-02-21  Frank Kardel  
+
+	* ntpd/ntp_util.c (hourly_stats): removed unused variable
+
+	* libntp/ieee754io.c: renamed index to fieldindex to avoid index() name clash
+
+	* ntpd/refclock_parse.c (parse_start): add initialization for Linux PPSkit
+
+Sun Feb 21 17:53:33 1999  Harlan Stenn  
+
+	* ntpd/ntp_io.c (create_sockets): Skip interfaces that are really
+	just aliases.
+	From: "Erik R. Leo" 
+
+	* configure.in: 4.0.92b
+
+	* ntpd/ntpd.c (service_main): Check for an error return from
+	sched_get_priority_max().
+
+Wed Feb 17 03:48:47 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92a
+
+	* configure.in: configure.in requires autoconf 2.13 or later.
+	Reported by Ulrich Windl 
+
+Wed Feb 17 00:12:11 1999  Harlan Stenn  
+
+	* acconfig.h: TERMIOS_NEEDS__SVID3
+	* configure.in: Ditto
+	* ntpd/refclock_palisade.h: Ditto
+	* include/ntp_refclock.h: Ditto
+	* ntpd/ntpd.c (service_main): We want sched_get_priority_max().
+	From: Kamal A Mostafa 
+
+	* ntpd/ntp_refclock.c (refclock_open): Zero the entire c_cc[] array.
+	From: Reg Clemens 
+
+Tue Feb 16 23:37:49 1999  Harlan Stenn  
+
+	* Updated ansi2knr
+	Reported by: Marc Brett
+
+Mon Feb 15 02:55:28 1999  Harlan Stenn  
+
+	* configure.in: 4.0.92
+
+	* ntpd/ntp_refclock.c: Added refclock_chronolog and
+	refclock_dumbclock.
+	From: Robert McMillin 
+
+Sun Feb 14 15:57:53 1999  Harlan Stenn  
+
+	* dropped SCO3 support #defines.
+	* changed SCO5_TICKADJ #define to SCO5_OLDCLOCK
+	* Added code in libntp/systime.c to accumulate changes until a whole
+	  tick can be added or dropped. Adjusted gettimeofday() output
+	  to include the contents of the accumulator.
+	* cleaned up util/tickadj.c; tickadj -As now does the right thing.
+	From: Kees Hendrikse 
+
+	* ntpq/ntpq.c: Rename delay() to auth_delay()
+	Reported by: Andrej Borsenkow 
+
+	* ntpd/refclock_palisade.h: Cleanup.
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/ntp_refclock.c (refclock_ioctl): Typo.
+	From: Reg Clemens 
+
+	* ntpd/ntp_io.c (create_sockets): Only bind a given network once.
+	From: Wolfgang Rupprecht 
+
+Sat Jan 30 11:48:37 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91f
+
+Thu Jan 28 22:58:40 1999  Harlan Stenn  
+
+	* ntpd/refclock_parse.c (CLK_REALTYPE): We really want ttl, not hmode.
+	* ntpd/ntp_config.c (getconfig): "mode" really should update the
+	ttl member, not the hmode member.
+
+	* ntpd/refclock_local.c: More offset cleanup from Dave.
+
+Thu Jan 28 00:15:20 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91e
+
+	* ntpd/refclock_local.c: Bugfix.
+	From: Dave Mills
+
+	* ntpd/refclock_palisade.c: Lint/IRIX portability cleanup
+	* ntpd/refclock_palisade.h: Re-enable the declaration of float()
+	* ntpd/ntp_io.c (create_sockets): Initialize size to 0
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_parse.c (CLK_REALTYPE): Use hmode, not ttl.
+	* configure.in (ac_cv_var_no_parenb_ignpar): Not under Linux.
+	Reported by: Thomas Quinot 
+
+	* ntpdc/ntpdc.c (my_delay): Renamed, from delay.
+	Reported by: Andrej Borsenkow 
+
+Tue Jan 26 00:56:10 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91d
+
+	* ntpq/ntpq.c: Y2K patches
+	From: Marc.Brett@westgeo.com
+
+	* html/driver29.htm: New version
+	* ntpd/refclock_palisade.c: Ditto
+	* ntpd/refclock_palisade.h: Ditto
+	From: Sven_Dietrich@Trimble.COM
+
+	* upgrade ansi2knr.c
+
+	* Some stuff that Dave did.
+
+	* configure.in: 4.0.91c
+
+	* ntpd/refclock_oncore.c: Prototype cleanup.  Enum cleanup.
+	* ntpd/ntp_proto.c (clock_select): Fix memory leak.
+	* configure.in (ac_cv_struct_ppsclockev): Might need sys/time.h to
+	check for struct clockppsev.  Return pce->serial, not 0;
+	From: Marc.Brett@westgeo.com
+
+	* ntpd/refclock_oncore.c (oncore_msg_En): Clean up.
+	From: John.Hay@mikom.csir.co.za
+
+Mon Jan 25 11:50:29 1999  Philippe De Muyter  
+
+	* libparse/parse_conf.c (clockformats): Entry added for
+ 	clock_wharton_400a.
+	* libparse/clk_wharton.c: New file.
+	* libparse/Makefile.am (libparse_a_SOURCES): clk_wharton.c added;
+	(libparse_kernel_a_SOURCES): kclk_wharton.c added.
+	(kclk_wharton.o): New dependency rule.
+	* ntpd/refclock_parse.c (parse_clockinfo): Entry added for the
+	WHARTON clock (mode 15).
+	* acconfig.h (CLOCK_WHARTON_400A): New configuration macro.
+	* configure.in (CLOCK_WHARTON_400A): Macro defined like other
+	CLOCK_xxx macros.
+
+Sun Jan 24 13:51:30 1999  Harlan Stenn  
+
+	* ntpd/ntp_config.c (do_resolve_internal): Missing #ifdef DEBUG
+	From: Sven Dietrich 
+
+	* Makefile.am (SUBDIRS): Lose authstuff
+	* configure.in: Ditto
+
+Sat Jan 23 15:28:03 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91b
+
+Sat Jan 23 15:02:25 1999  Harlan Stenn  
+
+	* ntpd/refclock_oncore.c: use HAVE_STRUCT_PPSCLOCKEV
+	* acconfig.h: HAVE_STRUCT_PPSCLOCKEV
+	* configure.in (ac_cv_struct_ppsclockev): Added test
+
+Thu Jan 21 15:35:25 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91a
+
+	* ntpd/refclock_nmea.c (nmea_receive): Call refclock_process()
+	every second (or each time a nmea string is received).
+	From: John Hay 
+
+	* ntpd/ntp_refclock.c (refclock_ioctl): Use TIOCPPS if we have it.
+	(refclock_ioctl): Use LDISC_CLKPPS, not LDISC_PPS when deciding
+	how to set str.
+	* ntpd/ntp_loopfilter.c: Lose unused ntp_gettime() stuff.
+	* ntpd/ntp_request.c: Ditto.
+	* ntpd/refclock_local.c: Ditto.
+	* ntpd/refclock_shm.c (shm_poll): Fix the refclock_process() call.
+	* ntpd/refclock_oncore.c: patches and cleanup
+	* configure.in: ioctl/PPS checks, ONCORE cleanup
+	* acconfig.h: ONCORE cleanup
+	From: Reg Clemens 
+
+	* configure.in (CFLAGS): cc on Sequent wants -Wc,+abi-socket.
+	We also need to figure out why -lsocket isn't being detected;
+	-lsocket is needed.
+	From: Dana Kaempen 
+
+	* include/ntp_stdlib.h: AIX portability patches, header cleanup.
+	* ntptrace/ntptrace.c: Ditto.
+	* ntpdate/ntpdate.c: Ditto.
+	* ntpd/refclock_true.c: Ditto.
+	* ntpd/refclock_mx4200.c: Ditto.
+	* ntpd/refclock_jupiter.c: Ditto.
+	* libntp/msyslog.c: Ditto.
+	From: Marc.Brett@waii.com
+
+Sun Jan 10 15:15:07 1999  Harlan Stenn  
+
+	* configure.in: 4.0.91
+
+Sat Jan  9 00:11:34 1999  Harlan Stenn  
+
+	* include/ntp_stdlib.h: msyslog() is declared differently if we're
+	not __STDC__.
+
+	* include/ntp_types.h: It's HAVE_PROTOTYPES, not USE_PROTOTYPES.
+	* include/ntp_machine.h: Ditto.
+
+Fri Jan  8 20:47:10 1999  Harlan Stenn  
+
+	* configure.in: Upgrade to autoconf-2.13
+	Do the prototypes check much earlier, as it might alter CFLAGS and
+ 	things which will affect other tests.
+
+	* ntpd/ntp_request.c (do_conf): The problem was with a template
+	for "version" on an IRIX C compiler...
+	From: Marc.Brett@waii.com
+
+	* libntp/authkeys.c: #include config.h first.
+	Reported by: brian.bumpass@funb.com
+
+Thu Jan  7 00:24:35 1999  Harlan Stenn  
+
+	* util/tickadj.c (main): return() instead of exit().
+	* ntpd/ntp_request.c (do_conf): Disambiguate ||.
+	* ntpd/ntp_proto.c (clock_select): Initialize variables.
+	From: Marc.Brett@waii.com
+
+	* scripts/ntpver.in: Use PATH_SH
+
+	* configure.in (PATH_SH): Added.
+
+Tue Jan  5 19:02:51 1999  Harlan Stenn  
+
+	* configure.in: 4.0.90h
+
+	* html/driver30.htm: Updated.
+	* html/refclock.htm: Refer to driver30
+	* ntpd/refclock_oncore.c: Vastly improve and make less FreeBSD centric,
+	From: Poul-Henning Kamp  and
+		Reg.Clemens 
+
+	* include/ntp.h: Portability/lint patches
+	* libntp/binio.c: Ditto.
+	* libntp/caljulian.c: Ditto.
+	* libntp/caltontp.c: Ditto.
+	* libntp/ieee754io.c: Ditto.
+	* libntp/md5c.c: Ditto.
+	* libntp/mfp_mul.c: Ditto.
+	* libntp/msyslog.c: Ditto.
+	* libntp/statestr.c: Ditto.
+	* libntp/systime.c: Ditto.
+	* libparse/clk_trimtsip.c: Ditto.
+	* libparse/data_mbg.c: Ditto.
+	* libparse/parse.c: Ditto.
+	* ntpd/ntp_control.c: Ditto.
+	* ntpd/ntp_filegen.c: Ditto.
+	* ntpd/ntp_intres.c: Ditto.
+	* ntpd/ntp_io.c: Ditto.
+	* ntpd/ntp_peer.c: Ditto.
+	* ntpd/ntp_proto.c: Ditto.
+	* ntpd/ntp_util.c: Ditto.
+	* ntpd/ntpd.c: Ditto.
+	* ntpd/refclock_arc.c: Ditto.
+	* ntpd/refclock_chu.c: Ditto.
+	* ntpd/refclock_datum.c: Ditto.
+	* ntpd/refclock_leitch.c: Ditto.
+	* ntpd/refclock_parse.c: Ditto.
+	* ntpd/refclock_usno.c: Ditto.
+	* ntpq/ntpq.c: Ditto.
+	* util/tickadj.c: Ditto.
+	From: Marc.Brett@waii.com
+
+Mon Jan  4 00:56:55 1999  Harlan Stenn  
+
+	* configure.in: 4.0.90g
+
+	* ntpd/ntp_config.c (getconfig): MODE was setting ttl, not hmode.
+	Reported by: Carsten Emde 
+
+Fri Dec  4 01:01:14 1998  Harlan Stenn  
+
+	* configure.in: 4.0.90f
+
+	* ntpd/refclock_mx4200.c: New version
+	From: Marc.Brett@waii.com
+
+1998-12-02  Harlan Stenn  
+
+	* ntpd/ntp_config.c (do_resolve_internal): If fork fails, say why.
+	Reported by: Jeff_Dennison@admin.tc.faa.gov
+
+	* ntpd/ntpd.c (ntpdmain):  fork() can return a -1.  Someday we'll
+	report this condition...
+
+1998-12-02  Harlan Stenn  
+
+	* configure.in: 4.0.90e
+
+	* ntpd/refclock_palisade.c: Reformat code so ansi2knr will work
+	* ntpd/refclock_palisade.h: Ditto
+	From: Marc.Brett@waii.com
+
+Sun Nov 29 21:00:53 1998  Harlan Stenn  
+
+	* configure.in: 4.0.90d
+
+	* configure.in (CFLAGS): Use "-O2 -g3 -n32" by default for Irix6.2
+	and later.
+	Reported by: Jack Bryans 
+
+1998-11-29  Harlan Stenn  
+
+	* configure.in: 4.0.90c
+
+	* ntpd/refclock_oncore.c (oncore_msg_En): Convert to nano
+	From: John Hay 
+
+	* include/ntp_request.h (RM_VN_MODE): Add version parameter, so
+	xntpdc will work across v3 and v4.
+	* ntpd/ntp_request.c: Track requested version
+	(req_ack): Use requested version in RM_VN_MODE
+	(more_pkt): Ditto
+	(flush_pkt): Ditto
+	(process_private): Get requested version
+	* ntpd/ntp_intres.c (request): Use default version
+	* ntpdc/ntpdc.c (sendrequest): Ditto
+	From: John Hay 
+
+Fri Nov 27 14:27:21 1998  Harlan Stenn  
+
+	* ntpd/refclock_palisade.c: Lint cleanup
+	* ntpd/refclock_palisade.h: Ditto.
+	From: Marc Brett 
+
+Mon Nov 23 04:45:03 1998  Harlan Stenn  
+
+	* configure.in: 4.0.90b
+
+	* New code and cleanup for the NT stuff
+	From: Carl Byington 
+
+Sat Nov 21 21:21:45 1998  Harlan Stenn  
+
+	* configure.in: 4.0.90a
+
+	* libntp/systime.c (step_systime): net_set_tod calls clock_settime.
+	* libntp/machines.c (ntp_set_tod): Take a 2nd arg for NT.
+	* include/ntp_machine.h: ntp_set_tod() has 2 args always.
+	* ports/winnt/bldrel.bat: Typo.
+	From: Carl Byington 
+
+	* ntpd/ntp_intres.c (findhostaddr): h_errno is a #define under AIX.
+	* configure.in:  clock_settime is a stub in AIX4.
+	From: Perry Ross 
+
+	* libntp/Makefile.am (EXTRA_DIST): Lose libntp.mak
+	* ntpd/Makefile.am (EXTRA_DIST): Ditto.
+	* ntpdate/Makefile.am (EXTRA_DIST): Ditto.
+	* ntpdc/Makefile.am (EXTRA_DIST): Ditto.
+	* ntpq/Makefile.am (EXTRA_DIST): Ditto.
+	From: Greg Schueman 
+
+Sat Nov 21 12:33:16 1998  Harlan Stenn  
+
+	* configure.in: 4.0.90
+
+	Nano changes from Dave Mills.
+
+Thu Nov 19 04:23:46 1998  Harlan Stenn  
+
+	* include/ntp_machine.h: STREAM also needs HAVE_SYS_STREAM_H
+	Reported by: Ronald Cole 
+
+Mon Nov 16 19:17:34 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e14
+
+	* util/ntptime.c (main): Protect STA_NANO
+
+	* ntpd/refclock_oncore.c: General overhaul and simplifications.
+	The new manual clarifies a lot of fine points, and the driver has
+	been suitably simplified.  Uses Site Survey if possible, otherwise
+	does it by hand.  Should also work with non-UT models, as long as
+	they talk the Motorola Binary Protocol.  The driver Doesn't (need
+	to) know where the author lives anymore.
+	From: Poul-Henning Kamp 
+
+	* ntpd/refclock_palisade.h: New version.
+	* ntpd/refclock_palisade.c: New version.
+	From: Sven Dietrich 
+
+Sat Oct 24 01:19:21 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e13
+
+	* ntpdc/ntpdc_ops.c (clkbug): Patches
+	* ntpd/ntp_refclock.c (refclock_buginfo): Patches
+	From: Marc.Brett@waii.com
+
+Sat Oct 10 20:13:14 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e12
+
+	* ntpd/ntp_util.c (hourly_stats): Added prio_set stuff.
+
+	* ntpd/ntpd.c (ntpdmain): HAVE_SETPGRP_0 typo.
+	* parseutil/dcfd.c (detach): Ditto.
+	* ntpd/ntp_control.c (ctl_putpeer): Sometimes, peer->dstadr is
+	NIL.
+	From: Perry Ross 
+
+	* ntpd/ntpd.c:
+	Some systems use sys/sched.h, not sched.h (Irix)
+	* configure.in (CFLAGS): nextstep needs -posix.
+	Reported by: Jack Bryans 
+
+Sat Oct  3 02:32:46 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e11
+
+	* configure.in (ac_refclock_palisade): Needs termios.
+
+	* libntp/mktime.c: Some systems need sys/types.h
+
+	* configure.in: Added AC_TYPE_SIZE_T and AC_CHECK_TYPE(time_t, long)
+	The time_t stuff should only be needed on Older machines, so the
+	fact that I'm using a long shouldn't be a problem (hollow laugh).
+
+	* include/l_stdlib.h: Sometimes we need to #include 
+
+	* libntp/Makefile.am (../include/des.h): Typo.
+
+Fri Oct  2 20:52:47 1998  Harlan Stenn  
+
+	* ntpd/ntp_intres.c (request): Accept responses back thru V2.
+
+Thu Oct  1 00:11:16 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e9
+
+	* ntpd/ntpd.c (catch_danger): Added.
+	(ntpdmain): AIX SIGDANGER stuff
+	From: Lars-Owe Ivarsson 
+
+	* configure.in:
+	* include/ntp_machine.h:
+	* include/ntp_string.h:
+	* libntp/machines.c:
+	* libparse/clk_hopf6021.c:
+	* libparse/clk_trimtsip.c:
+	* ntpd/refclock_leitch.c:
+	* ntpd/refclock_palisade.c:
+	* ntpd/refclock_parse.c:
+	Here are some patches to suppress warnings from various compilers
+	(IRIX 5.3, MipsPro C 7.1 on IRIX 6.4, AIX 4.1) and loaders (IRIX
+	5.3, IRIX 6.4).  Shouldn't affect functionality at all.
+	From: Marc Brett 
+	(I got similar patches for AIX from Lars-Owe Ivarsson
+	)
+
+Thu Sep 24 21:33:50 1998  Harlan Stenn  
+
+	* configure.in: '73e8
+
+	* configure.in: AIX4 stubs the POSIX timer_ stuff,
+	sched_setscheduler, and mlockall.
+	Reported by: Lars-Owe Ivarsson 
+
+	* configure.in: OpenBSD stubs the POSIX timer_ stuff.
+	Reported by:  sidney august cammeresi iv 
+	(and several other folks whose names I can't find at the moment)
+
+Mon Sep 21 15:35:23 1998  Harlan Stenn  
+
+	* configure.in: '73e7
+
+	* ntpd/refclock_parse.c: Missing declaration
+	From: Marc Brett 
+
+	* include/README: Remove old MCAST descriptions
+
+	* include/Makefile.am (noinst_HEADERS): Lose sun-in.h .
+
+Mon Sep 21 14:50:12 1998  Harlan Stenn  
+
+	* ntpdate/ntpdate.c (timer): Properly format the definition.
+
+Sun Sep 20 23:02:50 1998  Harlan Stenn  
+
+	* configure.in: '73e6
+
+	* include/Makefile.am (noinst_HEADERS): Renamed in.h to sun-in.h
+
+Fri Sep 18 01:05:55 1998  Harlan Stenn  
+
+	* configure.in: '73e5
+
+	* ntpd/refclock_palisade.c: SCO patch
+	From: Kamal A Mostafa 
+
+	* libparse/clk_trimtsip.c (cvt_trimtsip): Fix rollover bug.
+	From: "Michael J. Tubby B.Sc. G8TIC" 
+
+	* libntp/authencrypt.c:
+	* libntp/systime.c:
+	* ntpd/refclock_acts.c:
+	* ntpd/refclock_arbiter.c:
+	* ntpd/refclock_arc.c:
+	* ntpd/refclock_as2201.c:
+	* ntpd/refclock_atom.c:
+	* ntpd/refclock_chu.c:
+	* ntpd/refclock_conf.c:
+	* ntpd/refclock_datum.c:
+	* ntpd/refclock_heath.c:
+	* ntpd/refclock_hpgps.c:
+	* ntpd/refclock_irig.c:
+	* ntpd/refclock_leitch.c:
+	* ntpd/refclock_nmea.c:
+	* ntpd/refclock_palisade.c:
+	* ntpd/refclock_parse.c:
+	* ntpd/refclock_pst.c:
+	* ntpd/refclock_trak.c:
+	* ntpd/refclock_true.c:
+	* ntpd/refclock_usno.c:
+	* ntpd/refclock_wwvb.c:
+	Typos, cleanup, and bugfixes
+	From: Marc Brett 
+
+	* ntpd/ntp_timer.c (timer): Typo.
+	* include/ntp_refclock.h: in refclockstat, clockdesc should be const.
+	* ntpd/ntp_io.c (create_sockets): Typo.
+	* ntpd/ntp_control.c (free_varlist): Use the appropriate cast when
+	calling free().
+	(set_var): Use char *td for non-const char data.
+	(ctl_getitem): Use char * for non-const data.
+	(Many of these reported by Marc Brett)
+
+Sun Sep 13 19:19:09 1998  Harlan Stenn  
+
+	* ntpd/ntpd.c: Added nofork declaration.
+	(ntpdmain): Initialize it...
+	* ntpd/ntp_config.c: added nofork.
+	Updated ntp_options.
+	(getstartup): Updated "usage" string.  Deal with -n flag.
+	(getconfig): Ditto.
+	From: Jeffrey Hutzelman 
+
+	* ntpd/ntp_io.c (open_socket): Use ntoa() to print out the address
+	when bind() fails. (in 2 places)
+	Reported by: "Markus W. Fehr" 
+	Only soft-fail if an interface is unavailable.
+	(create_sockets):  Don't SO_REUSEADDR if the interface is unavailable.
+	From: "Markus W. Fehr" 
+
+	* configure.in:  If we --disable-all-clocks, then don't enable
+	parse clocks by default.
+	Reported by: Marion Hakanson 
+
+Sat Aug 22 23:58:14 1998  Frank Kardel  
+
+	* ntpd/refclock_parse.c (local_input): fixed IO handling for non-STREAM IO
+
+Sun Aug 16 20:13:32 1998  Frank Kardel  
+
+	* libntp/ieee754io.c: debug information only compile for LIBDEBUG case
+
+	* ntpd/refclock_parse.c (gps16x_message): reduced UTC parameter information (dropped A0,A1)
+	made uval a local variable (killed one of the last globals)
+	(sendetx): added logging of messages when in debug mode
+	(trimble_check): added periodic checks to facilitate re-initialization
+	(trimbletsip_init): made use of EOL character if in non-kernel operation
+	(trimbletsip_message): extended message interpretation
+	(getdbl): fixed data conversion
+
+	* libparse/parse_conf.c (clockformats): Trimble TSIP driver now also
+	available for kernel operation
+
+	* libparse/info_trimble.c: re-generated
+
+	* libparse/clk_trimtsip.c (cvt_trimtsip): initial kernel capable version (no more floats)
+	(clock_trimtsip =): new format name
+
+	* libparse/clk_trimtaip.c (clock_trimtaip =): changed format name
+
+	* include/trimble.h (CMD_RSTATTRACK): renamed mode 6 variable name
+
+	* scripts/monitoring/ntploopwatch: moved emacs mode selector
+
+Mon Aug 10 15:32:48 1998  Harlan Stenn  
+
+	* ntpd/refclock_acts.c: Patch cleanup
+	* ntpd/ntp_refclock.c: Patch cleanup
+	* ntpd/ntp_timer.c: Patch cleanup
+	From: qli@huey.udel.edu
+
+Wed Jul 29 15:23:21 1998  Harlan Stenn  
+
+	* libntp/machines.c: IRIX needs time.h
+	Reported by: Judith E Bush 
+
+	* ntpd/ntpd.c (service_main): Better AIX PROCLOCK fix.
+	From: Matt Ladendorf  and
+	Grover Davidson 
+
+Wed Jul 29 01:36:48 1998  Harlan Stenn  
+
+	* include/ntpd.h (MAXINTERFACES): Moved here...
+	* ntpd/ntp_io.c: From here...
+	(create_sockets): Only deal with MAXINTERFACES.
+	(create_sockets): Only deal with specified interfaces.
+
+	* ntpd/ntp_config.c (CONFIG_LISTEN): Added
+	Added ifnum and listenaddrs[]
+	(getconfig): Added defn for "addr"
+	(getconfig): Initialize ifnum.
+
+	* ntpd/ntpd.c (service_main): call init_io after getconfig
+	From: Vebjorn Ljosa 
+
+Wed Jul 29 00:42:28 1998  Harlan Stenn  
+
+	* ntpd/refclock_palisade.c: Use NEED_HPUX9_TIOCM_STUFF
+
+	* acconfig.h (NEED_HPUX9_TIOCM_STUFF):  Added.
+
+	* configure.in (REFCLOCK_PALISADE): Needs termio*.h
+	(NEED_HPUX9_TIOCM_STUFF): Added.
+
+	* ntpd/ntp_io.c (create_sockets): Use strchr instead of strstr.
+
+	* libntp/mktime.c: #include 
+
+	* libntp/ieee754io.c: #include 
+
+Wed Jul 29 00:24:22 1998  Harlan Stenn  
+
+	* ntpd/refclock_acts.c (ACTS_MAXPOLL): 14 -> 18.
+	Import current_nextdate
+	(acts_receive): Update peer->nextdate with current_nextdate
+	(acts_poll): Call acts_timeout() (debugging)
+
+	* ntpd/ntp_refclock.c: Export current_nextdate.
+	(refclock_transmit): Check peer->valid >= NTP_SHIFT - 2, not >.
+	(refclock_transmit): hpoll wiggles, update current_nextdate
+
+	* ntpd/ntp_timer.c: #include "ntp_refclock.h"
+	(MODE_MANUAL): Added.
+	(timer): MODE_MANUAL stuff
+
+	From: qli@huey.udel.edu
+
+Tue Jul 28 23:23:15 1998  Harlan Stenn  
+
+	* configure.in: Check for inet_ntoa in -lbind .
+
+	* ntpd/ntpd.c: #undef PROCLOCK for AIX.
+
+Mon Jul 20 01:06:24 1998  Harlan Stenn  
+
+	* configure.in (AC_TYPE_SIZE_T): Added.
+
+Sat Jul 11 09:38:30 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73e
+
+	* ports/winnt/: Replaced with new code (no SHM or PALISADE)
+	From: Greg Schueman 
+
+Fri Jul 10 12:12:59 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73d
+
+	* include/ntp_machine.h (HAVE_SRANDOM): VxWorks patches
+	(HAVE_RANDOM): Ditto.
+	(CALL): Ditto.
+	From: Casey Crellin 
+
+	* ntpd/refclock_parse.c (local_input): Typo.
+	Reported by: Tony Li 
+
+Wed Jul  8 01:49:01 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73c
+
+	* PARSE patches from Frank Kardel
+
+	* libntp/machines.c (ntp_set_tod): Get it right.
+
+Sun Jul  5 22:15:34 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73a
+
+	* kernel/sys/timex.h (MOD_CANSCALE): Add rest of patch to handle
+	scaling.
+	From: Poul-Henning Kamp 
+
+Wed Jun 10 21:16:01 1998  Harlan Stenn  
+
+	* configure.in: 4.0.73
+
+	* ntpd/ntp_loopfilter.c (local_clock): MOD_CANSCALE patches, and
+	be careful with the integration if we're nearly perfect.
+	From: Poul-Henning Kamp 
+
+	* util/tickadj.c (main): Typo fix...
+	From: Marion Hakanson 
+
+	* ntpd/ntp_io.c (create_sockets): Attempt to ignore alias
+	interfaces.
+	From: Kenneth Maupin 
+
+	* ntpd/ntp_refclock.c: PPS fixes
+	* ntpd/refclock_msfees.c (msfees_start): Portability fixes and
+	PPS/STREAM enhancements
+	From: John Hay 
+
+	* ntpd/ntp_refclock.c (refclock_gtlin): Patch...
+	From: Jonathan Stone 
+
+Sun Jun 28 18:43:30 1998  Frank Kardel  
+
+	* libntp/buftvtots.c (buftvtots): using WORD_BIGENDIAN instead of XNTP_BIG_ENDIAN
+
+	* libparse/clk_trimtsip.c (getflt): fixed ENDIAN issue
+	(getdbl): fixed ENDIAN issue
+	(getint): use get_msb_short()
+	(cvt_trimtsip): use gpstolfp() for conversion
+
+	* libntp/Makefile.am (libntp_a_SOURCES): added gpstolfp.c source
+
+	* libntp/binio.c: added {get,put}_msb_{short,long}() functions
+
+	* include/ntp_fp.h: added gpstolfp() prototype
+
+	* include/binio.h: added binio MSB prototypes
+
+Sat Jun 13 13:48:17 1998  Frank Kardel  
+
+	* parseutil/testdcf.c: signed/unsigned
+	SYSV clock name clash fixed
+
+	* parseutil/dcfd.c: signed/unsigned
+	SYSV clock name clash fixed
+	year wrapping at 1998
+	ctype macros take ints as args
+
+	* ntptrace/ntptrace.c (decodeipaddr): ctype macros take ints as args
+
+	* ntpq/ntpq_ops.c (doprintpeers): signed/unsigned
+
+	* ntpq/ntpq.c: ctype macros take ints as args
+	signed/unsigned
+
+	* ntpdc/ntpdc.c: signed/unsigned
+
+	* ntpd/refclock_usno.c: signed/unsigned
+
+	* ntpd/refclock_true.c (true_send): signed/unsigned, name clashes
+
+	* ntpd/refclock_parse.c: signed/unsigned, name clashes
+
+	* ntpd/refclock_nmea.c (nmea_receive): ctype macros take ints as args
+
+	* ntpd/refclock_heath.c (heath_receive): prototypes (signed/unsigned issues)
+
+	* ntpd/refclock_arc.c: prototypes (signed/unsigned issues)
+
+	* ntpd/refclock_acts.c: prototypes (signed/unsigned issues)
+
+	* ntpd/ntpd.c: prototypes (signed/unsigned issues)
+
+	* ntpd/ntp_util.c (getauthkeys): prototypes (signed/unsigned issues)
+	fix SYSV clock name clash
+
+	* ntpd/ntp_request.c: prototypes (signed/unsigned issues)
+	fix SYSV clock name clash
+
+	* ntpd/ntp_io.c (input_handler): variable naming, signed/unsigned
+
+	* ntpd/ntp_intres.c (readconf): signed/unsigned issues
+
+	* ntpd/ntp_control.c: prototypes (signed/unsigned issues)
+	fix SYSV clock name clash
+
+	* ntpd/ntp_config.c: fix SYSV clock name clash
+        ctype macros take ints as args
+
+	* libparse/parsestreams.c: dirt (debug) removed
+
+	* libparse/parsesolaris.c: more prototypes
+	fix name clashes
+	allow for ansi2knr
+
+	* libparse/parse.c: bcopy/memcpy cleanup
+	fix SYSV clock name clash
+
+	* libparse/clk_trimtsip.c (cvt_trimtsip): fix SYSV clock name clash
+
+	* libparse/clk_trimtaip.c (cvt_trimtaip): fix SYSV clock name clash
+
+	* libparse/clk_schmid.c (cvt_schmid): fix SYSV clock name clash
+
+	* libparse/clk_rcc8000.c (cvt_rcc8000): fix SYSV clock name clash
+
+	* libparse/clk_rawdcf.c (cvt_rawdcf): fix SYSV clock name clash
+
+	* libparse/clk_hopf6021.c (cvt_hopf6021): fix SYSV clock name clash
+
+	* libparse/clk_dcf7000.c (cvt_dcf7000): fix SYSV clock name clash
+
+	* libparse/clk_computime.c: fix SYSV clock name clash
+
+	* libntp/octtoint.c (octtoint): ctype macros take ints as args
+
+	* libntp/mstolfp.c (mstolfp): ctype macros take ints as args
+
+	* libntp/hextolfp.c (hextolfp): ctype macros take ints as args
+
+	* libntp/hextoint.c (hextoint): ctype macros take ints as args
+
+	* libntp/decodenetnum.c (decodenetnum): ctype macros take ints as args
+
+	* libntp/atouint.c (atouint): ctype macros take ints as args
+
+	* libntp/atolfp.c (atolfp): ctype macros take ints as args
+
+	* libntp/atoint.c (atoint): ctype macros take ints as args
+
+	* kernel/sys/parsestreams.h:  STREAM macro gone in favor of HAVE_SYS_STREAM_H
+
+	* include/parse.h: STREAM macro gone in favor of HAVE_SYS_STREAM_H
+
+Fri Jun 12 11:08:53 1998  Frank Kardel  
+
+	* ntpd/ntp_timer.c: prototype fixes (ansi2knr/knr compiler)
+
+	* ntpd/ntp_proto.c (make_keylist): type cast for e(!!!)malloc()
+
+	* libparse/Makefile.am: adjust for ansi2knr
+
+	* libntp/ieee754io.c: ansi2knr compatibility
+
+	* include/ntp_refclock.h: added pps_sample() extern declaration
+	added refclock_process_offset() extern declaration
+
+	* include/ntp.h: fixed function * prototypes
+
+	* ntpd/refclock_parse.c (bind): added input routine
+	(local_input): added input routine
+
+	* ntpd/ntp_io.c (input_handler): direct input processing for
+	refclocks to save input recv buffers
+
+	* include/ntp_refclock.h: added int io_input(struct recvbuf *)
+	pointer to allow direct processing of read refclock data in
+	order to save many bug recv buffers on single character input
+	(problem with "fast" machines)
+
+	* parse_conf.c:  conditional compile macros fixed
+
+	* parse.c:  conditional compile macros fixed
+	printf prototype
+
+	* clk_trimtaip.c:  conditional compile macros fixed
+	printf prototype
+
+	* clk_schmid.c:  conditional compile macros fixed
+	printf prototype
+
+	* clk_rcc8000.c:  conditional compile macros fixed
+	printf prototype
+
+	* clk_hopf6021.c:  conditional compile macros fixed
+	printf prototype
+
+	* clk_dcf7000.c: conditional compile macros fixed
+	printf prototype
+
+	* clk_computime.c: conditional compile macros fixed
+	printf prototype
+
+Sat Jun  6 07:41:54 1998  Frank Kardel  
+
+	* ntpd/refclock_palisade.c: fixed termio.h / termios.h inclusion
+
+	* include/ntp_refclock.h: made refclockproc/clockdesc const
+
+	* ntpd/ntp_control.c (ctl_putpeer): avoided ambigous 'else' (gcc)
+
+	* ntpd/refclock_parse.c (parse_start): added BURST mode initialisation
+
+	* scripts/stats/summary.sh (CLOCK): allow for Y2K log files
+
+	* libparse/clk_rawdcf.c: simplified condidional compile expression
+
+Wed May 27 08:10:43 1998  Frank Kardel  
+
+	* include/Makefile.am (noinst_HEADERS): added new header files
+	mbg_gps166.h binio.h ascii.h ieee754io.h
+
+	* ntpdc/ntpdc.c (sendrequest): fixed info_auth_keyid setting it
+	got accidentally trashed every other round
+
+Mon May 25 22:55:07 1998  Frank Kardel  
+
+	* configure.in: PARSE clocks are enabled by default whenever
+	possible (termio.h or termios.h present)
+	removed RAWDCF_SETDTR feature
+
+	* acconfig.h: removed RAWDCF_SETDTR option (now implicit by
+	compilation and run time configuration)
+
+	* ntpd/refclock_parse.c (rawdcf_init): offer a RAWDCF clock (type 14)
+	that attempts to set the DTR modem line for receiver power
+
+	* libparse/clk_meinberg.c (cvt_meinberg): support current standard
+	Meinberg data formats
+
+Sun May 24 09:43:19 1998  Frank Kardel  
+
+	* libparse/clk_rawdcf.c (pps_rawdcf): trigger pps on zero going
+	edge - that is simpler wiring (Rx->DCD).
+
+	* parseutil/testdcf.c (wday): const keyword
+
+	* parseutil/dcfd.c (cvt_rawdcf): sign issues and calling interfaces
+
+	* ntpq/ntpq.c (MAXVARLEN): adjusted internal buffer length for
+	variable values
+
+	* ntpd/refclock_parse.c: adjust to new io handling (fixed formats
+	only)
+	(mkreadable): don't include >"< in readable ASCII output (-> ntpq
+	parsing)
+	output debug messages to stdout instead of msyslog()
+	fixed version information string
+
+	* ntpd/refclock_atom.c (pps_sample): new auxiliary pps interface
+
+	* libparse/parsestreams.c (parserput): get event status consistent
+	with direct calls
+	(zs_xsisr): simulate CARRIER status to avoid unnecessary M_xHANGUP
+	events
+
+	* libparse/parsesolaris.c (parserput): get event status consistent
+	with direct calls
+	(zs_xsisr): simulate CARRIER status to avoid unnecessary M_xHANGUP
+	events
+
+	* libparse/parse.c: removed old input cruft
+	(parse_restart): new generic input help function
+	(parse_addchar): ditto
+	(parse_end): ditto
+	(pps_one): new generic pps help function
+	(pps_zero): ditto
+
+	* libparse/clk_trimtsip.c (clock_trimtsip =): new input handling
+
+	* libparse/clk_trimtaip.c (clock_trimtaip =): new input handling
+	(inp_trimtaip): new input handler
+
+	* libparse/clk_schmid.c (clock_schmid =): new input handling
+	(inp_schmid): new input handler
+
+	* libparse/clk_rcc8000.c (clock_rcc8000 =): new input handling
+	(inp_rcc8000): new input handler
+
+	* libparse/clk_rawdcf.c (clock_rawdcf =): new input handling
+	(snt_rawdcf): adjusted to new input handling
+	(inp_rawdcf): new input handler
+
+	* libparse/clk_meinberg.c (clock_meinberg): new input handling
+	(gps_input): new input handler
+	(mbg_input): new input handler
+
+	* libparse/clk_hopf6021.c (clock_hopf6021 =): new input handling
+	(inp_hopf6021): new input handler
+
+	* libparse/clk_dcf7000.c (clock_dcf7000 =): new input handling
+	(inp_dcf7000): new input handler
+
+	* libparse/clk_computime.c (clock_computime =): new input handling
+	(inp_computime): new input handler
+
+	* libparse/Makefile.am: link kernel module with libntp.a
+
+	* include/parse.h (struct parse): removed old data structure cruft
+	(new input model) new PARSE_INP* macros for input handling
+	removed old SYNC_* macros from old input model
+	(struct clockformat): removed old parse functions in favor of the
+	new input model
+	updated prototypes
+
+	* include/ntp_refclock.h: prototype for refclock_atom pps_sample()
+	interface
+
+	* acconfig.h: added PPS_SAMPLE define
+	* configure.in (LIBPARSE): added PPS_SAMPLE configuration
+	
+
+	* libntp/systime.c (adj_systime): debug output (> level 6) for
+	adjtime results
+
+	* libntp/mfp_mul.c (mfp_mul): controlled debug output
+
+	* libntp/ieee754io.c (get_byte): controlled debug output
+	(fetch_ieee754): ditto
+	(put_ieee754): ditto
+
+Tue May  5 20:09:51 1998  Harlan Stenn  
+
+	* configure.in: document DES is not usually present.
+
+Wed Apr 29 22:00:22 1998  Harlan Stenn  
+
+	* configure.in: 4.0.72h
+
+	* authstuff/Makefile.am (check-local-rsn): check-local doesn't
+	work with RSAREF...
+	Reported by: "Auteria Wally Winzer Jr." 
+
+	* libntp/machines.c: the settime() choices were ordered badly.
+	Reported by: Michael Joosten 
+
+Sat Apr 25 00:35:53 1998  Harlan Stenn  
+
+	* configure.in (ac_cv_var_no_parenb_ignpar): Undo the kernel PLL
+	block I just installed - Dave wants to control this via
+	KERNEL_FLL_BUG.
+
+Fri Apr 24 20:35:57 1998  Harlan Stenn  
+
+	* libntp/Makefile.am (libntp_a_DEPENDENCIES): Set per libntp_a_LIBADD
+
+	* configure.in: Do a better job of blocking kernel PLL under
+	solaris2.6.
+
+Fri Apr 24 00:41:12 1998  Harlan Stenn  
+
+	* configure.in: 4.0.72f
+	(ac_cv_struct_nlist_n_un): Don't look for ntp_adjtime or
+	ntp_gettime under solaris2.6.
+
+	* ntpd/ntp_proto.c (process_packet): Give verbose error messages
+
+	* include/global.h (PROTOTYPES): Drive via HAVE_PROTOTYPES.
+
+Wed Apr 22 16:55:55 1998  Harlan Stenn  
+
+	* configure.in (ac_cv_var_use_des): Added. 4.0.72e.
+	* libntp/Makefile.am (libntp_a_LIBADD): Added DESOBJS
+
+Tue Apr 21 02:08:06 1998  Harlan Stenn  
+
+	* ntpd/refclock_arc.c (arc_receive): Typo...
+	From: Sam Steingold 
+
+Fri Apr 10 03:05:35 1998  Harlan Stenn  
+
+	* configure.in (ac_refclock_chu): AUDIO_CHU support.  Disabled by
+	default, and currently only supported on SunOS and Solaris.
+	* acconfig.h: AUDIO_CHU
+
+Wed Apr  8 19:53:53 1998  Harlan Stenn  
+
+	* libntp/Makefile.am (EXTRA_DIST): Added mktime.c
+
+	* configure.in:  AC_REPLACE_FUNCS(mktime).
+	(--enable-dst-minutes=60): Added, for (missing) mktime().
+
+	* ntpd/refclock_heath.c (heath_receive): Use mktime() instead of
+	the old hack.
+
+Tue Apr  7 21:15:14 1998  Harlan Stenn  
+
+	* configure.in (LIBOBJS): Hack it before AC_OUTPUT to deal with
+	ANSI2KNR-filtering rules.
+	From: Jim Meyering 
+
+Mon Apr  6 01:40:45 1998  Harlan Stenn  
+
+	* libntp/strerror.c: ANSIfy strerror's definition.
+
+Thu Mar 12 20:24:45 1998  Harlan Stenn  
+
+	* libntp/statestr.c: Only #include  if HAVE_CONFIG_H is
+	#define'd.
+	From: Sven Dietrich 
+
+Wed Mar 11 00:27:32 1998  Harlan Stenn  
+
+	* configure.in: Cygwin needs to check for the advapi32 library.
+	NT doesn't support a root user, so don't bother with getuid().
+	Also, don't bother with umask().
+
+	* ntpd/ntp_io.c: cygwin32 patches
+	* ntpd/ntp_proto.c: Ditto.
+	* ntpd/ntpd.c: Ditto.
+	* ntpd/ntp_timer.c: Ditto.
+	* ntpdate/ntpdate.c: Ditto.
+	* libntp/machines.c: Ditto.
+	* libntp/systime.c: Ditto.
+	* include/ntp_machine.h: Ditto.
+	* include/ntp_unixtime.h: Ditto.
+	From: Sven Dietrich 
+
+Tue Mar 10 22:26:14 1998  Harlan Stenn  
+
+	* configure.in (ac_cv_make_tickadj): Added.
+	Now that tickadj is the only(?) utility that cares about tick and
+	tickadj, we don't need to have NOKMEM and no PRESET_* be fatal.
+
+Sat Mar  7 02:57:17 1998  Harlan Stenn  
+
+	* ntpd/ntp_loopfilter.c (local_clock): Patch STA_FLL check
+	From: Poul-Henning Kamp 
+
+	* various: Renamed ACTS to CLOCK_ACTS, ARBITER to CLOCK_ARBITER,
+	ARCRON_MSF to CLOCK_ARCRON_MSF, AS2201 to CLOCK_AS2201, BANC to
+	CLOCK_BANC, DATUM to CLOCK_DATUM, GPSVME to CLOCK_GPSVME, HEATH to
+	CLOCK_HEATH, HPGPS to CLOCK_HPGPS, IRIG to CLOCK_IRIG, JUPITER to
+	CLOCK_JUPITER, LEITCH to CLOCK_LEITCH, MSFEES to CLOCK_MSFEES,
+	MX4200 to CLOCK_MX4200, NMEA to CLOCK_NMEA, PALISADE to
+	CLOCK_PALISADE, PARSE to CLOCK_PARSE, PPS720 to CLOCK_PPS720, PST
+	to CLOCK_PST, PTBACTS to CLOCK_PTBACTS, SHM_CLOCK to CLOCK_SHM,
+	ONCORE to CLOCK_ONCORE, TPRO to CLOCK_TPRO, TRAK to CLOCK_TRAK,
+	TRUETIME to CLOCK_TRUETIME, USNO to CLOCK_USNO, WWVB to CLOCK_WWVB
+
+	* Makefile.am (ETAGS_ARGS): Added acconfig.h
+
+	* various: Renamed LOCAL_CLOCK to CLOCK_LOCAL.
+
+	* configure.in: First cut at  *-pc-cygwin32 support
+	Requested by: Sven Dietrich 
+
+	* configure.in: gdt-surveying code is gone.  Sigh.
+	Reported by: Poul-Henning Kamp 
+
+Wed Mar  4 21:41:06 1998  Harlan Stenn  
+
+	* many places: Renamed ATOM to CLOCK_ATOM
+
+Tue Mar  3 03:18:13 1998  Harlan Stenn  
+
+	* ntpd/ntp_timer.c (timer): Only call refclock_transmit if
+	REFCLOCK is #define'd.
+	Reported by a bunch of folks.
+
+Mon Mar  2 03:46:07 1998  Harlan Stenn  
+
+	* configure.in (ntp_refclock): Use CLOCK_CHU, which no longer
+	needs any special headers.
+	* ntpd/refclock_chu.c: Call it CLOCK_CHU
+	(chu_receive): Define it correctly.
+
+	* include/winnt/sys/time.h (gettimeofday): Prototypes are OK.
+	(settimeofday): Prototypes are OK.
+	From: JJEVNISEK@qgraph.com
+
+	* ntpq/ntpq_ops.c: varlist name and value aren't const.
+	* ntpdc/ntpdc_ops.c (fudge): The flags are u_val, not val.
+	* ntpdc/ntpdc.c: const cleanup, exit cleanup.
+	* ntpd/refclock_wwvb.c (wwvb_receive): Move the definition of tz
+	somewhere more normal.
+	* ntpd/ntp_request.c (do_trustkey): kp gets u_long data, not
+	u_int32 (but Harlan thinks this patch may be wrong).
+	* ntpd/ntp_refclock.c (refclock_process): clocktime needs
+	offset.l_ui, not offset.l_i .
+	* ntpd/ntp_control.c (set_var): t isn't const.
+	* libntp/a_md5encrypt.c (session_key): Cast 2nd arg to MD5auth_setkey.
+	* include/ntpd.h: ctl_var's text field isn't const.
+	* include/ntp_refclock.h: clockdesc isn't const.
+	From: Marc Brett 
+
+	* ntpd/ntp_loopfilter.c (local_clock): Limit ntv.constant to
+	MAXTC, and log error returns from ntp_adjtime.
+	From: Juha Sarlin 
+
+Mon Mar  2 03:05:23 1998  Harlan Stenn  
+
+	* configure.in (ac_cv_var_kernel_fll_bug): KERNEL_FLL_BUG
+	* acconfig.h: KERNEL_FLL_BUG: added.
+	* ntpd/ntp_loopfilter.c (local_clock): Only avoid STA_FLL if
+	KERNEL_FLL_BUG is #define'd (Solaris2.6)
+
+Sat Feb 21 00:45:10 1998  Harlan Stenn  
+
+	* automake-1.2d.patches: Added ansi2knr.o rules.
+
+	* ntpd/refclock_tpro.c: P() stuff
+
+Fri Feb 20 20:10:20 1998  Harlan Stenn  
+
+	* configure.in: Improve the ${CC} -pipe test (cygwin-32's gcc -pipe
+	silently does nothing).
+	Reported by: Sven Dietrich 
+
+Wed Feb 18 00:51:08 1998  Harlan Stenn  
+
+* configure.in: 4.0.72 released.
+
+* configure.in:AC_REPLACE_FUNCS(strerror), check for poll.h, and deal
+  with the --enable-JUPITER stuff.
+* libntp/Makefile.am (libntp_a_LIBADD): Added (for strerror support).
+* libntp/clocktypes.c: Added REFCLK_GPS_JUPITER.
+* ntpdate/ntpdate.c: poll() support
+* ntpd/Makefile.am: Add refclock_jupiter.c
+* ntpd/refclock_conf.c: Added refclock_jupiter
+* ntpd/refclock_mx4200.c (mx4200_pps): Bugfixes.
+* include/ntp.h (REFCLK_GPS_JUPITER): Added, and bumped REFCLK_MAX.
+  From: Craig Leres 
+
+Mon Feb 16 21:02:42 1998  Harlan Stenn  
+
+	* ntpd/ntp_proto.c: P()
+
+Mon Feb 16 12:43:11 1998  Harlan Stenn  
+
+* include/ntp_types.h: Added P() prototyping hack back in.
+* include/parse.h: Ditto.
+* include/ntpd.h:  Ditto.
+* include/ntp_unixtime.h:  Ditto.
+* include/ntp_stdlib.h: Ditto.
+* include/ntp_select.h: Ditto.
+* include/ntp_refclock.h: Ditto.
+* include/ntp_fp.h: Ditto.
+* include/md5.h: Ditto.
+* include/ntp_filegen.h: Ditto.
+* include/ntp_calendar.h: Ditto.
+* include/l_stdlib.h: Ditto.
+
+	* configure.in (ACTS): Sometimes, TIOCMBIS is in sys/ioctl.h
+	  Reported by Kenneth Jaldehag 
+	* configure.in (HEATH): Ditto.
+	* configure.in (PTBACTS): Ditto.
+	* configure.in (USNO): Ditto.
+
+Sat Feb 14 00:02:14 1998  Harlan Stenn  
+
+	* ntpd/refclock_irig.c (irig_rf): Rename sincos[] to sin_cos[].
+
+Fri Feb 13 22:22:08 1998  Harlan Stenn  
+
+	* include/ntp.h (RANDPOLL): Use random or mrand48.
+	* ntpd/ntp_config.c (do_resolve_internal): Ditto.
+	* ntpd/ntp_peer.c (unpeer): Ditto.
+	* ntpd/ntp_proto.c (make_keylist): Ditto.
+
+	* ntpd/ntpd.c (xntpdmain): Use srandom or srand48.
+
+	* configure.in: Look for {s,}random() and [ms]rand48().
+
+Wed Feb 11 22:50:24 1998  Harlan Stenn  
+
+	* ntpd/ntp_restrict.c (hack_restrict): Renamed restrict()
+	* include/ntpd.h: Ditto
+	* ntpd/ntp_request.c (do_restrict): Ditto
+	* ntpd/ntp_config.c (getconfig):
+	* ntpd/ntp_io.c (create_sockets): Ditto.
+
+1998-01-23  Harlan Stenn  
+
+	* ntpd/refclock_irig.c: Allow either  or
+	 .  From Dave Mills.
+
+	* configure.in: Under SunOS, it's sun/audioio.h .
+
+1998-01-22  Harlan Stenn  
+
+	* html/driver6.html: Updated header file info
+	* html/irig.html: Ditto.
+	* configure.in: sys/bsd_audioirig.h replaced with sys/audioio.h
+	for new irig driver that Dave installed.
+
+1998-01-08  Harlan Stenn  
+
+	* Many places: Lose the P(()) prototype stuff
+
+	* util/tickadj.c (writevar): Make offset an off_t
+	(readvar): Ditto
+	(getoffsets): Make offsets off_t
+
+	* adjtimed/adjtimed.c (GetClockRate): Fix lseek arg 2.
+	(SetClockRate): Ditto
+
+	* Many things in many places from many people.
+
+	* configure.in: Added AC_TYPE_OFF_T
+
+1997-11-26  Harlan Stenn  
+
+	* ntpd/refclock_palisade.c: ANSIfied.
+
+Wed Sep  3 23:51:44 1997  Harlan Stenn  
+
+	* configure.in (AM_C_PROTOTYPES): Added.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Added ansi2knr.
+
diff --git a/contrib/ntp/Makefile.am b/contrib/ntp/Makefile.am
index ddf9956..977643b 100644
--- a/contrib/ntp/Makefile.am
+++ b/contrib/ntp/Makefile.am
@@ -22,12 +22,15 @@ SUBDIRS = \
 EXTRA_DIST = \
 	COPYRIGHT \
 	ChangeLog \
+	ChangeLog-4.1.0 \
 	NEWS \
 	NOTES.y2kfixes \
+	README.bk \
 	README.cvs \
 	README.des \
 	README.hackers \
 	README.rsa \
+	README.versions \
 	TODO \
 	WHERE-TO-START \
 	acconfig.h \
@@ -44,7 +47,8 @@ EXTRA_DIST = \
 	results.y2kfixes \
 	conf \
 	html \
-	ports
+	ports \
+	version
 
 DISTCLEANFILES = .warning
 
@@ -54,15 +58,40 @@ ETAGS_ARGS = Makefile.am configure.in acconfig.h
 # HMS: make ports be the last directory...
 # DIST_HOOK_DIRS = conf html scripts ports
 
-BUILT_SOURCES = $(srcdir)/COPYRIGHT
+# HMS: Keep .warning first, as that way it gets printed first.
+BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
 
 $(srcdir)/COPYRIGHT: html/copyright.htm
 	( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
 
+# HMS: The next bit is still suboptimal.  If bk is present but this NTP
+# repo is not a bk repo, we'll get an error message from the prs command.
+# Unfortunately, I haven't found the necessary magic to redirect this error
+# output to /dev/null under ancient/unique shells like the one Ultrix uses.
+# We'll also get an error of srcdir or version is unwritable.
+$(srcdir)/version: FRC.version
+	-(bk version) >/dev/null 2>&1 && \
+	    cd $(srcdir) && \
+            x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
+	    case "$$x" in '') ;; *) echo $$x > version ;; esac
+
 dist-hook:
 	@find $(distdir) -type d -name CVS -print | xargs rm -rf
+	@find $(distdir) -type d -name SCCS -print | xargs rm -rf
+
+.warning:
+	@echo "Compiling with GCC now generates lots of new warnings."
+	@echo " "
+	@echo "Don't be concerned. They're just warnings."
+	@echo " "
+	@echo "Don't send bug reports about the warnings, either."
+	@echo " "
+	@echo "Feel free to send patches that fix these warnings, though."
+	@echo " "
+	@sleep 1
+	@touch .warning
 
-Makefile: .warning
+# HMS: The following seems to be a work-in-progress...
 
 CVO=`$(srcdir)/config.guess`
 
@@ -87,18 +116,7 @@ BHOST=`(hostname || uname -n)`
 		echo " "; \
 	fi
 
-.warning:
-	@echo "Compiling with GCC now generates lots of new warnings."
-	@echo " "
-	@echo "Don't be concerned. They're just warnings."
-	@echo " "
-	@echo "Don't send bug reports about the warnings, either."
-	@echo " "
-	@echo "Feel free to send patches that fix these warnings, though."
-	@echo " "
-	@sleep 1
-	@touch .warning
-
-FRC.distwarn FRC.checkcvo FRC.checkhost:
+FRC.distwarn FRC.checkcvo FRC.checkhost FRC.version:
 
-dot.emacs: FRC.distwarn
+# HMS: what was I trying to do with this?
+#dot.emacs: FRC.distwarn
diff --git a/contrib/ntp/Makefile.in b/contrib/ntp/Makefile.in
index 2a7f938..fd9ba15 100644
--- a/contrib/ntp/Makefile.in
+++ b/contrib/ntp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
-
-
 AUTOMAKE_OPTIONS = util/ansi2knr foreign
 
 SUBDIRS = \
@@ -141,12 +135,15 @@ SUBDIRS = \
 EXTRA_DIST = \
 	COPYRIGHT \
 	ChangeLog \
+	ChangeLog-4.1.0 \
 	NEWS \
 	NOTES.y2kfixes \
+	README.bk \
 	README.cvs \
 	README.des \
 	README.hackers \
 	README.rsa \
+	README.versions \
 	TODO \
 	WHERE-TO-START \
 	acconfig.h \
@@ -163,7 +160,8 @@ EXTRA_DIST = \
 	results.y2kfixes \
 	conf \
 	html \
-	ports
+	ports \
+	version
 
 
 DISTCLEANFILES = .warning
@@ -174,41 +172,49 @@ ETAGS_ARGS = Makefile.am configure.in acconfig.h
 # HMS: make ports be the last directory...
 # DIST_HOOK_DIRS = conf html scripts ports
 
-BUILT_SOURCES = $(srcdir)/COPYRIGHT
+# HMS: Keep .warning first, as that way it gets printed first.
+BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
+
 
+# HMS: The following seems to be a work-in-progress...
 CVO = `$(srcdir)/config.guess`
 
 BHOST = `(hostname || uname -n)`
-EXEEXT =
-OBJEXT = o
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DIST_COMMON = README ./stamp-h.in ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
-config.h.in config.sub configure configure.in depcomp install-sh \
-missing mkinstalldirs
 
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README ./stamp-h.in ChangeLog INSTALL Makefile.am \
+	Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \
+	config.guess config.h.in config.sub configure configure.in \
+	depcomp install-sh missing mkinstalldirs
 DIST_SUBDIRS = $(SUBDIRS)
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
-$(ACLOCAL_M4): configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$@ $(SHELL) ./config.status
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+$(ACLOCAL_M4):  configure.in acinclude.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
 		rm -f stamp-h; \
@@ -221,12 +227,12 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
 	@mv stamp-hT stamp-h
-$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
+$(srcdir)/config.h.in:  $(srcdir)/./stamp-h.in
 	@if test ! -f $@; then \
 		rm -f $(srcdir)/./stamp-h.in; \
 		$(MAKE) $(srcdir)/./stamp-h.in; \
 	else :; fi
-$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
 	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
 	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
@@ -234,6 +240,7 @@ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
 
 distclean-hdr:
 	-rm -f config.h
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -241,10 +248,7 @@ distclean-hdr:
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -309,9 +313,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -325,15 +329,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = .
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+# Avoid unsightly `./'.
+distdir = $(PACKAGE)-$(VERSION)
 
 GZIP_ENV = --best
 
@@ -342,7 +347,11 @@ distdir: $(DISTFILES)
 	mkdir $(distdir)
 	$(mkinstalldirs) $(distdir)/scripts
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -376,6 +385,7 @@ distdir: $(DISTFILES)
 dist: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -395,7 +405,9 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	     || (echo "Error: files left after uninstall" 1>&2; \
+	         exit 1) ) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
 	  && rm -f $(distdir).tar.gz \
@@ -408,7 +420,6 @@ distcheck: dist
 check-am: all-am
 check: check-recursive
 all-am: Makefile config.h
-
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -421,41 +432,38 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
 
-dist-all: dist
-
+dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 distclean: distclean-recursive
-	-rm -f config.status
-
+	-rm -f config.status config.cache config.log
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
 
-dvi:
+dvi: dvi-recursive
 
 dvi-am:
 
-info:
+info: info-recursive
 
 info-am:
 
@@ -463,14 +471,13 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-recursive
 
 install-man:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -478,29 +485,55 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am all-recursive check check-am check-recursive clean \
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive dist dist-all distcheck distclean \
 	distclean-generic distclean-hdr distclean-recursive \
 	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
 	info-recursive install install-am install-data install-data-am \
 	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-recursive \
-	install-man install-recursive install-strip installcheck \
-	installcheck-am installcheck-recursive installdirs \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
 	installdirs-am installdirs-recursive maintainer-clean \
 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-recursive \
-	uninstall-recursive
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
 
 
 $(srcdir)/COPYRIGHT: html/copyright.htm
 	( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
 
+# HMS: The next bit is still suboptimal.  If bk is present but this NTP
+# repo is not a bk repo, we'll get an error message from the prs command.
+# Unfortunately, I haven't found the necessary magic to redirect this error
+# output to /dev/null under ancient/unique shells like the one Ultrix uses.
+# We'll also get an error of srcdir or version is unwritable.
+$(srcdir)/version: FRC.version
+	-(bk version) >/dev/null 2>&1 && \
+	    cd $(srcdir) && \
+            x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
+	    case "$$x" in '') ;; *) echo $$x > version ;; esac
+
 dist-hook:
 	@find $(distdir) -type d -name CVS -print | xargs rm -rf
+	@find $(distdir) -type d -name SCCS -print | xargs rm -rf
 
-Makefile: .warning
+.warning:
+	@echo "Compiling with GCC now generates lots of new warnings."
+	@echo " "
+	@echo "Don't be concerned. They're just warnings."
+	@echo " "
+	@echo "Don't send bug reports about the warnings, either."
+	@echo " "
+	@echo "Feel free to send patches that fix these warnings, though."
+	@echo " "
+	@sleep 1
+	@touch .warning
 
 .buildcvo:
 	echo "$(CVO)" > .buildcvo
@@ -521,22 +554,10 @@ Makefile: .warning
 		echo " "; \
 	fi
 
-.warning:
-	@echo "Compiling with GCC now generates lots of new warnings."
-	@echo " "
-	@echo "Don't be concerned. They're just warnings."
-	@echo " "
-	@echo "Don't send bug reports about the warnings, either."
-	@echo " "
-	@echo "Feel free to send patches that fix these warnings, though."
-	@echo " "
-	@sleep 1
-	@touch .warning
-
-FRC.distwarn FRC.checkcvo FRC.checkhost:
-
-dot.emacs: FRC.distwarn
+FRC.distwarn FRC.checkcvo FRC.checkhost FRC.version:
 
+# HMS: what was I trying to do with this?
+#dot.emacs: FRC.distwarn
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/NEWS b/contrib/ntp/NEWS
index e8bfb76..c2ac68a 100644
--- a/contrib/ntp/NEWS
+++ b/contrib/ntp/NEWS
@@ -1,3 +1,19 @@
+--
+* Lose the source port check on incoming packets
+* (x)ntpdc compatibility patch
+* Virtual IP improvements
+* ntp_loopfilter fixes and improvements
+* ntpdc improvements
+* GOES refclock fix
+* JJY driver
+* bsdi port fixes
+* HP MPE/iX port
+* Win/NT port upgrade
+* Dynix PTX port fixes
+* Document conversion from CVS to BK
+* readline support for ntpq
+(4.1.0)
+* CERT problem fixed (99k23)
 * Huff-n-Puff filter
 * Preparation for OpenSSL support
 * Resolver changes/improvements are not backward compatible with mode 7
diff --git a/contrib/ntp/README.bk b/contrib/ntp/README.bk
new file mode 100644
index 0000000..6db4821
--- /dev/null
+++ b/contrib/ntp/README.bk
@@ -0,0 +1,62 @@
+In order to use the BitKeeper repository version of NTP you will have
+to have the following tools installed:
+
+	autoconf	2.50 or later (we use 2.52)
+	automake	(we use 1.5)
+	lynx
+
+Lynx is used to generate the COPYRIGHT file.  Don't ask.
+
+You can get bitkeeper by visiting:
+
+	http://www.bitkeeper.com/ 
+
+We are using bitkeeper under their free license program.  You can use
+bitkeeper for free to access NTP, too.  If you have questions about this,
+please ask.  The license is pretty easy to read.
+ 
+Once you have installed bitkeeper, you can clone any NTP repository.
+
+You can get the ntp-stable repository by either of the following commands:
+
+     bk clone bk://www.ntp.org/home/bk/ntp-stable ntp-stable
+
+     bk clone bk://ntp.bkserver.net/ntp-stable ntp-stable
+
+You can get the ntp-dev repository by either of the following commands:
+
+     bk clone bk://www.ntp.org/home/bk/ntp-dev ntp-dev
+
+     bk clone bk://ntp.bkserver.net/ntp-dev ntp-dev
+
+The IPV6 patch has been applied:
+
+     bk clone bk://www.ntp.org/home/bk/ntp-dev-ipv6 ntp-dev-ipv6
+
+     bk clone bk://ntp.bkserver.net/ntp-dev-ipv6 ntp-dev-ipv6
+
+The ntp-dev-ipv6 repository will be merged back in to the ntp-dev repo
+as soon as the code is stable.
+
+If you are stuck behind a firewall that blocks access to the default port
+used by bitkeeper (14690) but you can use port 80 instead, you can use
+http as a bk transport mechanism.  Just use:
+
+     bk clone http://ntp.bkserver.net/REPO REPO
+
+Finally, it's possible to use SMTP as a bk transport mechanism.  So far, we
+haven't tried this.
+
+Once you have obtained the sources, do the following:
+
+	cd REPO
+	bk -r edit		to check out the files
+	autoreconf -f -i	generates configure and Makefile.in's
+
+and you should be ready to go.  You will get some warning messages from
+autoreconf.  Ignore these messages.
+
+You can update your repository by incanting:
+
+	cd REPO
+	bk pull
diff --git a/contrib/ntp/README.cvs b/contrib/ntp/README.cvs
index 041b84a..c72177d 100644
--- a/contrib/ntp/README.cvs
+++ b/contrib/ntp/README.cvs
@@ -1,3 +1,7 @@
+
+  NOTE: The CVS repository for NTP is inactive.  NTP is now maintained
+  using BitKeeper; see README.bk for more info.
+
 To get the NTP distribution via anonymous CVS:
 
     % cvs -d :pserver:anoncvs@www.ntp.org:/cvs/ntp login
diff --git a/contrib/ntp/README.rsa b/contrib/ntp/README.rsa
index 3568dbb..e92eacd 100644
--- a/contrib/ntp/README.rsa
+++ b/contrib/ntp/README.rsa
@@ -10,13 +10,11 @@ end of this file.
 
 When you run configure, the Right Thing will happen.
 
-Be advised that the RSA DES code is not quite as portable os one might
+Be advised that the RSA DES code is not quite as portable is one might
 wish for.  In particular, DES under NTP will only work between machines
 of the same "endianness".
 
-Dave would prefer that new/alternative encryption schemes follow the
-RSA API.
-
+Note that the next release of NTP uses OpenSSL instead of RSAREF.
 
 --- rsa.c.orig	Fri Mar 25 14:01:48 1994
 +++ rsaref2/source/rsa.c	Mon Dec 13 13:10:28 1999
diff --git a/contrib/ntp/README.versions b/contrib/ntp/README.versions
new file mode 100644
index 0000000..5509250
--- /dev/null
+++ b/contrib/ntp/README.versions
@@ -0,0 +1,35 @@
+
+NTP uses A.B.C - style release numbers.
+
+The third (C) part of the version number can be:
+
+ 0-69 for patches/bugfixes to the A.B.C series.
+ 70-79 for alpha releases of the A.B+1.0 series.
+ 80+ for beta releases of the A.B+1.0 series.
+
+At the moment:
+
+ A is 4, for ntp V4.
+ B is the minor release number.
+ C is the patch/bugfix number, and may have extra cruft in it.
+
+Any extra cruft in the C portion of the number indicates an "interim" release.
+
+Interim releases almost always have a C portion consisting of a number
+followed by an increasing letter, optionally followed by -rcX, where X
+is an increasing number.  The -rcX indicates a "release candidate".
+
+Here are some recent versions numbers as an example:
+
+ 4.1.0		A production release (from the ntp-stable repository)
+ 4.1.0b-rc1	A release candidate for 4.1.1 (from the ntp-stable repo)
+ 4.1.71		An alpha release of 4.2.0, from the ntp-dev repo
+
+Note that after the ntp-dev repo produces a production release it will
+be copied into the ntp-stable and the cycle will repeat.
+
+The goal of this scheme is to produce version numbers that collate
+"properly" with the output of the "ls" command.
+
+Feel free to suggest improvements...
+
diff --git a/contrib/ntp/acconfig.h b/contrib/ntp/acconfig.h
index dfb0582..a53ba82 100644
--- a/contrib/ntp/acconfig.h
+++ b/contrib/ntp/acconfig.h
@@ -82,6 +82,9 @@
 /* Sun IRIG audio decoder */
 #undef CLOCK_IRIG
 
+/* JJY receiver */
+#undef CLOCK_JJY
+
 /* Rockwell Jupiter GPS clock */
 #undef CLOCK_JUPITER
 
@@ -402,6 +405,9 @@
 /* hstrerror()? */
 #undef DECL_HSTRERROR_0
 
+/* inet_ntoa()? */
+#undef DECL_INET_NTOA_0
+
 /* ioctl()? */
 #undef DECL_IOCTL_0
 
diff --git a/contrib/ntp/acinclude.m4 b/contrib/ntp/acinclude.m4
index 82ade38..2c02173 100644
--- a/contrib/ntp/acinclude.m4
+++ b/contrib/ntp/acinclude.m4
@@ -21,7 +21,7 @@ dnl
 dnl    AC_DEFINE_DIR(DATADIR, datadir)
 dnl    AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
 dnl
-dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
+dnl @version $Id$
 dnl @author Alexandre Oliva 
 
 AC_DEFUN(AC_DEFINE_DIR, [
diff --git a/contrib/ntp/aclocal.m4 b/contrib/ntp/aclocal.m4
index 01752eb..e31337f 100644
--- a/contrib/ntp/aclocal.m4
+++ b/contrib/ntp/aclocal.m4
@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.4e
+# ./aclocal.m4 generated automatically by aclocal 1.5
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@ dnl
 dnl    AC_DEFINE_DIR(DATADIR, datadir)
 dnl    AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
 dnl
-dnl @version $Id: acinclude.m4,v 1.3 2000/08/04 03:26:22 stenn Exp $
+dnl @version $Id$
 dnl @author Alexandre Oliva 
 
 AC_DEFUN(AC_DEFINE_DIR, [
@@ -60,22 +60,60 @@ AC_DEFUN(AC_DEFINE_DIR, [
 AC_PREREQ([2.12])
 
 AC_DEFUN([AM_CONFIG_HEADER],
+[ifdef([AC_FOREACH],dnl
+	 [dnl init our file count if it isn't already
+	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+	 dnl prepare to store our destination file list for use in config.status
+	 AC_FOREACH([_AM_File], [$1],
+		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
+		    dnl and add it to the list of files AC keeps track of, along
+		    dnl with our hook
+		    AC_CONFIG_HEADERS(_AM_File,
+dnl COMMANDS, [, INIT-CMDS]
+[# update the timestamp
+echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
+		    m4_popdef([_AM_Dest])])],dnl
 [AC_CONFIG_HEADER([$1])
   AC_OUTPUT_COMMANDS(
    ifelse(patsubst([$1], [[^ ]], []),
 	  [],
 	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
-	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
-  [am_indx=1
-  for am_file in $1; do
-    case " $CONFIG_HEADERS " in
-    *" $am_file "*)
-      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
-      ;;
-    esac
-    am_indx=\`expr \$am_indx + 1\`
-  done])
-])
+	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
+[am_indx=1
+for am_file in $1; do
+  case " \$CONFIG_HEADERS " in
+  *" \$am_file "*)
+    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
+    if test -n "\$am_dir"; then
+      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
+      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
+        am_tmpdir=\$am_tmpdir\$am_subdir/
+        if test ! -d \$am_tmpdir; then
+          mkdir \$am_tmpdir
+        fi
+      done
+    fi
+    echo timestamp > "\$am_dir"stamp-h\$am_indx
+    ;;
+  esac
+  am_indx=\`expr \$am_indx + 1\`
+done])
+])]) # AM_CONFIG_HEADER
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(m4_regexp([$1], [^/.*]), -1,
+			  [.],
+			  m4_patsubst([$1], [^\(/\).*], [\1])),
+		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+]) # _AM_DIRNAME
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
@@ -129,7 +167,16 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 ifdef([m4_pattern_allow],
-      [m4_pattern_allow([^AM_(C|CPP|CXX|OBJC|F|R|GCJ)FLAGS])])dnl
+      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
+
+# Autoconf 2.50 always computes EXEEXT.  However we need to be
+# compatible with 2.13, for now.  So we always define EXEEXT, but we
+# don't compute it.
+AC_SUBST(EXEEXT)
+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
+# requests that it be used.  This is a bit dumb.
+: ${OBJEXT=o}
+AC_SUBST(OBJEXT)
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -140,7 +187,7 @@ AM_MISSING_PROG(AUTOMAKE, automake)
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
-AM_MISSING_INSTALL_SH
+AM_PROG_INSTALL_SH
 AM_PROG_INSTALL_STRIP
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -149,13 +196,13 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_PROVIDE_IFELSE([AC_PROG_][CC],
-                  [AM_DEPENDENCIES(CC)],
+                  [_AM_DEPENDENCIES(CC)],
                   [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl
+                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [AM_DEPENDENCIES(CXX)],
+                  [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
 
 #
@@ -182,6 +229,7 @@ if (
       # -L didn't work.
       set X `ls -t $srcdir/configure conftest.file`
    fi
+   rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
       && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
@@ -202,7 +250,6 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-rm -f conftest*
 AC_MSG_RESULT(yes)])
 
 
@@ -216,34 +263,15 @@ $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
 
-# AM_MISSING_INSTALL_SH
-# ---------------------
-# Like AM_MISSING_PROG, but only looks for install-sh.
-AC_DEFUN([AM_MISSING_INSTALL_SH],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-if test -z "$install_sh"; then
-   for install_sh in "$ac_aux_dir/install-sh" \
-                     "$ac_aux_dir/install.sh" \
-                     "${am_missing_run}${ac_auxdir}/install-sh";
-   do
-     test -f "$install_sh" && break
-   done
-   # FIXME: an evil hack: we remove the SHELL invocation from
-   # install_sh because automake adds it back in.  Sigh.
-   install_sh=`echo $install_sh | sed -e 's/\${SHELL}//'`
-fi
-AC_SUBST(install_sh)])
-
-
 # AM_MISSING_HAS_RUN
 # ------------------
 # Define MISSING if not defined so far and test if it supports --run.
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
-[test x"${MISSING+set}" = xset ||
-  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
-if eval "$MISSING --run :"; then
+if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
@@ -255,80 +283,71 @@ fi
 # AM_AUX_DIR_EXPAND
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to ${srcdir}/foo.  In other projects, it is set to `.'.
-# Of course, Automake must honor this variable whenever it call a tool
-# from the auxiliary directory.  The problem is that $srcdir (hence
-# $ac_aux_dir) can be either an absolute path or a path relative to
-# $top_srcdir or absolute, this depends on how configure is run.  This
-# is pretty anoying since it makes $ac_aux_dir quite unusable in
-# subdirectories: on the top source directory, any form will work
-# fine, but in subdirectories relative pat needs to be adapted.
-# - calling $top_srcidr/$ac_aux_dir/missing would success if $srcdir is
-#   relative, but fail if $srcdir is absolute
-# - conversly, calling $ax_aux_dir/missing would fail if $srcdir is
-#   absolute, and success on relative paths.
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
 #
-# Consequently, we define and use $am_aux_dir, the "always absolute"
-# version of $ac_aux_dir.
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND], [
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
 ])
 
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
-# annoying in cross=compiling environments, where the build's strip
+# annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so if we ever
-# need to use a non standard strip, we just have to make sure we use
-# install-sh with the STRIPPROG variable set.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_MISSING_INSTALL_SH])
-dnl Don't test for $cross_compiling = yes, it might be `maybe'...
-# We'd like to do this but we can't because it will unconditionally
-# require config.guess.  One way would be if autoconf had the capability
-# to let us compile in this code only when config.guess was already
-# a possibility.
-#if test "$cross_compiling" != no; then
-#  # since we are cross-compiling, we need to check for a suitable `strip'
-#  AM_PROG_STRIP
-#  if test -z "$STRIP"; then
-#    AC_MSG_WARN([strip missing, install-strip will not strip binaries])
-#  fi
-#fi
-
-# If $STRIP is defined (either by the user, or by AM_PROG_STRIP),
-# instruct install-strip to use install-sh and the given $STRIP program.
-# Otherwise, just use ${INSTALL}: the idea is to use the vendor install
-# as much as possible, because it's faster.
-if test -z "$STRIP"; then
-  # The top level make will set INSTALL_PROGRAM=$(INSTALL_STRIP_PROGRAM)
-  # and the double dolard below is there to make sure that ${INSTALL}
-  # is substitued in the sub-makes, not at the top-level; this is
-  # needed if ${INSTALL} is a relative path (ajusted in each subdirectory
-  # by config.status).
-  INSTALL_STRIP_PROGRAM='$${INSTALL} -s'
-  INSTALL_STRIP_PROGRAM_ENV=''
-else
-  _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`"
-  INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s"
-  INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'"
-fi
-AC_SUBST([STRIP])
-AC_SUBST([INSTALL_STRIP_PROGRAM])
-AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
-
-#AC_DEFUN([AM_PROG_STRIP],
-#[# Check for `strip', unless the installer
-# has set the STRIP environment variable.
-# Note: don't explicitly check for -z "$STRIP" here because
-# that will cause problems if AC_CANONICAL_* is AC_REQUIREd after
-# this macro, and anyway it doesn't have an effect anyway.
-#AC_CHECK_TOOL([STRIP],[strip])
-#])
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4						-*- Autoconf -*-
+
 
-# serial 3
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -336,53 +355,57 @@ AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
 # C support machinery.  Also note that it means that autoscan, seeing
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
-# AM_DEPENDENCIES(NAME)
+
+
+# _AM_DEPENDENCIES(NAME)
 # ---------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX" or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
-AC_DEFUN([AM_DEPENDENCIES],
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-ifelse([$1], CC,
-       [AC_REQUIRE([AC_PROG_][CC])dnl
-AC_REQUIRE([AC_PROG_][CPP])
-depcc="$CC"
-depcpp="$CPP"],
-       [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl
-AC_REQUIRE([AC_PROG_][CXXCPP])
-depcc="$CXX"
-depcpp="$CXXCPP"],
-       [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
-       [AC_REQUIRE([AC_PROG_][$1])dnl
-depcc="$$1"
-depcpp=""])
-
-AC_REQUIRE([AM_MAKE_INCLUDE])
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP"; then
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  mkdir confdir
+  mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
-  cp "$am_depcomp" confdir
-  cd confdir
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
 
   am_cv_$1_dependencies_compiler_type=none
-  for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
-    case "$depmode" in
+    case $depmode in
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -397,18 +420,19 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
-    if depmode="$depmode" \
+    if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type="$depmode"
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_$1_dependencies_compiler_type=$depmode
       break
     fi
   done
 
   cd ..
-  rm -rf confdir
+  rm -rf conftest.dir
 else
   am_cv_$1_dependencies_compiler_type=none
 fi
@@ -421,16 +445,17 @@ AC_SUBST([$1DEPMODE])
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
   DEPDIR=.deps
-  # We redirect because .deps might already exist and be populated.
-  # In this situation we don't want to see an error.
-  rmdir .deps > /dev/null 2>&1
 else
+  # MS-DOS does not allow filenames that begin with a dot.
   DEPDIR=_deps
 fi
+rmdir .deps 2>/dev/null
 AC_SUBST(DEPDIR)
 ])
 
@@ -441,22 +466,11 @@ AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
-fi
-AC_SUBST(AMDEP)
-if test -z "$AMDEP"; then
   AMDEPBACKSLASH='\'
-else
-  AMDEPBACKSLASH=
 fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 pushdef([subst], defn([AC_SUBST]))
 subst(AMDEPBACKSLASH)
 popdef([subst])
@@ -473,7 +487,7 @@ popdef([subst])
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
-test x"$AMDEP" != x"" ||
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
@@ -510,7 +524,7 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
-], [AMDEP="$AMDEP"
+], [AMDEP_TRUE="$AMDEP_TRUE"
 ac_aux_dir="$ac_aux_dir"])])
 
 # AM_MAKE_INCLUDE()
@@ -518,26 +532,69 @@ ac_aux_dir="$ac_aux_dir"])])
 # Check to see how make treats includes.
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
-# BSD make uses .include
 cat > confinc << 'END'
 doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
-_am_include='#'
-for am_inc in include .include; do
-   echo "$am_inc confinc" > confmf
-   if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      _am_include=$am_inc
-      break
+am__include='#'
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote='"'
+      _am_result=BSD
    fi
-done
-AC_SUBST(_am_include)
-AC_MSG_RESULT($_am_include)
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
 rm -f confinc confmf
 ])
 
+# serial 3
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+#
+# FIXME: Once using 2.50, use this:
+# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],
+        [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+ifelse([$1], [FALSE],
+       [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 
 # serial 1
 
diff --git a/contrib/ntp/adjtimed/Makefile.in b/contrib/ntp/adjtimed/Makefile.in
index 72ae621..5542484 100644
--- a/contrib/ntp/adjtimed/Makefile.in
+++ b/contrib/ntp/adjtimed/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = @MAKE_ADJTIMED@
 EXTRA_PROGRAMS = adjtimed
@@ -124,8 +118,6 @@ INCLUDES = -I$(top_srcdir)/include
 LDADD = ../libntp/libntp.a
 #EXTRA_DIST = TAGS
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = adjtimed
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -134,37 +126,35 @@ EXTRA_PROGRAMS = adjtimed$(EXEEXT)
 bin_PROGRAMS = @MAKE_ADJTIMED@
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 adjtimed_SOURCES = adjtimed.c
 adjtimed_OBJECTS = adjtimed$U.$(OBJEXT)
 adjtimed_LDADD = $(LDADD)
 adjtimed_DEPENDENCIES = ../libntp/libntp.a
-adjtimed_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+adjtimed_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/adjtimed$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = adjtimed.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/adjtimed$U.Po
 DIST_COMMON = README Makefile.am Makefile.in
-
 SOURCES = adjtimed.c
-OBJECTS = adjtimed$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  adjtimed/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -172,8 +162,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -189,28 +181,44 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+adjtimed$(EXEEXT): $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) 
+	@rm -f adjtimed$(EXEEXT)
+	$(LINK) $(adjtimed_LDFLAGS) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-adjtimed: $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES)
-	@rm -f adjtimed
-	$(LINK) $(adjtimed_LDFLAGS) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/adjtimed$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 adjtimed_.c: adjtimed.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimed.c; then echo $(srcdir)/adjtimed.c; else echo adjtimed.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimed_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimed.c; then echo $(srcdir)/adjtimed.c; else echo adjtimed.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimed_.c || rm -f adjtimed_.c
 adjtimed_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -223,7 +231,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -239,30 +247,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/adjtimed$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -271,7 +259,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -297,23 +289,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -323,11 +312,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -335,7 +324,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -349,18 +338,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
-
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
-	uninstall uninstall-am uninstall-binPROGRAMS
-
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/ntp/clockstuff/Makefile.am b/contrib/ntp/clockstuff/Makefile.am
index 44e85a8..ebfd74e 100644
--- a/contrib/ntp/clockstuff/Makefile.am
+++ b/contrib/ntp/clockstuff/Makefile.am
@@ -11,6 +11,6 @@ clktest_LDADD = ../libntp/libntp.a
 ETAGS_ARGS = Makefile.am
 #EXTRA_DIST = TAGS
 
-chutest: ../libntp/libntp.a
+chutest$(EXEEXT): ../libntp/libntp.a
 
-clktest: ../libntp/libntp.a
+clktest$(EXEEXT): ../libntp/libntp.a
diff --git a/contrib/ntp/clockstuff/Makefile.in b/contrib/ntp/clockstuff/Makefile.in
index da00d8d..ff2be9c 100644
--- a/contrib/ntp/clockstuff/Makefile.in
+++ b/contrib/ntp/clockstuff/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
 EXTRA_PROGRAMS = propdelay chutest clktest
@@ -127,8 +121,6 @@ propdelay_LDADD = -lm
 chutest_LDADD = ../libntp/libntp.a
 clktest_LDADD = ../libntp/libntp.a
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = clockstuff
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -137,78 +129,94 @@ EXTRA_PROGRAMS = propdelay$(EXEEXT) chutest$(EXEEXT) clktest$(EXEEXT)
 noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
 PROGRAMS = $(noinst_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 chutest_SOURCES = chutest.c
 chutest_OBJECTS = chutest$U.$(OBJEXT)
 chutest_DEPENDENCIES = ../libntp/libntp.a
-chutest_LDFLAGS = 
+chutest_LDFLAGS =
 clktest_SOURCES = clktest.c
 clktest_OBJECTS = clktest$U.$(OBJEXT)
 clktest_DEPENDENCIES = ../libntp/libntp.a
-clktest_LDFLAGS = 
+clktest_LDFLAGS =
 propdelay_SOURCES = propdelay.c
 propdelay_OBJECTS = propdelay$U.$(OBJEXT)
 propdelay_DEPENDENCIES =
-propdelay_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+propdelay_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/chutest$U.Po $(DEPDIR)/clktest$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/propdelay$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = chutest.c clktest.c propdelay.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/chutest$U.Po $(DEPDIR)/clktest$U.Po \
-@AMDEP@ $(DEPDIR)/propdelay$U.Po
 DIST_COMMON = README Makefile.am Makefile.in
-
 SOURCES = chutest.c clktest.c propdelay.c
-OBJECTS = chutest$U.$(OBJEXT) clktest$U.$(OBJEXT) propdelay$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  clockstuff/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+propdelay$(EXEEXT): $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) 
+	@rm -f propdelay$(EXEEXT)
+	$(LINK) $(propdelay_LDFLAGS) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-propdelay: $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES)
-	@rm -f propdelay
-	$(LINK) $(propdelay_LDFLAGS) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chutest$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clktest$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/propdelay$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 chutest_.c: chutest.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chutest.c; then echo $(srcdir)/chutest.c; else echo chutest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chutest_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chutest.c; then echo $(srcdir)/chutest.c; else echo chutest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chutest_.c || rm -f chutest_.c
 clktest_.c: clktest.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clktest.c; then echo $(srcdir)/clktest.c; else echo clktest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clktest_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clktest.c; then echo $(srcdir)/clktest.c; else echo clktest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clktest_.c || rm -f clktest_.c
 propdelay_.c: propdelay.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/propdelay.c; then echo $(srcdir)/propdelay.c; else echo propdelay.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > propdelay_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/propdelay.c; then echo $(srcdir)/propdelay.c; else echo propdelay.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > propdelay_.c || rm -f propdelay_.c
 chutest_.$(OBJEXT) clktest_.$(OBJEXT) propdelay_.$(OBJEXT) : \
 $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -221,7 +229,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -237,32 +245,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/chutest$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clktest$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/propdelay$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -271,7 +257,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -296,23 +286,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
@@ -322,11 +309,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -334,7 +321,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -348,22 +335,24 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-.PHONY: all all-am check check-am clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstPROGRAMS distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr tags uninstall uninstall-am
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-info-am
 
 #EXTRA_DIST = TAGS
 
-chutest: ../libntp/libntp.a
-
-clktest: ../libntp/libntp.a
+chutest$(EXEEXT): ../libntp/libntp.a
 
+clktest$(EXEEXT): ../libntp/libntp.a
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/config.h.in b/contrib/ntp/config.h.in
index aa38268..e292939 100644
--- a/contrib/ntp/config.h.in
+++ b/contrib/ntp/config.h.in
@@ -83,6 +83,9 @@
 /* Sun IRIG audio decoder */
 #undef CLOCK_IRIG
 
+/* JJY receiver */
+#undef CLOCK_JJY
+
 /* Rockwell Jupiter GPS clock */
 #undef CLOCK_JUPITER
 
@@ -403,6 +406,9 @@
 /* hstrerror()? */
 #undef DECL_HSTRERROR_0
 
+/* inet_ntoa()? */
+#undef DECL_INET_NTOA_0
+
 /* ioctl()? */
 #undef DECL_IOCTL_0
 
@@ -482,6 +488,12 @@
 /* Autokey? */
 #undef AUTOKEY
 
+/* TrueTime 560 IRIG-B decoder? */
+#undef CLOCK_TT560
+
+/* Zyfer GPStarplus */
+#undef CLOCK_ZYFER
+
 /* Define if you have the  header file. */
 #undef HAVE_ARPA_NAMESER_H
 
@@ -491,6 +503,9 @@
 /* Define if you have the  header file. */
 #undef HAVE_BSTRING_H
 
+/* Define if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
 /* Define if you have the `clock_settime' function. */
 #undef HAVE_CLOCK_SETTIME
 
@@ -518,9 +533,6 @@
 /* Define if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
-/* Define if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
 /* Define if you have the `getuid' function. */
 #undef HAVE_GETUID
 
@@ -575,6 +587,9 @@
 /* Define if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
+/* Define if you have the `syslog' library (-lsyslog). */
+#undef HAVE_LIBSYSLOG
+
 /* Define if you have the  header file. */
 #undef HAVE_MACHINE_INLINE_H
 
@@ -614,9 +629,15 @@
 /* Define if you have the  header file. */
 #undef HAVE_NETINET_IN_H
 
+/* Define if you have the  header file. */
+#undef HAVE_NETINET_IN_SYSTEM_H
+
 /* Define if you have the  header file. */
 #undef HAVE_NETINET_IN_SYSTM_H
 
+/* Define if you have the  header file. */
+#undef HAVE_NETINET_IP_H
+
 /* Define if you have the  header file. */
 #undef HAVE_NETINFO_NI_H
 
@@ -704,6 +725,9 @@
 /* Define if you have the `srand48' function. */
 #undef HAVE_SRAND48
 
+/* Define if you have the  header file. */
+#undef HAVE_STDINT_H
+
 /* Define if you have the  header file. */
 #undef HAVE_STDLIB_H
 
@@ -791,6 +815,9 @@
 /* Define if you have the  header file. */
 #undef HAVE_SYS_SELECT_H
 
+/* Define if you have the  header file. */
+#undef HAVE_SYS_SIGNAL_H
+
 /* Define if you have the  header file. */
 #undef HAVE_SYS_SIO_H
 
diff --git a/contrib/ntp/configure b/contrib/ntp/configure
index 913f331..b955d98 100755
--- a/contrib/ntp/configure
+++ b/contrib/ntp/configure
@@ -1,12 +1,25 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.50.
+# Generated by Autoconf 2.52.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -91,22 +104,16 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 
-# Avoid depending upon Character Ranges.
-ac_cr_az='abcdefghijklmnopqrstuvwxyz'
-ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-ac_cr_09='0123456789'
-ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
-
-# Sed expression to map a string onto a valid sh and CPP variable names.
-ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
-ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
-
 ac_unique_file="ntpd/ntp_refclock.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include 
-#include 
-#include 
+#if HAVE_SYS_TYPES_H
+# include 
+#endif
+#if HAVE_SYS_STAT_H
+# include 
+#endif
 #if STDC_HEADERS
 # include 
 # include 
@@ -120,13 +127,16 @@ ac_includes_default="\
 #  include 
 # endif
 # include 
-#else
-# if HAVE_STRINGS_H
-#  include 
-# endif
+#endif
+#if HAVE_STRINGS_H
+# include 
 #endif
 #if HAVE_INTTYPES_H
 # include 
+#else
+# if HAVE_STDINT_H
+#  include 
+# endif
 #endif
 #if HAVE_UNISTD_H
 # include 
@@ -222,7 +232,7 @@ do
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -231,7 +241,7 @@ do
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -413,7 +423,7 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -426,7 +436,7 @@ do
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -458,7 +468,7 @@ Try \`$0 --help' for more information." >&2
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
@@ -468,7 +478,7 @@ Try \`$0 --help' for more information." >&2
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
@@ -483,14 +493,23 @@ if test -n "$ac_prev"; then
 fi
 
 # Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir \
-              exec_prefix prefix
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
-    NONE ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
@@ -676,6 +695,7 @@ Optional Features:
   --enable-HEATH          s Heath GC-1000 WWV/WWVH receiver
   --enable-HPGPS          + HP 58503A GPS receiver
   --enable-IRIG           s Sun IRIG audio decoder
+  --enable-JJY            + JJY receiver
   --enable-LEITCH         + Leitch CSD 5300 Master Clock System Driver
   --enable-LOCAL-CLOCK    + local clock reference
   --enable-MSFEES         + EES M201 MSF receiver
@@ -693,9 +713,11 @@ Optional Features:
   --enable-PCF            + Conrad parallel port radio clock
   --enable-SPECTRACOM     + Spectracom 8170/Netclock/2 WWVB receiver
   --enable-TRUETIME       s Kinemetrics/TrueTime receivers
+  --enable-TT650          - TrueTime 560 IRIG-B decoder
   --enable-ULINK          + Ultralink WWVB receiver
   --enable-WWV            + WWV Audio receiver
   --enable-USNO           s USNO modem service
+  --enable-ZYFER          + Zyfer GPStarplus receiver
   --enable-parse-clocks   - include all suitable PARSE clocks:
   --enable-COMPUTIME      s Diem Computime Radio Clock
   --enable-DCF7000        s ELV/DCF7000 clock
@@ -797,7 +819,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.50.  Invocation command line was
+generated by GNU Autoconf 2.52.  Invocation command line was
 
   $ $0 $@
 
@@ -876,11 +898,11 @@ trap 'exit_status=$?
     *ac_space=\ *)
       sed -n \
         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } >&5
@@ -901,7 +923,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
@@ -921,7 +943,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:924: loading site script $ac_site_file" >&5
+    { echo "$as_me:946: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -932,7 +954,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:935: loading cache $cache_file" >&5
+    { echo "$as_me:957: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -940,14 +962,14 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:943: creating cache $cache_file" >&5
+  { echo "$as_me:965: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
-ac_suggest_removing_cache=false
+ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
@@ -956,31 +978,44 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:959: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:981: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:963: WARNING: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:985: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:969: WARNING: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:971: WARNING:   former value:  $ac_old_val" >&5
-echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:973: WARNING:   current value: $ac_new_val" >&5
-echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
-        ac_suggest_removing_cache=:
+        { echo "$as_me:991: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:993:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:995:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
       fi;;
   esac
+  # Pass precious variables to config.status.  It doesn't matter if
+  # we pass some twice (in addition to the command line arguments).
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+       ;;
+    esac
+  fi
 done
-if $ac_suggest_removing_cache; then
-  { echo "$as_me:980: WARNING: changes in the environment can compromise the build" >&5
-echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
-  { echo "$as_me:982: WARNING: consider removing $cache_file and starting over" >&5
-echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
+if $ac_cache_corrupted; then
+  { echo "$as_me:1014: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:1016: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -998,10 +1033,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1001: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1004: \$? = $ac_status" >&5
+  echo "$as_me:1039: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1027,7 +1062,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1030: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1065: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1037,11 +1072,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1040: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1075: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1044: checking build system type" >&5
+echo "$as_me:1079: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1050,23 +1085,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1053: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1088: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1057: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1092: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1062: result: $ac_cv_build" >&5
+echo "$as_me:1097: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1069: checking host system type" >&5
+echo "$as_me:1104: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1075,19 +1110,19 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1113: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1083: result: $ac_cv_host" >&5
+echo "$as_me:1118: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1090: checking target system type" >&5
+echo "$as_me:1125: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1096,12 +1131,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1099: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1134: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1104: result: $ac_cv_target" >&5
+echo "$as_me:1139: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1118,28 +1153,20 @@ cat >>confdefs.h <conftest.sed
-s,\\,\\\\,g; s,\$,$$,g
-EOF
-  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-  rm -f conftest.sed
-fi
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},;$program_transform_name"
+  program_transform_name="s,^,$program_prefix,;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
-
-# sed with no file args requires a program.
-test -z "$program_transform_name" && program_transform_name="s,x,x,"
+  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1153,7 +1180,7 @@ test -z "$program_transform_name" && program_transform_name="s,x,x,"
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1156: checking for a BSD compatible install" >&5
+echo "$as_me:1183: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1202,7 +1229,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1205: result: $INSTALL" >&5
+echo "$as_me:1232: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1213,7 +1240,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1216: checking whether build environment is sane" >&5
+echo "$as_me:1243: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1229,6 +1256,7 @@ if (
       # -L didn't work.
       set X `ls -t $srcdir/configure conftest.file`
    fi
+   rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
       && test "$*" != "X conftest.file $srcdir/configure"; then
 
@@ -1236,7 +1264,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1239: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1267: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -1249,24 +1277,26 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:1252: error: newly created file is older than distributed files!
+   { { echo "$as_me:1280: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -f conftest*
-echo "$as_me:1259: result: yes" >&5
+echo "$as_me:1286: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-test x"${MISSING+set}" = xset ||
-  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
-if eval "$MISSING --run :"; then
+if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
   am_backtick='`'
-  { echo "$as_me:1269: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+  { echo "$as_me:1299: WARNING: ${am_backtick}missing' script is too old or missing" >&5
 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
@@ -1274,7 +1304,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1277: checking for $ac_word" >&5
+echo "$as_me:1307: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1289,7 +1319,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1292: found $ac_dir/$ac_word" >&5
+echo "$as_me:1322: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1297,17 +1327,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1300: result: $AWK" >&5
+  echo "$as_me:1330: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1303: result: no" >&5
+  echo "$as_me:1333: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:1310: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1340: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1327,11 +1357,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1330: result: yes" >&5
+  echo "$as_me:1360: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1334: result: no" >&5
+  echo "$as_me:1364: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1341,43 +1371,40 @@ if test "${enable_dependency_tracking+set}" = set; then
   enableval="$enable_dependency_tracking"
 
 fi;
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
+  AMDEPBACKSLASH='\'
 fi
 
-if test -z "$AMDEP"; then
-  AMDEPBACKSLASH='\'
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
 else
-  AMDEPBACKSLASH=
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
 fi
 
-if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
   DEPDIR=.deps
-  # We redirect because .deps might already exist and be populated.
-  # In this situation we don't want to see an error.
-  rmdir .deps > /dev/null 2>&1
 else
+  # MS-DOS does not allow filenames that begin with a dot.
   DEPDIR=_deps
 fi
+rmdir .deps 2>/dev/null
 
 # test to see if srcdir already configured
 if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:1373: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1400: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 # Define the identity of the package.
 PACKAGE=ntp
-VERSION=4.1.0
+VERSION=4.1.1a
 
 cat >>confdefs.h <&5
+echo "$as_me:1462: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1477,7 +1474,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1480: found $ac_dir/$ac_word" >&5
+echo "$as_me:1477: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1485,10 +1482,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1488: result: $CC" >&5
+  echo "$as_me:1485: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1491: result: no" >&5
+  echo "$as_me:1488: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1497,7 +1494,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1500: checking for $ac_word" >&5
+echo "$as_me:1497: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1512,7 +1509,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1515: found $ac_dir/$ac_word" >&5
+echo "$as_me:1512: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1520,10 +1517,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1523: result: $ac_ct_CC" >&5
+  echo "$as_me:1520: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1526: result: no" >&5
+  echo "$as_me:1523: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1536,7 +1533,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1539: checking for $ac_word" >&5
+echo "$as_me:1536: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1551,7 +1548,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1554: found $ac_dir/$ac_word" >&5
+echo "$as_me:1551: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1559,10 +1556,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1562: result: $CC" >&5
+  echo "$as_me:1559: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1565: result: no" >&5
+  echo "$as_me:1562: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1571,7 +1568,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1574: checking for $ac_word" >&5
+echo "$as_me:1571: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1586,7 +1583,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1589: found $ac_dir/$ac_word" >&5
+echo "$as_me:1586: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1594,10 +1591,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1597: result: $ac_ct_CC" >&5
+  echo "$as_me:1594: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1600: result: no" >&5
+  echo "$as_me:1597: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1610,7 +1607,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1613: checking for $ac_word" >&5
+echo "$as_me:1610: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1630,7 +1627,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1633: found $ac_dir/$ac_word" >&5
+echo "$as_me:1630: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1652,10 +1649,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1655: result: $CC" >&5
+  echo "$as_me:1652: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1658: result: no" >&5
+  echo "$as_me:1655: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1666,7 +1663,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1669: checking for $ac_word" >&5
+echo "$as_me:1666: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1681,7 +1678,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1684: found $ac_dir/$ac_word" >&5
+echo "$as_me:1681: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1689,10 +1686,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1692: result: $CC" >&5
+  echo "$as_me:1689: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1695: result: no" >&5
+  echo "$as_me:1692: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1705,7 +1702,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1708: checking for $ac_word" >&5
+echo "$as_me:1705: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1720,7 +1717,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1723: found $ac_dir/$ac_word" >&5
+echo "$as_me:1720: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1728,10 +1725,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1731: result: $ac_ct_CC" >&5
+  echo "$as_me:1728: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1734: result: no" >&5
+  echo "$as_me:1731: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1743,12 +1740,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1746: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1743: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
+# Provide some information about the compiler.
+echo "$as_me:1748:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1751: \"$ac_compiler --version &5\"") >&5
+  (eval $ac_compiler --version &5) 2>&5
+  ac_status=$?
+  echo "$as_me:1754: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1756: \"$ac_compiler -v &5\"") >&5
+  (eval $ac_compiler -v &5) 2>&5
+  ac_status=$?
+  echo "$as_me:1759: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1761: \"$ac_compiler -V &5\"") >&5
+  (eval $ac_compiler -V &5) 2>&5
+  ac_status=$?
+  echo "$as_me:1764: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
 cat >conftest.$ac_ext <<_ACEOF
-#line 1751 "configure"
+#line 1768 "configure"
 #include "confdefs.h"
 
 int
@@ -1762,23 +1779,29 @@ _ACEOF
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compiler, and finding out an intuition
+# It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1767: checking for C compiler default output" >&5
+echo "$as_me:1784: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1770: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1787: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1773: \$? = $ac_status" >&5
+  echo "$as_me:1790: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
+                ls a.out conftest 2>/dev/null;
+                ls a.* conftest.* 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
     a.out ) # We found the default executable, but exeext='' is most
             # certainly right.
             break;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
           export ac_cv_exeext
           break;;
     * ) break;;
@@ -1787,34 +1810,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1790: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1813: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1796: result: $ac_file" >&5
+echo "$as_me:1819: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1801: checking whether the C compiler works" >&5
+echo "$as_me:1824: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1810: \$? = $ac_status" >&5
+  echo "$as_me:1833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1817: error: cannot run C compiled programs.
+	{ { echo "$as_me:1840: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1822,24 +1845,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1825: result: yes" >&5
+echo "$as_me:1848: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1832: checking whether we are cross compiling" >&5
+echo "$as_me:1855: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1834: result: $cross_compiling" >&5
+echo "$as_me:1857: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1837: checking for executable suffix" >&5
+echo "$as_me:1860: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1842: \$? = $ac_status" >&5
+  echo "$as_me:1865: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1855,25 +1878,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1858: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1881: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1864: result: $ac_cv_exeext" >&5
+echo "$as_me:1887: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1870: checking for object suffix" >&5
+echo "$as_me:1893: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1876 "configure"
+#line 1899 "configure"
 #include "confdefs.h"
 
 int
@@ -1885,10 +1908,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1891: \$? = $ac_status" >&5
+  echo "$as_me:1914: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1900,24 +1923,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1903: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1926: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1910: result: $ac_cv_objext" >&5
+echo "$as_me:1933: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1914: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1937: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1920 "configure"
+#line 1943 "configure"
 #include "confdefs.h"
 
 int
@@ -1932,16 +1955,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1938: \$? = $ac_status" >&5
+  echo "$as_me:1961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1944: \$? = $ac_status" >&5
+  echo "$as_me:1967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1953,19 +1976,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1956: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1979: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1962: checking whether $CC accepts -g" >&5
+echo "$as_me:1985: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1968 "configure"
+#line 1991 "configure"
 #include "confdefs.h"
 
 int
@@ -1977,16 +2000,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1983: \$? = $ac_status" >&5
+  echo "$as_me:2006: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1989: \$? = $ac_status" >&5
+  echo "$as_me:2012: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1996,7 +2019,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1999: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2022: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2023,16 +2046,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2029: \$? = $ac_status" >&5
+  echo "$as_me:2052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2035: \$? = $ac_status" >&5
+  echo "$as_me:2058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2044,7 +2067,7 @@ if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2047 "configure"
+#line 2070 "configure"
 #include "confdefs.h"
 #include 
 $ac_declaration
@@ -2057,16 +2080,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2083: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2063: \$? = $ac_status" >&5
+  echo "$as_me:2086: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2089: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2069: \$? = $ac_status" >&5
+  echo "$as_me:2092: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2076,7 +2099,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2079 "configure"
+#line 2102 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2088,16 +2111,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2091: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2094: \$? = $ac_status" >&5
+  echo "$as_me:2117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2100: \$? = $ac_status" >&5
+  echo "$as_me:2123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2106,9 +2129,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
-echo '#ifdef __cplusplus' >>confdefs.h
-echo $ac_declaration      >>confdefs.h
-echo '#endif'             >>confdefs.h
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
 
 else
   echo "$as_me: failed program was:" >&5
@@ -2121,260 +2147,77 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_config_commands="$ac_config_commands default-2"
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2131: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      # break 2 since there is a loop in there.
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2153 "configure"
-#include "confdefs.h"
-#include 
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2164: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2187 "configure"
-#include "confdefs.h"
-#include 
-_ACEOF
-if { (eval echo "$as_me:2191: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2197: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break 2
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:2234: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2244 "configure"
-#include "confdefs.h"
-#include 
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2255: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2278 "configure"
-#include "confdefs.h"
-#include 
-_ACEOF
-if { (eval echo "$as_me:2282: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:2288: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:2316: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_config_commands="$ac_config_commands default-1"
 
 am_make=${MAKE-make}
-# BSD make uses .include
 cat > confinc << 'END'
 doit:
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:2334: checking for style of include used by $am_make" >&5
+echo "$as_me:2158: checking for style of include used by $am_make" >&5
 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-_am_include='#'
-for am_inc in include .include; do
-   echo "$am_inc confinc" > confmf
-   if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
-      _am_include=$am_inc
-      break
+am__include='#'
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote='"'
+      _am_result=BSD
    fi
-done
+fi
 
-echo "$as_me:2345: result: $_am_include" >&5
-echo "${ECHO_T}$_am_include" >&6
+echo "$as_me:2185: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
-depcc="$CC"
-depcpp="$CPP"
+depcc="$CC"   am_compiler_list=
 
-echo "$as_me:2352: checking dependency style of $depcc" >&5
+echo "$as_me:2191: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$AMDEP"; then
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  mkdir confdir
+  mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
-  cp "$am_depcomp" confdir
-  cd confdir
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
 
   am_cv_CC_dependencies_compiler_type=none
-  for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
-    case "$depmode" in
+    case $depmode in
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -2389,28 +2232,29 @@ else
     # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
-    if depmode="$depmode" \
+    if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1; then
-      am_cv_CC_dependencies_compiler_type="$depmode"
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_CC_dependencies_compiler_type=$depmode
       break
     fi
   done
 
   cd ..
-  rm -rf confdir
+  rm -rf conftest.dir
 else
   am_cv_CC_dependencies_compiler_type=none
 fi
 
 fi
-echo "$as_me:2409: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2253: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-echo "$as_me:2413: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2257: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2418,7 +2262,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2421 "configure"
+#line 2265 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2467,16 +2311,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2473: \$? = $ac_status" >&5
+  echo "$as_me:2317: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2479: \$? = $ac_status" >&5
+  echo "$as_me:2323: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2493,10 +2337,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2496: result: none needed" >&5
+    echo "$as_me:2340: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2499: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2343: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2506,7 +2350,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2509: checking how to run the C preprocessor" >&5
+echo "$as_me:2353: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2519,7 +2363,6 @@ else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
-      # break 2 since there is a loop in there.
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -2528,18 +2371,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2531 "configure"
+#line 2374 "configure"
 #include "confdefs.h"
 #include 
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2536: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2379: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2542: \$? = $ac_status" >&5
+  echo "$as_me:2385: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2562,17 +2405,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2565 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:2569: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2412: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2575: \$? = $ac_status" >&5
+  echo "$as_me:2418: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2598,7 +2441,7 @@ done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
-  break 2
+  break
 fi
 
     done
@@ -2609,7 +2452,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2612: result: $CPP" >&5
+echo "$as_me:2455: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2619,18 +2462,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2622 "configure"
+#line 2465 "configure"
 #include "confdefs.h"
 #include 
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2627: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2470: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2633: \$? = $ac_status" >&5
+  echo "$as_me:2476: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2653,17 +2496,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2656 "configure"
+#line 2499 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:2660: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2503: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2666: \$? = $ac_status" >&5
+  echo "$as_me:2509: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2691,7 +2534,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2694: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2537: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2709,7 +2552,7 @@ case "$target" in
  i386-sequent-sysv4)
     case "$CC" in
      cc)
-	CFLAGS="$CFLAGS -Wc,+Abi-socket"
+	CFLAGS="$CFLAGS -Wc,+abi-socket"
 	;;
     esac
     ;;
@@ -2720,6 +2563,11 @@ case "$target" in
 	;;
     esac
     ;;
+ *-*-mpeix*)
+    CPPFLAGS="$CPPFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB"
+    LDFLAGS="$LDFLAGS -L/SYSLOG/PUB"
+    LIBS="$LIBS -lcurses"
+    ;;
 esac
 
 case "$host" in
@@ -2729,7 +2577,7 @@ case "$host" in
      *-*-vxworks*)
 	# Quick and dirty sanity check
 	case "$VX_KERNEL" in
-	 '') { { echo "$as_me:2732: error: Please follow the directions in html/vxworks.html!" >&5
+	 '') { { echo "$as_me:2580: error: Please follow the directions in html/vxworks.html!" >&5
 echo "$as_me: error: Please follow the directions in html/vxworks.html!" >&2;}
    { (exit 1); exit 1; }; }
 	    ;;
@@ -2744,7 +2592,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2747: checking for $ac_word" >&5
+echo "$as_me:2595: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2759,7 +2607,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:2762: found $ac_dir/$ac_word" >&5
+echo "$as_me:2610: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2767,17 +2615,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2770: result: $AWK" >&5
+  echo "$as_me:2618: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2773: result: no" >&5
+  echo "$as_me:2621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:2780: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2628: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2797,11 +2645,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2800: result: yes" >&5
+  echo "$as_me:2648: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2804: result: no" >&5
+  echo "$as_me:2652: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2822,7 +2670,7 @@ case "$GCC" in
     # CFLAGS="$CFLAGS -Wtraditional"
     # CFLAGS="$CFLAGS -Wwrite-strings"
 
-    echo "$as_me:2825: checking whether ${CC-cc} -pipe works" >&5
+    echo "$as_me:2673: checking whether ${CC-cc} -pipe works" >&5
 echo $ECHO_N "checking whether ${CC-cc} -pipe works... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2836,7 +2684,7 @@ else
     rm -f conftest*
 
 fi
-echo "$as_me:2839: result: $ac_cv_prog_cc_pipe" >&5
+echo "$as_me:2687: result: $ac_cv_prog_cc_pipe" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_pipe" >&6
 
     case "$ac_cv_prog_cc_pipe" in
@@ -2886,7 +2734,7 @@ case "$ac_busted_vpath_in_make$srcdir" in
  yes.) ;;
  *) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | sed -e 's/GNU Make version \(1-9.]*\).*/\1/' -e q`" in
      '')
-	{ { echo "$as_me:2889: error: building outside of the main directory requires GNU make" >&5
+	{ { echo "$as_me:2737: error: building outside of the main directory requires GNU make" >&5
 echo "$as_me: error: building outside of the main directory requires GNU make" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -2895,26 +2743,26 @@ echo "$as_me: error: building outside of the main directory requires GNU make" >
     ;;
 esac
 
-echo "$as_me:2898: checking whether ln -s works" >&5
+echo "$as_me:2746: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2902: result: yes" >&5
+  echo "$as_me:2750: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2905: result: no, using $LN_S" >&5
+  echo "$as_me:2753: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:2910: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2758: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 2917 "configure"
+#line 2765 "configure"
 #include "confdefs.h"
 #include 
 Autoconf TIOCGETP
@@ -2929,7 +2777,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 2932 "configure"
+#line 2780 "configure"
 #include "confdefs.h"
 #include 
 Autoconf TCGETA
@@ -2942,17 +2790,17 @@ rm -f conftest*
 
   fi
 fi
-echo "$as_me:2945: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2793: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:2952: checking for AIX" >&5
+echo "$as_me:2800: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2955 "configure"
+#line 2803 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2961,35 +2809,35 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2964: result: yes" >&5
+  echo "$as_me:2812: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2971: result: no" >&5
+  echo "$as_me:2819: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2976: checking for minix/config.h" >&5
+echo "$as_me:2824: checking for minix/config.h" >&5
 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2982 "configure"
+#line 2830 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:2986: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2834: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2992: \$? = $ac_status" >&5
+  echo "$as_me:2840: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3008,7 +2856,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3011: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2859: result: $ac_cv_header_minix_config_h" >&5
 echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
@@ -3032,12 +2880,12 @@ EOF
 
 fi
 
-echo "$as_me:3035: checking for POSIXized ISC" >&5
+echo "$as_me:2883: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:3040: result: yes" >&5
+  echo "$as_me:2888: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -3051,7 +2899,7 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:3054: result: no" >&5
+  echo "$as_me:2902: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
@@ -3059,7 +2907,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3062: checking for $ac_word" >&5
+echo "$as_me:2910: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3074,7 +2922,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3077: found $ac_dir/$ac_word" >&5
+echo "$as_me:2925: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3082,10 +2930,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3085: result: $RANLIB" >&5
+  echo "$as_me:2933: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3088: result: no" >&5
+  echo "$as_me:2936: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3094,7 +2942,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3097: checking for $ac_word" >&5
+echo "$as_me:2945: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3109,7 +2957,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3112: found $ac_dir/$ac_word" >&5
+echo "$as_me:2960: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3118,10 +2966,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3121: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2969: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3124: result: no" >&5
+  echo "$as_me:2972: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3132,7 +2980,7 @@ fi
 
 # Extract the first word of "sh", so it can be a program name with args.
 set dummy sh; ac_word=$2
-echo "$as_me:3135: checking for $ac_word" >&5
+echo "$as_me:2983: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PATH_SH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3149,7 +2997,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PATH_SH="$ac_dir/$ac_word"
-   echo "$as_me:3152: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3000: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3160,16 +3008,16 @@ fi
 PATH_SH=$ac_cv_path_PATH_SH
 
 if test -n "$PATH_SH"; then
-  echo "$as_me:3163: result: $PATH_SH" >&5
+  echo "$as_me:3011: result: $PATH_SH" >&5
 echo "${ECHO_T}$PATH_SH" >&6
 else
-  echo "$as_me:3166: result: no" >&5
+  echo "$as_me:3014: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:3172: checking for $ac_word" >&5
+echo "$as_me:3020: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PATH_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3186,7 +3034,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PATH_PERL="$ac_dir/$ac_word"
-   echo "$as_me:3189: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3037: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3197,15 +3045,15 @@ fi
 PATH_PERL=$ac_cv_path_PATH_PERL
 
 if test -n "$PATH_PERL"; then
-  echo "$as_me:3200: result: $PATH_PERL" >&5
+  echo "$as_me:3048: result: $PATH_PERL" >&5
 echo "${ECHO_T}$PATH_PERL" >&6
 else
-  echo "$as_me:3203: result: no" >&5
+  echo "$as_me:3051: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
  cat >conftest.$ac_ext <<_ACEOF
-#line 3208 "configure"
+#line 3056 "configure"
 #include "confdefs.h"
 #define ACAT(a,b)a ## b
 ACAT(Cir,cus)
@@ -3219,7 +3067,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3222 "configure"
+#line 3070 "configure"
 #include "confdefs.h"
 #define RCAT(a,b)a/**/b
 RCAT(Rei,ser)
@@ -3232,7 +3080,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
 else
-  { { echo "$as_me:3235: error: How do we create an unsigned long constant?" >&5
+  { { echo "$as_me:3083: error: How do we create an unsigned long constant?" >&5
 echo "$as_me: error: How do we create an unsigned long constant?" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3259,7 +3107,7 @@ esac
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:3262: checking for a BSD compatible install" >&5
+echo "$as_me:3110: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -3308,7 +3156,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3311: result: $INSTALL" >&5
+echo "$as_me:3159: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3322,7 +3170,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 case "$target" in
  *-pc-cygwin*)
 
-echo "$as_me:3325: checking for main in -ladvapi32" >&5
+echo "$as_me:3173: checking for main in -ladvapi32" >&5
 echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6
 if test "${ac_cv_lib_advapi32_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3330,7 +3178,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ladvapi32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3333 "configure"
+#line 3181 "configure"
 #include "confdefs.h"
 
 int
@@ -3342,16 +3190,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3348: \$? = $ac_status" >&5
+  echo "$as_me:3196: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3354: \$? = $ac_status" >&5
+  echo "$as_me:3202: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_advapi32_main=yes
 else
@@ -3362,7 +3210,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3365: result: $ac_cv_lib_advapi32_main" >&5
+echo "$as_me:3213: result: $ac_cv_lib_advapi32_main" >&5
 echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
 if test $ac_cv_lib_advapi32_main = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3227: checking for nlist in -lelf" >&5
 echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_nlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3384,7 +3232,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3387 "configure"
+#line 3235 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3403,16 +3251,16 @@ nlist ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3409: \$? = $ac_status" >&5
+  echo "$as_me:3257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3415: \$? = $ac_status" >&5
+  echo "$as_me:3263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_nlist=yes
 else
@@ -3423,7 +3271,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3426: result: $ac_cv_lib_elf_nlist" >&5
+echo "$as_me:3274: result: $ac_cv_lib_elf_nlist" >&5
 echo "${ECHO_T}$ac_cv_lib_elf_nlist" >&6
 if test $ac_cv_lib_elf_nlist = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3285: checking for main in -lkvm" >&5
 echo $ECHO_N "checking for main in -lkvm... $ECHO_C" >&6
 if test "${ac_cv_lib_kvm_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3442,7 +3290,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3445 "configure"
+#line 3293 "configure"
 #include "confdefs.h"
 
 int
@@ -3454,16 +3302,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3460: \$? = $ac_status" >&5
+  echo "$as_me:3308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3466: \$? = $ac_status" >&5
+  echo "$as_me:3314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_kvm_main=yes
 else
@@ -3474,7 +3322,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3477: result: $ac_cv_lib_kvm_main" >&5
+echo "$as_me:3325: result: $ac_cv_lib_kvm_main" >&5
 echo "${ECHO_T}$ac_cv_lib_kvm_main" >&6
 if test $ac_cv_lib_kvm_main = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3336: checking for nlist in -lld" >&5
 echo $ECHO_N "checking for nlist in -lld... $ECHO_C" >&6
 if test "${ac_cv_lib_ld_nlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3493,7 +3341,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3496 "configure"
+#line 3344 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3512,16 +3360,16 @@ nlist ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3518: \$? = $ac_status" >&5
+  echo "$as_me:3366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3524: \$? = $ac_status" >&5
+  echo "$as_me:3372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ld_nlist=yes
 else
@@ -3532,7 +3380,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3535: result: $ac_cv_lib_ld_nlist" >&5
+echo "$as_me:3383: result: $ac_cv_lib_ld_nlist" >&5
 echo "${ECHO_T}$ac_cv_lib_ld_nlist" >&6
 if test $ac_cv_lib_ld_nlist = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3394: checking for nlist in -lmld" >&5
 echo $ECHO_N "checking for nlist in -lmld... $ECHO_C" >&6
 if test "${ac_cv_lib_mld_nlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3551,7 +3399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3554 "configure"
+#line 3402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3570,16 +3418,16 @@ nlist ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3576: \$? = $ac_status" >&5
+  echo "$as_me:3424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3582: \$? = $ac_status" >&5
+  echo "$as_me:3430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mld_nlist=yes
 else
@@ -3590,7 +3438,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3593: result: $ac_cv_lib_mld_nlist" >&5
+echo "$as_me:3441: result: $ac_cv_lib_mld_nlist" >&5
 echo "${ECHO_T}$ac_cv_lib_mld_nlist" >&6
 if test $ac_cv_lib_mld_nlist = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3452: checking for gethostent" >&5
 echo $ECHO_N "checking for gethostent... $ECHO_C" >&6
 if test "${ac_cv_func_gethostent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3610 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostent (); below.  */
@@ -3638,16 +3486,16 @@ f = gethostent;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3644: \$? = $ac_status" >&5
+  echo "$as_me:3492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3650: \$? = $ac_status" >&5
+  echo "$as_me:3498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostent=yes
 else
@@ -3657,13 +3505,13 @@ ac_cv_func_gethostent=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3660: result: $ac_cv_func_gethostent" >&5
+echo "$as_me:3508: result: $ac_cv_func_gethostent" >&5
 echo "${ECHO_T}$ac_cv_func_gethostent" >&6
 if test $ac_cv_func_gethostent = yes; then
   :
 else
 
-echo "$as_me:3666: checking for gethostent in -lnsl" >&5
+echo "$as_me:3514: checking for gethostent in -lnsl" >&5
 echo $ECHO_N "checking for gethostent in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3671,7 +3519,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl -lsocket $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3674 "configure"
+#line 3522 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3690,16 +3538,16 @@ gethostent ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3696: \$? = $ac_status" >&5
+  echo "$as_me:3544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3702: \$? = $ac_status" >&5
+  echo "$as_me:3550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostent=yes
 else
@@ -3710,7 +3558,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3713: result: $ac_cv_lib_nsl_gethostent" >&5
+echo "$as_me:3561: result: $ac_cv_lib_nsl_gethostent" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostent" >&6
 if test $ac_cv_lib_nsl_gethostent = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3574: checking for openlog" >&5
 echo $ECHO_N "checking for openlog... $ECHO_C" >&6
 if test "${ac_cv_func_openlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3732 "configure"
+#line 3580 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openlog (); below.  */
@@ -3760,16 +3608,16 @@ f = openlog;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3766: \$? = $ac_status" >&5
+  echo "$as_me:3614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3772: \$? = $ac_status" >&5
+  echo "$as_me:3620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_openlog=yes
 else
@@ -3779,13 +3627,13 @@ ac_cv_func_openlog=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3782: result: $ac_cv_func_openlog" >&5
+echo "$as_me:3630: result: $ac_cv_func_openlog" >&5
 echo "${ECHO_T}$ac_cv_func_openlog" >&6
 if test $ac_cv_func_openlog = yes; then
   :
 else
 
-echo "$as_me:3788: checking for openlog in -lgen" >&5
+echo "$as_me:3636: checking for openlog in -lgen" >&5
 echo $ECHO_N "checking for openlog in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_openlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3793,7 +3641,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3796 "configure"
+#line 3644 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3812,16 +3660,16 @@ openlog ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3818: \$? = $ac_status" >&5
+  echo "$as_me:3666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3824: \$? = $ac_status" >&5
+  echo "$as_me:3672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gen_openlog=yes
 else
@@ -3832,7 +3680,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3835: result: $ac_cv_lib_gen_openlog" >&5
+echo "$as_me:3683: result: $ac_cv_lib_gen_openlog" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_openlog" >&6
 if test $ac_cv_lib_gen_openlog = yes; then
   cat >>confdefs.h <&5
+echo $ECHO_N "checking for openlog in -lsyslog... $ECHO_C" >&6
+if test "${ac_cv_lib_syslog_openlog+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsyslog -lsocket $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 3702 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char openlog ();
+int
+main ()
+{
+openlog ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:3721: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3724: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:3727: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3730: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_syslog_openlog=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_syslog_openlog=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3741: result: $ac_cv_lib_syslog_openlog" >&5
+echo "${ECHO_T}$ac_cv_lib_syslog_openlog" >&6
+if test $ac_cv_lib_syslog_openlog = yes; then
+  cat >>confdefs.h <&5
+echo "$as_me:3756: checking for readline in -lreadline" >&5
 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3853,7 +3761,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3856 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3872,16 +3780,16 @@ readline ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3878: \$? = $ac_status" >&5
+  echo "$as_me:3786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3884: \$? = $ac_status" >&5
+  echo "$as_me:3792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_readline_readline=yes
 else
@@ -3892,7 +3800,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3895: result: $ac_cv_lib_readline_readline" >&5
+echo "$as_me:3803: result: $ac_cv_lib_readline_readline" >&5
 echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
 if test $ac_cv_lib_readline_readline = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3818: checking for sched_setscheduler in -lrt" >&5
 echo $ECHO_N "checking for sched_setscheduler in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_sched_setscheduler+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3915,7 +3823,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3918 "configure"
+#line 3826 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3934,16 +3842,16 @@ sched_setscheduler ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3940: \$? = $ac_status" >&5
+  echo "$as_me:3848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3946: \$? = $ac_status" >&5
+  echo "$as_me:3854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_rt_sched_setscheduler=yes
 else
@@ -3954,7 +3862,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3957: result: $ac_cv_lib_rt_sched_setscheduler" >&5
+echo "$as_me:3865: result: $ac_cv_lib_rt_sched_setscheduler" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_sched_setscheduler" >&6
 if test $ac_cv_lib_rt_sched_setscheduler = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3876: checking for sched_setscheduler in -lposix4" >&5
 echo $ECHO_N "checking for sched_setscheduler in -lposix4... $ECHO_C" >&6
 if test "${ac_cv_lib_posix4_sched_setscheduler+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3973,7 +3881,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3976 "configure"
+#line 3884 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3992,16 +3900,16 @@ sched_setscheduler ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3998: \$? = $ac_status" >&5
+  echo "$as_me:3906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4004: \$? = $ac_status" >&5
+  echo "$as_me:3912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix4_sched_setscheduler=yes
 else
@@ -4012,7 +3920,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4015: result: $ac_cv_lib_posix4_sched_setscheduler" >&5
+echo "$as_me:3923: result: $ac_cv_lib_posix4_sched_setscheduler" >&5
 echo "${ECHO_T}$ac_cv_lib_posix4_sched_setscheduler" >&6
 if test $ac_cv_lib_posix4_sched_setscheduler = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:3939: checking for setsockopt" >&5
 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_func_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4037 "configure"
+#line 3945 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setsockopt (); below.  */
@@ -4065,16 +3973,16 @@ f = setsockopt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4071: \$? = $ac_status" >&5
+  echo "$as_me:3979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4077: \$? = $ac_status" >&5
+  echo "$as_me:3985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setsockopt=yes
 else
@@ -4084,13 +3992,13 @@ ac_cv_func_setsockopt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4087: result: $ac_cv_func_setsockopt" >&5
+echo "$as_me:3995: result: $ac_cv_func_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
 if test $ac_cv_func_setsockopt = yes; then
   :
 else
 
-echo "$as_me:4093: checking for setsockopt in -lsocket" >&5
+echo "$as_me:4001: checking for setsockopt in -lsocket" >&5
 echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4098,7 +4006,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4101 "configure"
+#line 4009 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4117,16 +4025,16 @@ setsockopt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4123: \$? = $ac_status" >&5
+  echo "$as_me:4031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4129: \$? = $ac_status" >&5
+  echo "$as_me:4037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_setsockopt=yes
 else
@@ -4137,7 +4045,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4140: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "$as_me:4048: result: $ac_cv_lib_socket_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
 if test $ac_cv_lib_socket_setsockopt = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:4061: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4159 "configure"
+#line 4067 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -4164,13 +4072,13 @@ else
 #include 
 
 _ACEOF
-if { (eval echo "$as_me:4167: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4075: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4173: \$? = $ac_status" >&5
+  echo "$as_me:4081: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4192,7 +4100,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4195 "configure"
+#line 4103 "configure"
 #include "confdefs.h"
 #include 
 
@@ -4210,7 +4118,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4213 "configure"
+#line 4121 "configure"
 #include "confdefs.h"
 #include 
 
@@ -4231,7 +4139,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4234 "configure"
+#line 4142 "configure"
 #include "confdefs.h"
 #include 
 #if ((' ' & 0x0FF) == 0x020)
@@ -4257,15 +4165,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4263: \$? = $ac_status" >&5
+  echo "$as_me:4171: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4268: \$? = $ac_status" >&5
+  echo "$as_me:4176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -4274,11 +4182,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4281: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4189: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4290,24 +4198,24 @@ fi
 
 for ac_header in bstring.h errno.h fcntl.h ieeefp.h math.h memory.h netdb.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4294: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4202: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4300 "configure"
+#line 4208 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4304: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4212: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4310: \$? = $ac_status" >&5
+  echo "$as_me:4218: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4318,19 +4226,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4329: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4237: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4250: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4348 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4352: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4260: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4358: \$? = $ac_status" >&5
+  echo "$as_me:4266: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4366,19 +4274,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4377: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4285: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4298: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4304 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:4308: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:4314: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:4333: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4396 "configure"
+#line 4352 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4400: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4356: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4406: \$? = $ac_status" >&5
+  echo "$as_me:4362: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4414,44 +4370,44 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4425: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4381: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4394: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4444 "configure"
+#line 4400 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4448: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4404: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4454: \$? = $ac_status" >&5
+  echo "$as_me:4410: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4462,19 +4418,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4473: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4429: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4442: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4492 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4496: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4452: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4502: \$? = $ac_status" >&5
+  echo "$as_me:4458: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4510,19 +4466,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4521: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4477: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <>confdefs.h <<\EOF
 #define HAVE_NETINFO 1
@@ -4533,24 +4489,24 @@ done
 
 for ac_header in sun/audioio.h sys/audioio.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4537: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4493: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4543 "configure"
+#line 4499 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4547: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4503: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4553: \$? = $ac_status" >&5
+  echo "$as_me:4509: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4561,19 +4517,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4572: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4528: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4541: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4591 "configure"
+#line 4547 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4595: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4551: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4601: \$? = $ac_status" >&5
+  echo "$as_me:4557: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4609,19 +4565,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4620: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4576: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4592: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4642 "configure"
+#line 4598 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4646: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4602: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4652: \$? = $ac_status" >&5
+  echo "$as_me:4608: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4660,19 +4616,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4671: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4627: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4643: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4693 "configure"
+#line 4649 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4697: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4653: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4703: \$? = $ac_status" >&5
+  echo "$as_me:4659: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4711,19 +4667,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4722: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4678: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4691: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4741 "configure"
+#line 4697 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4745: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4701: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4751: \$? = $ac_status" >&5
+  echo "$as_me:4707: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4759,19 +4715,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4770: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4726: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4742: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4792 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4796: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4752: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4802: \$? = $ac_status" >&5
+  echo "$as_me:4758: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4810,19 +4766,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4821: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4777: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4793: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4843 "configure"
+#line 4799 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4847: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4803: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4853: \$? = $ac_status" >&5
+  echo "$as_me:4809: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4861,19 +4817,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4872: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4828: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4841: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4891 "configure"
+#line 4847 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4895: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4851: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4901: \$? = $ac_status" >&5
+  echo "$as_me:4857: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4909,19 +4865,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4920: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4876: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4889: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4939 "configure"
+#line 4895 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4943: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4899: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4949: \$? = $ac_status" >&5
+  echo "$as_me:4905: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4957,26 +4913,26 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4968: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4924: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <conftest.$ac_ext <<_ACEOF
-#line 4979 "configure"
+#line 4935 "configure"
 #include "confdefs.h"
 #include 
 #ifdef PPS_API_VERS_1
@@ -4989,24 +4945,24 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 
 for ac_header in sys/timepps.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4993: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:4949: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4999 "configure"
+#line 4955 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5003: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4959: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5009: \$? = $ac_status" >&5
+  echo "$as_me:4965: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5017,19 +4973,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5028: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:4984: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5000: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5050 "configure"
+#line 5006 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5054: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5010: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5060: \$? = $ac_status" >&5
+  echo "$as_me:5016: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5068,31 +5024,31 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5079: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5035: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:5045: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5095 "configure"
+#line 5051 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -5101,22 +5057,23 @@ else
 int
 main ()
 {
-struct tm *tp;
+if ((struct tm *) 0)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5113: \$? = $ac_status" >&5
+  echo "$as_me:5070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5119: \$? = $ac_status" >&5
+  echo "$as_me:5076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -5126,7 +5083,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5129: result: $ac_cv_header_time" >&5
+echo "$as_me:5086: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5141,24 +5098,24 @@ case "$target" in
 
 for ac_header in /sys/sync/queue.h /sys/sync/sema.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5145: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5102: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5151 "configure"
+#line 5108 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5155: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5112: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5161: \$? = $ac_status" >&5
+  echo "$as_me:5118: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5169,19 +5126,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5180: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5137: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5153: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5202 "configure"
+#line 5159 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5206: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5163: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5212: \$? = $ac_status" >&5
+  echo "$as_me:5169: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5220,19 +5177,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5231: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5188: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:5201: checking for nlist.h" >&5
 echo $ECHO_N "checking for nlist.h... $ECHO_C" >&6
 if test "${ac_cv_header_nlist_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5250 "configure"
+#line 5207 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:5254: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5211: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5260: \$? = $ac_status" >&5
+  echo "$as_me:5217: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5276,20 +5233,20 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5279: result: $ac_cv_header_nlist_h" >&5
+echo "$as_me:5236: result: $ac_cv_header_nlist_h" >&5
 echo "${ECHO_T}$ac_cv_header_nlist_h" >&6
 if test $ac_cv_header_nlist_h = yes; then
   cat >>confdefs.h <<\EOF
 #define NLIST_STRUCT 1
 EOF
 
-echo "$as_me:5286: checking for n_un in struct nlist" >&5
+echo "$as_me:5243: checking for n_un in struct nlist" >&5
 echo $ECHO_N "checking for n_un in struct nlist... $ECHO_C" >&6
 if test "${ac_cv_struct_nlist_n_un+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5292 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -5301,16 +5258,16 @@ struct nlist n; n.n_un.n_name = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5307: \$? = $ac_status" >&5
+  echo "$as_me:5264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5313: \$? = $ac_status" >&5
+  echo "$as_me:5270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_nlist_n_un=yes
 else
@@ -5320,7 +5277,7 @@ ac_cv_struct_nlist_n_un=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5323: result: $ac_cv_struct_nlist_n_un" >&5
+echo "$as_me:5280: result: $ac_cv_struct_nlist_n_un" >&5
 echo "${ECHO_T}$ac_cv_struct_nlist_n_un" >&6
 if test $ac_cv_struct_nlist_n_un = yes; then
   cat >>confdefs.h <<\EOF
@@ -5331,13 +5288,13 @@ fi
 
 fi
 
-echo "$as_me:5334: checking for basic volatile support" >&5
+echo "$as_me:5291: checking for basic volatile support" >&5
 echo $ECHO_N "checking for basic volatile support... $ECHO_C" >&6
 if test "${ac_cv_c_volatile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5340 "configure"
+#line 5297 "configure"
 #include "confdefs.h"
 
 int
@@ -5350,16 +5307,16 @@ volatile int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5356: \$? = $ac_status" >&5
+  echo "$as_me:5313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5362: \$? = $ac_status" >&5
+  echo "$as_me:5319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_volatile=yes
 else
@@ -5370,7 +5327,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5373: result: $ac_cv_c_volatile" >&5
+echo "$as_me:5330: result: $ac_cv_c_volatile" >&5
 echo "${ECHO_T}$ac_cv_c_volatile" >&6
 case "$ac_cv_c_volatile" in
  yes)
@@ -5388,7 +5345,7 @@ case "$target" in
     ;;
  *)
 
-echo "$as_me:5391: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:5348: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${am_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5406,7 +5363,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<_ACEOF
-#line 5409 "configure"
+#line 5366 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -5448,16 +5405,16 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5454: \$? = $ac_status" >&5
+  echo "$as_me:5411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5460: \$? = $ac_status" >&5
+  echo "$as_me:5417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -5471,10 +5428,10 @@ CC="$ac_save_CC"
 fi
 
 if test -z "$am_cv_prog_cc_stdc"; then
-  echo "$as_me:5474: result: none needed" >&5
+  echo "$as_me:5431: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6
 else
-  echo "$as_me:5477: result: $am_cv_prog_cc_stdc" >&5
+  echo "$as_me:5434: result: $am_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
 fi
 case "x$am_cv_prog_cc_stdc" in
@@ -5482,10 +5439,10 @@ case "x$am_cv_prog_cc_stdc" in
   *) CC="$CC $am_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:5485: checking for function prototypes" >&5
+echo "$as_me:5442: checking for function prototypes" >&5
 echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
-  echo "$as_me:5488: result: yes" >&5
+  echo "$as_me:5445: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -5494,18 +5451,18 @@ EOF
 
   U= ANSI2KNR=
 else
-  echo "$as_me:5497: result: no" >&5
+  echo "$as_me:5454: result: no" >&5
 echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
 fi
 # Ensure some checks needed by ansi2knr itself.
-echo "$as_me:5502: checking for ANSI C header files" >&5
+echo "$as_me:5459: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5508 "configure"
+#line 5465 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -5513,13 +5470,13 @@ else
 #include 
 
 _ACEOF
-if { (eval echo "$as_me:5516: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5473: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5522: \$? = $ac_status" >&5
+  echo "$as_me:5479: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5541,7 +5498,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5544 "configure"
+#line 5501 "configure"
 #include "confdefs.h"
 #include 
 
@@ -5559,7 +5516,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5562 "configure"
+#line 5519 "configure"
 #include "confdefs.h"
 #include 
 
@@ -5580,7 +5537,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5583 "configure"
+#line 5540 "configure"
 #include "confdefs.h"
 #include 
 #if ((' ' & 0x0FF) == 0x020)
@@ -5606,15 +5563,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5612: \$? = $ac_status" >&5
+  echo "$as_me:5569: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5617: \$? = $ac_status" >&5
+  echo "$as_me:5574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5623,11 +5580,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5630: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5587: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5639,24 +5596,24 @@ fi
 
 for ac_header in string.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5643: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5600: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5649 "configure"
+#line 5606 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5653: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5610: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5659: \$? = $ac_status" >&5
+  echo "$as_me:5616: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5667,19 +5624,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5678: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:5635: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:5647: checking if C compiler permits function prototypes" >&5
 echo $ECHO_N "checking if C compiler permits function prototypes... $ECHO_C" >&6
 if test "${ac_cv_have_prototypes+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5696 "configure"
+#line 5653 "configure"
 #include "confdefs.h"
 
 extern int foo (short);
@@ -5708,16 +5665,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5714: \$? = $ac_status" >&5
+  echo "$as_me:5671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5720: \$? = $ac_status" >&5
+  echo "$as_me:5677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_prototypes=yes
 else
@@ -5728,7 +5685,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5731: result: $ac_cv_have_prototypes" >&5
+echo "$as_me:5688: result: $ac_cv_have_prototypes" >&5
 echo "${ECHO_T}$ac_cv_have_prototypes" >&6
 if test "$ac_cv_have_prototypes" = yes; then
   cat >>confdefs.h <<\EOF
@@ -5737,13 +5694,13 @@ EOF
 
 fi
 
-echo "$as_me:5740: checking for an ANSI C-conforming const" >&5
+echo "$as_me:5697: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5746 "configure"
+#line 5703 "configure"
 #include "confdefs.h"
 
 int
@@ -5801,16 +5758,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5807: \$? = $ac_status" >&5
+  echo "$as_me:5764: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5813: \$? = $ac_status" >&5
+  echo "$as_me:5770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -5820,7 +5777,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5823: result: $ac_cv_c_const" >&5
+echo "$as_me:5780: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -5832,7 +5789,7 @@ fi
 
 case "$host" in
  $target)
-    echo "$as_me:5835: checking whether byte ordering is bigendian" >&5
+    echo "$as_me:5792: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5840,7 +5797,7 @@ else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5843 "configure"
+#line 5800 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -5857,20 +5814,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5863: \$? = $ac_status" >&5
+  echo "$as_me:5820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5869: \$? = $ac_status" >&5
+  echo "$as_me:5826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 5873 "configure"
+#line 5830 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -5887,16 +5844,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5893: \$? = $ac_status" >&5
+  echo "$as_me:5850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5899: \$? = $ac_status" >&5
+  echo "$as_me:5856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -5912,12 +5869,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5915: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5872: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5920 "configure"
+#line 5877 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -5933,15 +5890,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5939: \$? = $ac_status" >&5
+  echo "$as_me:5896: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5944: \$? = $ac_status" >&5
+  echo "$as_me:5901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -5950,11 +5907,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_c_bigendian=yes
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5957: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:5914: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -5975,20 +5932,20 @@ fi
 EOF
 
 	;;
-     *) { { echo "$as_me:5978: error: Cross-compiling needs explicit byte order" >&5
+     *) { { echo "$as_me:5935: error: Cross-compiling needs explicit byte order" >&5
 echo "$as_me: error: Cross-compiling needs explicit byte order" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
     ;;
 esac
-echo "$as_me:5985: checking return type of signal handlers" >&5
+echo "$as_me:5942: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5991 "configure"
+#line 5948 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -6010,16 +5967,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6016: \$? = $ac_status" >&5
+  echo "$as_me:5973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6022: \$? = $ac_status" >&5
+  echo "$as_me:5979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -6029,68 +5986,67 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6032: result: $ac_cv_type_signal" >&5
+echo "$as_me:5989: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:6002: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6048 "configure"
+#line 6008 "configure"
 #include "confdefs.h"
+$ac_includes_default
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6052: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6014: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:6058: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  echo "$as_me:6017: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6020: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6023: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6077: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:6033: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:6043: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6093 "configure"
+#line 6049 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6105,16 +6061,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6111: \$? = $ac_status" >&5
+  echo "$as_me:6067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6117: \$? = $ac_status" >&5
+  echo "$as_me:6073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -6124,7 +6080,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6127: result: $ac_cv_type_off_t" >&5
+echo "$as_me:6083: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -6136,13 +6092,13 @@ EOF
 
 fi
 
-echo "$as_me:6139: checking for size_t" >&5
+echo "$as_me:6095: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6145 "configure"
+#line 6101 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6157,16 +6113,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6163: \$? = $ac_status" >&5
+  echo "$as_me:6119: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6169: \$? = $ac_status" >&5
+  echo "$as_me:6125: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -6176,7 +6132,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6179: result: $ac_cv_type_size_t" >&5
+echo "$as_me:6135: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -6188,13 +6144,13 @@ EOF
 
 fi
 
-echo "$as_me:6191: checking for time_t" >&5
+echo "$as_me:6147: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6197 "configure"
+#line 6153 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6209,16 +6165,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6215: \$? = $ac_status" >&5
+  echo "$as_me:6171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6221: \$? = $ac_status" >&5
+  echo "$as_me:6177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -6228,7 +6184,7 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6231: result: $ac_cv_type_time_t" >&5
+echo "$as_me:6187: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 if test $ac_cv_type_time_t = yes; then
   :
@@ -6240,13 +6196,13 @@ EOF
 
 fi
 
-echo "$as_me:6243: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:6199: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6249 "configure"
+#line 6205 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -6260,16 +6216,16 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6266: \$? = $ac_status" >&5
+  echo "$as_me:6222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6272: \$? = $ac_status" >&5
+  echo "$as_me:6228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
@@ -6279,7 +6235,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6282: result: $ac_cv_struct_tm" >&5
+echo "$as_me:6238: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -6289,7 +6245,7 @@ EOF
 
 fi
 
-echo "$as_me:6292: checking for a fallback value for HZ" >&5
+echo "$as_me:6248: checking for a fallback value for HZ" >&5
 echo $ECHO_N "checking for a fallback value for HZ... $ECHO_C" >&6
 if test "${ac_cv_var_default_hz+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6304,13 +6260,13 @@ case "$target" in
     ;;
 esac
 fi
-echo "$as_me:6307: result: $ac_cv_var_default_hz" >&5
+echo "$as_me:6263: result: $ac_cv_var_default_hz" >&5
 echo "${ECHO_T}$ac_cv_var_default_hz" >&6
 cat >>confdefs.h <&5
+echo "$as_me:6269: checking if we need to override the system's value for HZ" >&5
 echo $ECHO_N "checking if we need to override the system's value for HZ... $ECHO_C" >&6
 if test "${ac_cv_var_override_hz+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6331,7 +6287,7 @@ case "$target" in
     ;;
 esac
 fi
-echo "$as_me:6334: result: $ac_cv_var_override_hz" >&5
+echo "$as_me:6290: result: $ac_cv_var_override_hz" >&5
 echo "${ECHO_T}$ac_cv_var_override_hz" >&6
 case "$ac_cv_var_override_hz" in
  yes)
@@ -6342,14 +6298,14 @@ EOF
     ;;
 esac
 
-echo "$as_me:6345: checking struct sigaction for sa_sigaction" >&5
+echo "$as_me:6301: checking struct sigaction for sa_sigaction" >&5
 echo $ECHO_N "checking struct sigaction for sa_sigaction... $ECHO_C" >&6
 if test "${ac_cv_struct_sigaction_has_sa_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6352 "configure"
+#line 6308 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -6361,16 +6317,16 @@ struct sigaction act; act.sa_sigaction = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6367: \$? = $ac_status" >&5
+  echo "$as_me:6323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6373: \$? = $ac_status" >&5
+  echo "$as_me:6329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_sigaction_has_sa_sigaction=yes
 else
@@ -6382,7 +6338,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6385: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5
+echo "$as_me:6341: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5
 echo "${ECHO_T}$ac_cv_struct_sigaction_has_sa_sigaction" >&6
 if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then
   cat >>confdefs.h <<\EOF
@@ -6391,13 +6347,13 @@ EOF
 
 fi
 
-echo "$as_me:6394: checking for struct ppsclockev" >&5
+echo "$as_me:6350: checking for struct ppsclockev" >&5
 echo $ECHO_N "checking for struct ppsclockev... $ECHO_C" >&6
 if test "${ac_cv_struct_ppsclockev+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6400 "configure"
+#line 6356 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6421,16 +6377,16 @@ return pce->serial;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6427: \$? = $ac_status" >&5
+  echo "$as_me:6383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6433: \$? = $ac_status" >&5
+  echo "$as_me:6389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_ppsclockev=yes
 else
@@ -6441,7 +6397,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6444: result: $ac_cv_struct_ppsclockev" >&5
+echo "$as_me:6400: result: $ac_cv_struct_ppsclockev" >&5
 echo "${ECHO_T}$ac_cv_struct_ppsclockev" >&6
 if test $ac_cv_struct_ppsclockev = yes; then
     cat >>confdefs.h <<\EOF
@@ -6450,13 +6406,13 @@ EOF
 
 fi
 
-echo "$as_me:6453: checking struct sockaddr for sa_len" >&5
+echo "$as_me:6409: checking struct sockaddr for sa_len" >&5
 echo $ECHO_N "checking struct sockaddr for sa_len... $ECHO_C" >&6
 if test "${ac_cv_struct_sockaddr_has_sa_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6459 "configure"
+#line 6415 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6472,16 +6428,16 @@ return ps->sa_len;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6478: \$? = $ac_status" >&5
+  echo "$as_me:6434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6484: \$? = $ac_status" >&5
+  echo "$as_me:6440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_sockaddr_has_sa_len=yes
 else
@@ -6492,7 +6448,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6495: result: $ac_cv_struct_sockaddr_has_sa_len" >&5
+echo "$as_me:6451: result: $ac_cv_struct_sockaddr_has_sa_len" >&5
 echo "${ECHO_T}$ac_cv_struct_sockaddr_has_sa_len" >&6
 if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
     cat >>confdefs.h <<\EOF
@@ -6501,13 +6457,13 @@ EOF
 
 fi
 
-echo "$as_me:6504: checking struct clockinfo for hz" >&5
+echo "$as_me:6460: checking struct clockinfo for hz" >&5
 echo $ECHO_N "checking struct clockinfo for hz... $ECHO_C" >&6
 if test "${ac_cv_struct_clockinfo_has_hz+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6510 "configure"
+#line 6466 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6522,16 +6478,16 @@ return pc->hz;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6528: \$? = $ac_status" >&5
+  echo "$as_me:6484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6534: \$? = $ac_status" >&5
+  echo "$as_me:6490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_clockinfo_has_hz=yes
 else
@@ -6542,7 +6498,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6545: result: $ac_cv_struct_clockinfo_has_hz" >&5
+echo "$as_me:6501: result: $ac_cv_struct_clockinfo_has_hz" >&5
 echo "${ECHO_T}$ac_cv_struct_clockinfo_has_hz" >&6
 if test $ac_cv_struct_clockinfo_has_hz = yes; then
     cat >>confdefs.h <<\EOF
@@ -6551,13 +6507,13 @@ EOF
 
 fi
 
-echo "$as_me:6554: checking struct clockinfo for tickadj" >&5
+echo "$as_me:6510: checking struct clockinfo for tickadj" >&5
 echo $ECHO_N "checking struct clockinfo for tickadj... $ECHO_C" >&6
 if test "${ac_cv_struct_clockinfo_has_tickadj+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6560 "configure"
+#line 6516 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6572,16 +6528,16 @@ return pc->tickadj;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6578: \$? = $ac_status" >&5
+  echo "$as_me:6534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6584: \$? = $ac_status" >&5
+  echo "$as_me:6540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_clockinfo_has_tickadj=yes
 else
@@ -6592,7 +6548,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6595: result: $ac_cv_struct_clockinfo_has_tickadj" >&5
+echo "$as_me:6551: result: $ac_cv_struct_clockinfo_has_tickadj" >&5
 echo "${ECHO_T}$ac_cv_struct_clockinfo_has_tickadj" >&6
 if test $ac_cv_struct_clockinfo_has_tickadj = yes; then
     cat >>confdefs.h <<\EOF
@@ -6601,13 +6557,13 @@ EOF
 
 fi
 
-echo "$as_me:6604: checking for struct timespec" >&5
+echo "$as_me:6560: checking for struct timespec" >&5
 echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
 if test "${ac_cv_struct_timespec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6610 "configure"
+#line 6566 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6628,16 +6584,16 @@ struct timespec n;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6634: \$? = $ac_status" >&5
+  echo "$as_me:6590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6640: \$? = $ac_status" >&5
+  echo "$as_me:6596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_timespec=yes
 else
@@ -6647,7 +6603,7 @@ ac_cv_struct_timespec=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6650: result: $ac_cv_struct_timespec" >&5
+echo "$as_me:6606: result: $ac_cv_struct_timespec" >&5
 echo "${ECHO_T}$ac_cv_struct_timespec" >&6
 if test $ac_cv_struct_timespec = yes; then
 
@@ -6657,13 +6613,13 @@ EOF
 
 fi
 
-echo "$as_me:6660: checking for struct ntptimeval" >&5
+echo "$as_me:6616: checking for struct ntptimeval" >&5
 echo $ECHO_N "checking for struct ntptimeval... $ECHO_C" >&6
 if test "${ac_cv_struct_ntptimeval+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6666 "configure"
+#line 6622 "configure"
 #include "confdefs.h"
 
 #include 
@@ -6677,16 +6633,16 @@ struct ntptimeval n;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6683: \$? = $ac_status" >&5
+  echo "$as_me:6639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6689: \$? = $ac_status" >&5
+  echo "$as_me:6645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_struct_ntptimeval=yes
 else
@@ -6696,7 +6652,7 @@ ac_cv_struct_ntptimeval=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6699: result: $ac_cv_struct_ntptimeval" >&5
+echo "$as_me:6655: result: $ac_cv_struct_ntptimeval" >&5
 echo "${ECHO_T}$ac_cv_struct_ntptimeval" >&6
 if test $ac_cv_struct_ntptimeval = yes; then
 
@@ -6706,13 +6662,13 @@ EOF
 
 fi
 
-echo "$as_me:6709: checking for struct ntptimeval.time.tv_nsec" >&5
+echo "$as_me:6665: checking for struct ntptimeval.time.tv_nsec" >&5
 echo $ECHO_N "checking for struct ntptimeval.time.tv_nsec... $ECHO_C" >&6
 if test "${ac_cv_member_struct_ntptimeval_time_tv_nsec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6715 "configure"
+#line 6671 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TIME_H
 #include 
@@ -6732,23 +6688,24 @@ else
 int
 main ()
 {
-struct ntptimeval foo;
-foo.time.tv_nsec;
+static struct ntptimeval ac_aggr;
+if (ac_aggr.time.tv_nsec)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6745: \$? = $ac_status" >&5
+  echo "$as_me:6702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6751: \$? = $ac_status" >&5
+  echo "$as_me:6708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_ntptimeval_time_tv_nsec=yes
 else
@@ -6758,7 +6715,7 @@ ac_cv_member_struct_ntptimeval_time_tv_nsec=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6761: result: $ac_cv_member_struct_ntptimeval_time_tv_nsec" >&5
+echo "$as_me:6718: result: $ac_cv_member_struct_ntptimeval_time_tv_nsec" >&5
 echo "${ECHO_T}$ac_cv_member_struct_ntptimeval_time_tv_nsec" >&6
 if test $ac_cv_member_struct_ntptimeval_time_tv_nsec = yes; then
 
@@ -6768,7 +6725,7 @@ EOF
 
 fi
 
-echo "$as_me:6771: checking for inline" >&5
+echo "$as_me:6728: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6776,7 +6733,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 6779 "configure"
+#line 6736 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -6785,16 +6742,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6791: \$? = $ac_status" >&5
+  echo "$as_me:6748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6797: \$? = $ac_status" >&5
+  echo "$as_me:6754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -6805,7 +6762,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:6808: result: $ac_cv_c_inline" >&5
+echo "$as_me:6765: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -6820,13 +6777,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:6823: checking whether char is unsigned" >&5
+echo "$as_me:6780: checking whether char is unsigned" >&5
 echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
 if test "${ac_cv_c_char_unsigned+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6829 "configure"
+#line 6786 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6838,16 +6795,16 @@ int _array_ [1 - 2 * !(((char) -1) < 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6844: \$? = $ac_status" >&5
+  echo "$as_me:6801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6850: \$? = $ac_status" >&5
+  echo "$as_me:6807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_char_unsigned=no
 else
@@ -6857,7 +6814,7 @@ ac_cv_c_char_unsigned=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6860: result: $ac_cv_c_char_unsigned" >&5
+echo "$as_me:6817: result: $ac_cv_c_char_unsigned" >&5
 echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
   cat >>confdefs.h <<\EOF
@@ -6867,13 +6824,13 @@ EOF
 fi
 		case "$host" in
  $target)
-    echo "$as_me:6870: checking for signed char" >&5
+    echo "$as_me:6827: checking for signed char" >&5
 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
 if test "${ac_cv_type_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6876 "configure"
+#line 6833 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6888,16 +6845,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6894: \$? = $ac_status" >&5
+  echo "$as_me:6851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6900: \$? = $ac_status" >&5
+  echo "$as_me:6857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -6907,10 +6864,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6910: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:6867: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:6913: checking size of signed char" >&5
+echo "$as_me:6870: checking size of signed char" >&5
 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6919,7 +6876,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 6922 "configure"
+#line 6879 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6931,21 +6888,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6937: \$? = $ac_status" >&5
+  echo "$as_me:6894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6943: \$? = $ac_status" >&5
+  echo "$as_me:6900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 6948 "configure"
+#line 6905 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6957,16 +6914,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6963: \$? = $ac_status" >&5
+  echo "$as_me:6920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6969: \$? = $ac_status" >&5
+  echo "$as_me:6926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -6982,7 +6939,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 6985 "configure"
+#line 6942 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -6994,16 +6951,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6997: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7000: \$? = $ac_status" >&5
+  echo "$as_me:6957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7006: \$? = $ac_status" >&5
+  echo "$as_me:6963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -7019,7 +6976,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 7022 "configure"
+#line 6979 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7031,16 +6988,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7037: \$? = $ac_status" >&5
+  echo "$as_me:6994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7043: \$? = $ac_status" >&5
+  echo "$as_me:7000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -7053,12 +7010,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7056: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7013: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7061 "configure"
+#line 7018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7074,15 +7031,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7080: \$? = $ac_status" >&5
+  echo "$as_me:7037: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7085: \$? = $ac_status" >&5
+  echo "$as_me:7042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -7090,7 +7047,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -7098,7 +7055,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:7101: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:7058: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <&5
+	echo "$as_me:7067: checking for signed char" >&5
 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
 if test "${ac_cv_type_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7116 "configure"
+#line 7073 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7128,16 +7085,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7088: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7134: \$? = $ac_status" >&5
+  echo "$as_me:7091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7140: \$? = $ac_status" >&5
+  echo "$as_me:7097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signed_char=yes
 else
@@ -7147,10 +7104,10 @@ ac_cv_type_signed_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7150: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:7107: result: $ac_cv_type_signed_char" >&5
 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
 
-echo "$as_me:7153: checking size of signed char" >&5
+echo "$as_me:7110: checking size of signed char" >&5
 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_signed_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7159,7 +7116,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 7162 "configure"
+#line 7119 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7171,21 +7128,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7177: \$? = $ac_status" >&5
+  echo "$as_me:7134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7183: \$? = $ac_status" >&5
+  echo "$as_me:7140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7188 "configure"
+#line 7145 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7197,16 +7154,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7203: \$? = $ac_status" >&5
+  echo "$as_me:7160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7209: \$? = $ac_status" >&5
+  echo "$as_me:7166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -7222,7 +7179,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7225 "configure"
+#line 7182 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7234,16 +7191,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7240: \$? = $ac_status" >&5
+  echo "$as_me:7197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7246: \$? = $ac_status" >&5
+  echo "$as_me:7203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -7259,7 +7216,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 7262 "configure"
+#line 7219 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7271,16 +7228,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7277: \$? = $ac_status" >&5
+  echo "$as_me:7234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -7293,12 +7250,12 @@ done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7296: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7253: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7301 "configure"
+#line 7258 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7314,15 +7271,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7320: \$? = $ac_status" >&5
+  echo "$as_me:7277: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7325: \$? = $ac_status" >&5
+  echo "$as_me:7282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
@@ -7330,7 +7287,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -7338,14 +7295,14 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
-echo "$as_me:7341: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:7298: result: $ac_cv_sizeof_signed_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <&5
+     *) { { echo "$as_me:7305: error: Cross-compiling needs explicit SIZEOF_SIGNED_LONG" >&5
 echo "$as_me: error: Cross-compiling needs explicit SIZEOF_SIGNED_LONG" >&2;}
    { (exit 1); exit 1; }; }
         ;;
@@ -7355,13 +7312,13 @@ esac
 
 case "$host" in
  $target)
-    echo "$as_me:7358: checking for int" >&5
+    echo "$as_me:7315: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7364 "configure"
+#line 7321 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7376,16 +7333,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7382: \$? = $ac_status" >&5
+  echo "$as_me:7339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7388: \$? = $ac_status" >&5
+  echo "$as_me:7345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -7395,10 +7352,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7398: result: $ac_cv_type_int" >&5
+echo "$as_me:7355: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:7401: checking size of int" >&5
+echo "$as_me:7358: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7407,7 +7364,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 7410 "configure"
+#line 7367 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7419,21 +7376,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7425: \$? = $ac_status" >&5
+  echo "$as_me:7382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7431: \$? = $ac_status" >&5
+  echo "$as_me:7388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7436 "configure"
+#line 7393 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7445,16 +7402,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7451: \$? = $ac_status" >&5
+  echo "$as_me:7408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7457: \$? = $ac_status" >&5
+  echo "$as_me:7414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -7470,7 +7427,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7473 "configure"
+#line 7430 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7482,16 +7439,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7488: \$? = $ac_status" >&5
+  echo "$as_me:7445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7494: \$? = $ac_status" >&5
+  echo "$as_me:7451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -7507,7 +7464,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 7510 "configure"
+#line 7467 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7519,16 +7476,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7479: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7525: \$? = $ac_status" >&5
+  echo "$as_me:7482: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7531: \$? = $ac_status" >&5
+  echo "$as_me:7488: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -7541,12 +7498,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7544: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7501: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7549 "configure"
+#line 7506 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7562,15 +7519,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7568: \$? = $ac_status" >&5
+  echo "$as_me:7525: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7573: \$? = $ac_status" >&5
+  echo "$as_me:7530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -7578,7 +7535,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -7586,7 +7543,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:7589: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:7546: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <&5
+	echo "$as_me:7555: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7604 "configure"
+#line 7561 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7616,16 +7573,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7622: \$? = $ac_status" >&5
+  echo "$as_me:7579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7628: \$? = $ac_status" >&5
+  echo "$as_me:7585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -7635,10 +7592,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7638: result: $ac_cv_type_int" >&5
+echo "$as_me:7595: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:7641: checking size of int" >&5
+echo "$as_me:7598: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7647,7 +7604,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 7650 "configure"
+#line 7607 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7659,21 +7616,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7665: \$? = $ac_status" >&5
+  echo "$as_me:7622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7671: \$? = $ac_status" >&5
+  echo "$as_me:7628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7676 "configure"
+#line 7633 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7685,16 +7642,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7691: \$? = $ac_status" >&5
+  echo "$as_me:7648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7697: \$? = $ac_status" >&5
+  echo "$as_me:7654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -7710,7 +7667,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7713 "configure"
+#line 7670 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7722,16 +7679,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7728: \$? = $ac_status" >&5
+  echo "$as_me:7685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7734: \$? = $ac_status" >&5
+  echo "$as_me:7691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -7747,7 +7704,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 7750 "configure"
+#line 7707 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7759,16 +7716,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7765: \$? = $ac_status" >&5
+  echo "$as_me:7722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7771: \$? = $ac_status" >&5
+  echo "$as_me:7728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -7781,12 +7738,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7784: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7741: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7789 "configure"
+#line 7746 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7802,15 +7759,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7808: \$? = $ac_status" >&5
+  echo "$as_me:7765: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7813: \$? = $ac_status" >&5
+  echo "$as_me:7770: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -7818,7 +7775,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -7826,14 +7783,14 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:7829: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:7786: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <&5
+     *) { { echo "$as_me:7793: error: Cross-compiling needs explicit SIZEOF_INT" >&5
 echo "$as_me: error: Cross-compiling needs explicit SIZEOF_INT" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -7843,13 +7800,13 @@ esac
 
 case "$host" in
  $target)
-    echo "$as_me:7846: checking for long" >&5
+    echo "$as_me:7803: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7852 "configure"
+#line 7809 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7864,16 +7821,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7870: \$? = $ac_status" >&5
+  echo "$as_me:7827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7876: \$? = $ac_status" >&5
+  echo "$as_me:7833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -7883,10 +7840,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7886: result: $ac_cv_type_long" >&5
+echo "$as_me:7843: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:7889: checking size of long" >&5
+echo "$as_me:7846: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7895,7 +7852,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 7898 "configure"
+#line 7855 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7907,21 +7864,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7913: \$? = $ac_status" >&5
+  echo "$as_me:7870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7919: \$? = $ac_status" >&5
+  echo "$as_me:7876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7924 "configure"
+#line 7881 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7933,16 +7890,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7939: \$? = $ac_status" >&5
+  echo "$as_me:7896: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7945: \$? = $ac_status" >&5
+  echo "$as_me:7902: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -7958,7 +7915,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 7961 "configure"
+#line 7918 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7970,16 +7927,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7976: \$? = $ac_status" >&5
+  echo "$as_me:7933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7982: \$? = $ac_status" >&5
+  echo "$as_me:7939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -7995,7 +7952,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 7998 "configure"
+#line 7955 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8007,16 +7964,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8013: \$? = $ac_status" >&5
+  echo "$as_me:7970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8019: \$? = $ac_status" >&5
+  echo "$as_me:7976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -8029,12 +7986,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8032: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:7989: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8037 "configure"
+#line 7994 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8050,15 +8007,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8053: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8056: \$? = $ac_status" >&5
+  echo "$as_me:8013: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8061: \$? = $ac_status" >&5
+  echo "$as_me:8018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -8066,7 +8023,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -8074,7 +8031,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:8077: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:8034: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <&5
+	echo "$as_me:8043: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8092 "configure"
+#line 8049 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8104,16 +8061,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8110: \$? = $ac_status" >&5
+  echo "$as_me:8067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8116: \$? = $ac_status" >&5
+  echo "$as_me:8073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -8123,10 +8080,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8126: result: $ac_cv_type_long" >&5
+echo "$as_me:8083: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:8129: checking size of long" >&5
+echo "$as_me:8086: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8135,7 +8092,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8138 "configure"
+#line 8095 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8147,21 +8104,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8153: \$? = $ac_status" >&5
+  echo "$as_me:8110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8159: \$? = $ac_status" >&5
+  echo "$as_me:8116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8164 "configure"
+#line 8121 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8173,16 +8130,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8179: \$? = $ac_status" >&5
+  echo "$as_me:8136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8185: \$? = $ac_status" >&5
+  echo "$as_me:8142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -8198,7 +8155,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8201 "configure"
+#line 8158 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8210,16 +8167,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8216: \$? = $ac_status" >&5
+  echo "$as_me:8173: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8222: \$? = $ac_status" >&5
+  echo "$as_me:8179: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -8235,7 +8192,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 8238 "configure"
+#line 8195 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8247,16 +8204,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8253: \$? = $ac_status" >&5
+  echo "$as_me:8210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8259: \$? = $ac_status" >&5
+  echo "$as_me:8216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -8269,12 +8226,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8272: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8229: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8277 "configure"
+#line 8234 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8290,15 +8247,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8296: \$? = $ac_status" >&5
+  echo "$as_me:8253: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8301: \$? = $ac_status" >&5
+  echo "$as_me:8258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -8306,7 +8263,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.val
@@ -8314,14 +8271,14 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:8317: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:8274: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <&5
+     *) { { echo "$as_me:8281: error: Cross-compiling needs explicit SIZEOF_LONG" >&5
 echo "$as_me: error: Cross-compiling needs explicit SIZEOF_LONG" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -8329,13 +8286,13 @@ echo "$as_me: error: Cross-compiling needs explicit SIZEOF_LONG" >&2;}
     ;;
 esac
 
-echo "$as_me:8332: checking for s_char" >&5
+echo "$as_me:8289: checking for s_char" >&5
 echo $ECHO_N "checking for s_char... $ECHO_C" >&6
 if test "${ac_cv_type_s_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8338 "configure"
+#line 8295 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8350,16 +8307,16 @@ if (sizeof (s_char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8356: \$? = $ac_status" >&5
+  echo "$as_me:8313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8362: \$? = $ac_status" >&5
+  echo "$as_me:8319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_s_char=yes
 else
@@ -8369,7 +8326,7 @@ ac_cv_type_s_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8372: result: $ac_cv_type_s_char" >&5
+echo "$as_me:8329: result: $ac_cv_type_s_char" >&5
 echo "${ECHO_T}$ac_cv_type_s_char" >&6
 if test $ac_cv_type_s_char = yes; then
 
@@ -8399,7 +8356,7 @@ EOF
     ;;
  yes0no)
     # We have unsigned chars, can't say 'signed char', no s_char typedef.
-    { { echo "$as_me:8402: error: No way to specify a signed character!" >&5
+    { { echo "$as_me:8359: error: No way to specify a signed character!" >&5
 echo "$as_me: error: No way to specify a signed character!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
@@ -8411,13 +8368,13 @@ EOF
 
     ;;
 esac
-echo "$as_me:8414: checking for uid_t in sys/types.h" >&5
+echo "$as_me:8371: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8420 "configure"
+#line 8377 "configure"
 #include "confdefs.h"
 #include 
 
@@ -8431,7 +8388,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:8434: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:8391: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -8450,14 +8407,14 @@ case "$target" in
 
 for ac_func in __adjtimex __ntp_gettime
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8454: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8411: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8460 "configure"
+#line 8417 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8488,30 +8445,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8494: \$? = $ac_status" >&5
+  echo "$as_me:8451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8500: \$? = $ac_status" >&5
+  echo "$as_me:8457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8510: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8467: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8492: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8540 "configure"
+#line 8498 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8568,30 +8526,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8574: \$? = $ac_status" >&5
+  echo "$as_me:8532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8580: \$? = $ac_status" >&5
+  echo "$as_me:8538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8590: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8548: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8564: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8612 "configure"
+#line 8570 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8640,30 +8598,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8646: \$? = $ac_status" >&5
+  echo "$as_me:8604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8652: \$? = $ac_status" >&5
+  echo "$as_me:8610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8662: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8620: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8633: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8681 "configure"
+#line 8639 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8709,44 +8667,44 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8715: \$? = $ac_status" >&5
+  echo "$as_me:8673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8721: \$? = $ac_status" >&5
+  echo "$as_me:8679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8731: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8689: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8701: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8749 "configure"
+#line 8707 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8777,39 +8735,39 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8783: \$? = $ac_status" >&5
+  echo "$as_me:8741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8789: \$? = $ac_status" >&5
+  echo "$as_me:8747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8799: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8757: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <" >&5
+  echo "$as_me:8765: checking for isfinite with " >&5
 echo $ECHO_N "checking for isfinite with ... $ECHO_C" >&6
     _libs=$LIBS
     LIBS="$LIBS -lm"
     cat >conftest.$ac_ext <<_ACEOF
-#line 8812 "configure"
+#line 8770 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -8821,18 +8779,18 @@ float f = 0.0; isfinite(f)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8782: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8827: \$? = $ac_status" >&5
+  echo "$as_me:8785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8833: \$? = $ac_status" >&5
+  echo "$as_me:8791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:8835: result: yes" >&5
+  echo "$as_me:8793: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       cat >>confdefs.h <<\EOF
 #define HAVE_ISFINITE 1
@@ -8841,7 +8799,7 @@ EOF
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:8844: result: no" >&5
+echo "$as_me:8802: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -8852,16 +8810,16 @@ done
 fi
 done
 
-for ac_func in getbootfile getclock getdtablesize getrusage gettimeofday
+for ac_func in getbootfile getclock getdtablesize getrusage
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8858: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8816: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8864 "configure"
+#line 8822 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8892,49 +8850,117 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8898: \$? = $ac_status" >&5
+  echo "$as_me:8856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8904: \$? = $ac_status" >&5
+  echo "$as_me:8862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8914: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:8872: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
+if test "${ac_cv_func_gettimeofday+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 8888 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gettimeofday (); below.  */
+#include 
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gettimeofday ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
+choke me
+#else
+f = gettimeofday;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8919: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8922: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8925: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8928: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gettimeofday=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_gettimeofday=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8938: result: $ac_cv_func_gettimeofday" >&5
+echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
+if test $ac_cv_func_gettimeofday = yes; then
+  :
+else
+
+case "$target" in
+  *-*-mpeix*) ac_cv_func_gettimeofday=yes
+    ;;
+esac
+fi
+
 case "$target" in
  *-pc-cygwin*)
     ;;
  *)
 for ac_func in getuid
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8931: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8957: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8937 "configure"
+#line 8963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8965,30 +8991,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8971: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8977: \$? = $ac_status" >&5
+  echo "$as_me:9003: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8987: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9013: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9029: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9009 "configure"
+#line 9035 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9037,30 +9063,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9043: \$? = $ac_status" >&5
+  echo "$as_me:9069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9049: \$? = $ac_status" >&5
+  echo "$as_me:9075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9059: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9085: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9103: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9083 "configure"
+#line 9109 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9111,30 +9137,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9117: \$? = $ac_status" >&5
+  echo "$as_me:9143: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9123: \$? = $ac_status" >&5
+  echo "$as_me:9149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9133: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9159: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9175: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9155 "configure"
+#line 9181 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9183,30 +9209,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9189: \$? = $ac_status" >&5
+  echo "$as_me:9215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9195: \$? = $ac_status" >&5
+  echo "$as_me:9221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9205: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9231: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9260: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9240 "configure"
+#line 9266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9268,30 +9294,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9274: \$? = $ac_status" >&5
+  echo "$as_me:9300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9280: \$? = $ac_status" >&5
+  echo "$as_me:9306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9290: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9316: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9329: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9309 "configure"
+#line 9335 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9337,30 +9363,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9343: \$? = $ac_status" >&5
+  echo "$as_me:9369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9349: \$? = $ac_status" >&5
+  echo "$as_me:9375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9359: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9385: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9400: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9380 "configure"
+#line 9406 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9408,30 +9434,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9411: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9414: \$? = $ac_status" >&5
+  echo "$as_me:9440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9420: \$? = $ac_status" >&5
+  echo "$as_me:9446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9430: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9456: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9472: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9452 "configure"
+#line 9478 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9480,30 +9506,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9486: \$? = $ac_status" >&5
+  echo "$as_me:9512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9492: \$? = $ac_status" >&5
+  echo "$as_me:9518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9502: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9528: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9547: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9527 "configure"
+#line 9553 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9555,30 +9581,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9561: \$? = $ac_status" >&5
+  echo "$as_me:9587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9567: \$? = $ac_status" >&5
+  echo "$as_me:9593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9577: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9603: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9619: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9599 "configure"
+#line 9625 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9627,30 +9653,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9633: \$? = $ac_status" >&5
+  echo "$as_me:9659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9639: \$? = $ac_status" >&5
+  echo "$as_me:9665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9649: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9675: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9691: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9671 "configure"
+#line 9697 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9699,30 +9725,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9711: \$? = $ac_status" >&5
+  echo "$as_me:9737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9721: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9747: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9772: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9752 "configure"
+#line 9778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9780,30 +9806,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9786: \$? = $ac_status" >&5
+  echo "$as_me:9812: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9792: \$? = $ac_status" >&5
+  echo "$as_me:9818: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9802: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9828: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 9850 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include 
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9881: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9884: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9887: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9890: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:9900: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9913: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9824 "configure"
+#line 9919 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9852,45 +9947,51 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9858: \$? = $ac_status" >&5
+  echo "$as_me:9953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9864: \$? = $ac_status" >&5
+  echo "$as_me:9959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9874: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9969: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9988: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9893 "configure"
+#line 9994 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9921,30 +10022,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:10028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9933: \$? = $ac_status" >&5
+  echo "$as_me:10034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9943: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10044: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10057: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9962 "configure"
+#line 10063 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9990,30 +10091,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9996: \$? = $ac_status" >&5
+  echo "$as_me:10097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10002: \$? = $ac_status" >&5
+  echo "$as_me:10103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10012: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10113: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10126: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10031 "configure"
+#line 10132 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10059,30 +10160,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10065: \$? = $ac_status" >&5
+  echo "$as_me:10166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10071: \$? = $ac_status" >&5
+  echo "$as_me:10172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10081: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10182: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10209: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10114 "configure"
+#line 10215 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10142,30 +10243,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10148: \$? = $ac_status" >&5
+  echo "$as_me:10249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10154: \$? = $ac_status" >&5
+  echo "$as_me:10255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10164: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10265: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10285: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10190 "configure"
+#line 10291 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10218,30 +10319,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10224: \$? = $ac_status" >&5
+  echo "$as_me:10325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10230: \$? = $ac_status" >&5
+  echo "$as_me:10331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10240: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10341: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10357: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10262 "configure"
+#line 10363 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10290,42 +10391,42 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10296: \$? = $ac_status" >&5
+  echo "$as_me:10397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10302: \$? = $ac_status" >&5
+  echo "$as_me:10403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$ac_ac_var=yes"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10312: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10413: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <&5
+echo "$as_me:10423: checking number of arguments to gettimeofday()" >&5
 echo $ECHO_N "checking number of arguments to gettimeofday()... $ECHO_C" >&6
 if test "${ac_cv_func_Xettimeofday_nargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10328 "configure"
+#line 10429 "configure"
 #include "confdefs.h"
 #include 
 int
@@ -10340,16 +10441,16 @@ settimeofday((struct timeval*)0,(struct timezone*)0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10346: \$? = $ac_status" >&5
+  echo "$as_me:10447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10352: \$? = $ac_status" >&5
+  echo "$as_me:10453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_Xettimeofday_nargs=2
 else
@@ -10360,7 +10461,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10363: result: $ac_cv_func_Xettimeofday_nargs" >&5
+echo "$as_me:10464: result: $ac_cv_func_Xettimeofday_nargs" >&5
 echo "${ECHO_T}$ac_cv_func_Xettimeofday_nargs" >&6
 if test $ac_cv_func_Xettimeofday_nargs = 1; then
 	cat >>confdefs.h <<\EOF
@@ -10369,13 +10470,13 @@ EOF
 
 fi
 
-echo "$as_me:10372: checking number of arguments taken by setpgrp()" >&5
+echo "$as_me:10473: checking number of arguments taken by setpgrp()" >&5
 echo $ECHO_N "checking number of arguments taken by setpgrp()... $ECHO_C" >&6
 if test "${ac_cv_func_setpgrp_nargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10378 "configure"
+#line 10479 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -10394,16 +10495,16 @@ setpgrp(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10397: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10498: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10400: \$? = $ac_status" >&5
+  echo "$as_me:10501: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10406: \$? = $ac_status" >&5
+  echo "$as_me:10507: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_nargs=2
 else
@@ -10414,7 +10515,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10417: result: $ac_cv_func_setpgrp_nargs" >&5
+echo "$as_me:10518: result: $ac_cv_func_setpgrp_nargs" >&5
 echo "${ECHO_T}$ac_cv_func_setpgrp_nargs" >&6
 if test $ac_cv_func_setpgrp_nargs = 0; then
         cat >>confdefs.h <<\EOF
@@ -10426,13 +10527,13 @@ fi
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -I$srcdir/include"
 
-echo "$as_me:10429: checking argument pointer type of qsort()'s compare function and base" >&5
+echo "$as_me:10530: checking argument pointer type of qsort()'s compare function and base" >&5
 echo $ECHO_N "checking argument pointer type of qsort()'s compare function and base... $ECHO_C" >&6
 if test "${ac_cv_func_qsort_argtype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10435 "configure"
+#line 10536 "configure"
 #include "confdefs.h"
 
 #include "l_stdlib.h"
@@ -10460,16 +10561,16 @@ qsort(base, 2, sizeof(char *), sortfunc);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10466: \$? = $ac_status" >&5
+  echo "$as_me:10567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10472: \$? = $ac_status" >&5
+  echo "$as_me:10573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_qsort_argtype=void
 else
@@ -10480,7 +10581,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10483: result: $ac_cv_func_qsort_argtype" >&5
+echo "$as_me:10584: result: $ac_cv_func_qsort_argtype" >&5
 echo "${ECHO_T}$ac_cv_func_qsort_argtype" >&6
 case "$ac_cv_func_qsort_argtype" in
  void)
@@ -10493,13 +10594,13 @@ esac
 
 CFLAGS=$save_CFLAGS
 
-echo "$as_me:10496: checking if we need to declare 'errno'" >&5
+echo "$as_me:10597: checking if we need to declare 'errno'" >&5
 echo $ECHO_N "checking if we need to declare 'errno'... $ECHO_C" >&6
 if test "${ac_cv_decl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10502 "configure"
+#line 10603 "configure"
 #include "confdefs.h"
 #ifdef HAVE_ERRNO_H
 #include 
@@ -10513,16 +10614,16 @@ errno = 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10617: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10519: \$? = $ac_status" >&5
+  echo "$as_me:10620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10525: \$? = $ac_status" >&5
+  echo "$as_me:10626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_errno=no
 else
@@ -10532,7 +10633,7 @@ ac_cv_decl_errno=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10535: result: $ac_cv_decl_errno" >&5
+echo "$as_me:10636: result: $ac_cv_decl_errno" >&5
 echo "${ECHO_T}$ac_cv_decl_errno" >&6
 case "$ac_cv_decl_errno" in
  yes) cat >>confdefs.h <<\EOF
@@ -10541,13 +10642,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:10544: checking if we may declare 'h_errno'" >&5
+echo "$as_me:10645: checking if we may declare 'h_errno'" >&5
 echo $ECHO_N "checking if we may declare 'h_errno'... $ECHO_C" >&6
 if test "${ac_cv_decl_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10550 "configure"
+#line 10651 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_NETINET_IN_H
@@ -10571,16 +10672,16 @@ extern int h_errno;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10577: \$? = $ac_status" >&5
+  echo "$as_me:10678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10583: \$? = $ac_status" >&5
+  echo "$as_me:10684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_h_errno=yes
 else
@@ -10590,7 +10691,7 @@ ac_cv_decl_h_errno=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10593: result: $ac_cv_decl_h_errno" >&5
+echo "$as_me:10694: result: $ac_cv_decl_h_errno" >&5
 echo "${ECHO_T}$ac_cv_decl_h_errno" >&6
 case "$ac_cv_decl_h_errno" in
  yes) cat >>confdefs.h <<\EOF
@@ -10599,13 +10700,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:10602: checking if declaring 'char *sys_errlist[]' is ok" >&5
+echo "$as_me:10703: checking if declaring 'char *sys_errlist[]' is ok" >&5
 echo $ECHO_N "checking if declaring 'char *sys_errlist[]' is ok... $ECHO_C" >&6
 if test "${ac_cv_decl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10608 "configure"
+#line 10709 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_ERRNO_H
@@ -10621,16 +10722,16 @@ extern char *sys_errlist[];
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10627: \$? = $ac_status" >&5
+  echo "$as_me:10728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10633: \$? = $ac_status" >&5
+  echo "$as_me:10734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_sys_errlist=yes
 else
@@ -10640,7 +10741,7 @@ ac_cv_decl_sys_errlist=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10643: result: $ac_cv_decl_sys_errlist" >&5
+echo "$as_me:10744: result: $ac_cv_decl_sys_errlist" >&5
 echo "${ECHO_T}$ac_cv_decl_sys_errlist" >&6
 case "$ac_cv_decl_sys_errlist" in
  yes) cat >>confdefs.h <<\EOF
@@ -10649,13 +10750,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:10652: checking if declaring 'syscall()' is ok" >&5
+echo "$as_me:10753: checking if declaring 'syscall()' is ok" >&5
 echo $ECHO_N "checking if declaring 'syscall()' is ok... $ECHO_C" >&6
 if test "${ac_cv_decl_syscall+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10658 "configure"
+#line 10759 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -10679,16 +10780,16 @@ extern int syscall P((int, ...));
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10685: \$? = $ac_status" >&5
+  echo "$as_me:10786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10691: \$? = $ac_status" >&5
+  echo "$as_me:10792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_syscall=yes
 else
@@ -10698,7 +10799,7 @@ ac_cv_decl_syscall=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10701: result: $ac_cv_decl_syscall" >&5
+echo "$as_me:10802: result: $ac_cv_decl_syscall" >&5
 echo "${ECHO_T}$ac_cv_decl_syscall" >&6
 case "$ac_cv_decl_syscall" in
  yes) cat >>confdefs.h <<\EOF
@@ -10714,6 +10815,44 @@ case "$target" in
 EOF
 		# Needed for XLC under AIX 4.3.2
     ;;
+ *-*-mpeix*)
+    cat >>confdefs.h <<\EOF
+#define DECL_ADJTIME_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_INET_NTOA_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_MKTEMP_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_MRAND48_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_SELECT_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_SETITIMER_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_SRAND48_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_SYSLOG_0 1
+EOF
+
+    cat >>confdefs.h <<\EOF
+#define DECL_TIMEOFDAY_0 1
+EOF
+
+    ;;
  *-*-osf[45]*)
     cat >>confdefs.h <<\EOF
 #define DECL_PLOCK_0 1
@@ -10983,17 +11122,17 @@ EOF
     ;;
 esac
 
-echo "$as_me:10986: checking if we should use a streams device for ifconfig" >&5
+echo "$as_me:11125: checking if we should use a streams device for ifconfig" >&5
 echo $ECHO_N "checking if we should use a streams device for ifconfig... $ECHO_C" >&6
 if test "${ac_cv_var_use_streams_device_for_ifconfig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_use_streams_device_for_ifconfig=no
 fi
-echo "$as_me:10993: result: $ac_cv_var_use_streams_device_for_ifconfig" >&5
+echo "$as_me:11132: result: $ac_cv_var_use_streams_device_for_ifconfig" >&5
 echo "${ECHO_T}$ac_cv_var_use_streams_device_for_ifconfig" >&6
 
-echo "$as_me:10996: checking if we need extra room for SO_RCVBUF" >&5
+echo "$as_me:11135: checking if we need extra room for SO_RCVBUF" >&5
 echo $ECHO_N "checking if we need extra room for SO_RCVBUF... $ECHO_C" >&6
 if test "${ac_cv_var_rcvbuf_slop+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11006,7 +11145,7 @@ case "$target" in
 esac
 ac_cv_var_rcvbuf_slop=$ans
 fi
-echo "$as_me:11009: result: $ac_cv_var_rcvbuf_slop" >&5
+echo "$as_me:11148: result: $ac_cv_var_rcvbuf_slop" >&5
 echo "${ECHO_T}$ac_cv_var_rcvbuf_slop" >&6
 case "$ac_cv_var_rcvbuf_slop" in
  yes) cat >>confdefs.h <<\EOF
@@ -11015,7 +11154,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11018: checking if we will open the broadcast socket" >&5
+echo "$as_me:11157: checking if we will open the broadcast socket" >&5
 echo $ECHO_N "checking if we will open the broadcast socket... $ECHO_C" >&6
 if test "${ac_cv_var_open_bcast_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11031,7 +11170,7 @@ case "$target" in
 esac
 ac_cv_var_open_bcast_socket=$ans
 fi
-echo "$as_me:11034: result: $ac_cv_var_open_bcast_socket" >&5
+echo "$as_me:11173: result: $ac_cv_var_open_bcast_socket" >&5
 echo "${ECHO_T}$ac_cv_var_open_bcast_socket" >&6
 case "$ac_cv_var_open_bcast_socket" in
  yes) cat >>confdefs.h <<\EOF
@@ -11040,7 +11179,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11043: checking if we want the HPUX version of FindConfig()" >&5
+echo "$as_me:11182: checking if we want the HPUX version of FindConfig()" >&5
 echo $ECHO_N "checking if we want the HPUX version of FindConfig()... $ECHO_C" >&6
 if test "${ac_cv_var_hpux_findconfig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11053,7 +11192,7 @@ case "$target" in
 esac
 ac_cv_var_hpux_findconfig=$ans
 fi
-echo "$as_me:11056: result: $ac_cv_var_hpux_findconfig" >&5
+echo "$as_me:11195: result: $ac_cv_var_hpux_findconfig" >&5
 echo "${ECHO_T}$ac_cv_var_hpux_findconfig" >&6
 case "$ac_cv_var_hpux_findconfig" in
  yes) cat >>confdefs.h <<\EOF
@@ -11062,7 +11201,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11065: checking if process groups are set with -pid" >&5
+echo "$as_me:11204: checking if process groups are set with -pid" >&5
 echo $ECHO_N "checking if process groups are set with -pid... $ECHO_C" >&6
 if test "${ac_cv_arg_setpgrp_negpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11089,7 +11228,7 @@ else
 esac
 ac_cv_arg_setpgrp_negpid=$ans
 fi
-echo "$as_me:11092: result: $ac_cv_arg_setpgrp_negpid" >&5
+echo "$as_me:11231: result: $ac_cv_arg_setpgrp_negpid" >&5
 echo "${ECHO_T}$ac_cv_arg_setpgrp_negpid" >&6
 case "$ac_cv_arg_setpgrp_negpid" in
  yes) cat >>confdefs.h <<\EOF
@@ -11098,13 +11237,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:11101: checking if we need a ctty for F_SETOWN" >&5
+echo "$as_me:11240: checking if we need a ctty for F_SETOWN" >&5
 echo $ECHO_N "checking if we need a ctty for F_SETOWN... $ECHO_C" >&6
 if test "${ac_cv_func_ctty_for_f_setown+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
- *-*-bsdi23*)
+ *-*-bsdi[23]*)
     ans=yes
     ;;
  *-*-freebsd*)
@@ -11124,7 +11263,7 @@ else
 esac
 ac_cv_func_ctty_for_f_setown=$ans
 fi
-echo "$as_me:11127: result: $ac_cv_func_ctty_for_f_setown" >&5
+echo "$as_me:11266: result: $ac_cv_func_ctty_for_f_setown" >&5
 echo "${ECHO_T}$ac_cv_func_ctty_for_f_setown" >&6
 case "$ac_cv_func_ctty_for_f_setown" in
  yes) cat >>confdefs.h <<\EOF
@@ -11134,7 +11273,7 @@ EOF
 esac
 
 ntp_warning='GRONK'
-echo "$as_me:11137: checking if we'll use clock_settime or settimeofday or stime" >&5
+echo "$as_me:11276: checking if we'll use clock_settime or settimeofday or stime" >&5
 echo $ECHO_N "checking if we'll use clock_settime or settimeofday or stime... $ECHO_C" >&6
 case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in
  yes*)
@@ -11156,16 +11295,16 @@ case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in
     ;;
 esac
 esac
-echo "$as_me:11159: result: $ans" >&5
+echo "$as_me:11298: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 case "$ntp_warning" in
  '') ;;
- *) { echo "$as_me:11163: WARNING: *** $ntp_warning ***" >&5
+ *) { echo "$as_me:11302: WARNING: *** $ntp_warning ***" >&5
 echo "$as_me: WARNING: *** $ntp_warning ***" >&2;}
     ;;
 esac
 
-echo "$as_me:11168: checking if we have a losing syscall()" >&5
+echo "$as_me:11307: checking if we have a losing syscall()" >&5
 echo $ECHO_N "checking if we have a losing syscall()... $ECHO_C" >&6
 if test "${ac_cv_var_syscall_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11179,7 +11318,7 @@ else
 esac
 ac_cv_var_syscall_bug=$ans
 fi
-echo "$as_me:11182: result: $ac_cv_var_syscall_bug" >&5
+echo "$as_me:11321: result: $ac_cv_var_syscall_bug" >&5
 echo "${ECHO_T}$ac_cv_var_syscall_bug" >&6
 case "$ac_cv_var_syscall_bug" in
  yes) cat >>confdefs.h <<\EOF
@@ -11188,7 +11327,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11191: checking for Streams/TLI" >&5
+echo "$as_me:11330: checking for Streams/TLI" >&5
 echo $ECHO_N "checking for Streams/TLI... $ECHO_C" >&6
 if test "${ac_cv_var_streams_tli+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11206,7 +11345,7 @@ else
  esac
  ac_cv_var_streams_tli=$ans
 fi
-echo "$as_me:11209: result: $ac_cv_var_streams_tli" >&5
+echo "$as_me:11348: result: $ac_cv_var_streams_tli" >&5
 echo "${ECHO_T}$ac_cv_var_streams_tli" >&6
 case "$ac_cv_var_streams_tli" in
  yes)
@@ -11217,13 +11356,13 @@ EOF
     ;;
 esac
 
-echo "$as_me:11220: checking for SIGIO" >&5
+echo "$as_me:11359: checking for SIGIO" >&5
 echo $ECHO_N "checking for SIGIO... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11226 "configure"
+#line 11365 "configure"
 #include "confdefs.h"
 #include 
 #ifdef SIGIO
@@ -11240,10 +11379,10 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:11243: result: $ac_cv_hdr_def_sigio" >&5
+echo "$as_me:11382: result: $ac_cv_hdr_def_sigio" >&5
 echo "${ECHO_T}$ac_cv_hdr_def_sigio" >&6
 
-echo "$as_me:11246: checking if we want to use signalled IO" >&5
+echo "$as_me:11385: checking if we want to use signalled IO" >&5
 echo $ECHO_N "checking if we want to use signalled IO... $ECHO_C" >&6
 if test "${ac_cv_var_signalled_io+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11285,7 +11424,7 @@ case "$ac_cv_hdr_def_sigio" in
 esac
 ac_cv_var_signalled_io=$ans
 fi
-echo "$as_me:11288: result: $ac_cv_var_signalled_io" >&5
+echo "$as_me:11427: result: $ac_cv_var_signalled_io" >&5
 echo "${ECHO_T}$ac_cv_var_signalled_io" >&6
 case "$ac_cv_var_signalled_io" in
  yes) cat >>confdefs.h <<\EOF
@@ -11294,13 +11433,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:11297: checking for SIGPOLL" >&5
+echo "$as_me:11436: checking for SIGPOLL" >&5
 echo $ECHO_N "checking for SIGPOLL... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigpoll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11303 "configure"
+#line 11442 "configure"
 #include "confdefs.h"
 #include 
 #ifdef SIGPOLL
@@ -11317,16 +11456,16 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:11320: result: $ac_cv_hdr_def_sigpoll" >&5
+echo "$as_me:11459: result: $ac_cv_hdr_def_sigpoll" >&5
 echo "${ECHO_T}$ac_cv_hdr_def_sigpoll" >&6
 
-echo "$as_me:11323: checking for SIGSYS" >&5
+echo "$as_me:11462: checking for SIGSYS" >&5
 echo $ECHO_N "checking for SIGSYS... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigsys+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11329 "configure"
+#line 11468 "configure"
 #include "confdefs.h"
 #include 
 #ifdef SIGSYS
@@ -11343,10 +11482,10 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:11346: result: $ac_cv_hdr_def_sigsys" >&5
+echo "$as_me:11485: result: $ac_cv_hdr_def_sigsys" >&5
 echo "${ECHO_T}$ac_cv_hdr_def_sigsys" >&6
 
-echo "$as_me:11349: checking if we can use SIGPOLL for UDP I/O" >&5
+echo "$as_me:11488: checking if we can use SIGPOLL for UDP I/O" >&5
 echo $ECHO_N "checking if we can use SIGPOLL for UDP I/O... $ECHO_C" >&6
 if test "${ac_cv_var_use_udp_sigpoll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11392,7 +11531,7 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_udp_sigpoll=$ans
 fi
-echo "$as_me:11395: result: $ac_cv_var_use_udp_sigpoll" >&5
+echo "$as_me:11534: result: $ac_cv_var_use_udp_sigpoll" >&5
 echo "${ECHO_T}$ac_cv_var_use_udp_sigpoll" >&6
 case "$ac_cv_var_use_udp_sigpoll" in
  yes) cat >>confdefs.h <<\EOF
@@ -11401,7 +11540,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11404: checking if we can use SIGPOLL for TTY I/O" >&5
+echo "$as_me:11543: checking if we can use SIGPOLL for TTY I/O" >&5
 echo $ECHO_N "checking if we can use SIGPOLL for TTY I/O... $ECHO_C" >&6
 if test "${ac_cv_var_use_tty_sigpoll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11447,7 +11586,7 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_tty_sigpoll=$ans
 fi
-echo "$as_me:11450: result: $ac_cv_var_use_tty_sigpoll" >&5
+echo "$as_me:11589: result: $ac_cv_var_use_tty_sigpoll" >&5
 echo "${ECHO_T}$ac_cv_var_use_tty_sigpoll" >&6
 case "$ac_cv_var_use_tty_sigpoll" in
  yes) cat >>confdefs.h <<\EOF
@@ -11458,13 +11597,13 @@ esac
 
 case "$ac_cv_header_sys_sio_h" in
  yes)
-    echo "$as_me:11461: checking sys/sio.h for TIOCDCDTIMESTAMP" >&5
+    echo "$as_me:11600: checking sys/sio.h for TIOCDCDTIMESTAMP" >&5
 echo $ECHO_N "checking sys/sio.h for TIOCDCDTIMESTAMP... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_tiocdcdtimestamp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11467 "configure"
+#line 11606 "configure"
 #include "confdefs.h"
 #include 
 #ifdef TIOCDCDTIMESTAMP
@@ -11481,7 +11620,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:11484: result: $ac_cv_hdr_def_tiocdcdtimestamp" >&5
+echo "$as_me:11623: result: $ac_cv_hdr_def_tiocdcdtimestamp" >&5
 echo "${ECHO_T}$ac_cv_hdr_def_tiocdcdtimestamp" >&6
     ;;
 esac
@@ -11492,7 +11631,7 @@ case "$ac_cv_hdr_def_tiocdcdtimestamp" in
     ;;
 esac
 
-echo "$as_me:11495: checking if nlist() values might require extra indirection" >&5
+echo "$as_me:11634: checking if nlist() values might require extra indirection" >&5
 echo $ECHO_N "checking if nlist() values might require extra indirection... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_extra_indirection+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11505,7 +11644,7 @@ case "$target" in
 esac
 ac_cv_var_nlist_extra_indirection=$ans
 fi
-echo "$as_me:11508: result: $ac_cv_var_nlist_extra_indirection" >&5
+echo "$as_me:11647: result: $ac_cv_var_nlist_extra_indirection" >&5
 echo "${ECHO_T}$ac_cv_var_nlist_extra_indirection" >&6
 case "$ac_cv_var_nlist_extra_indirection" in
  yes) cat >>confdefs.h <<\EOF
@@ -11514,7 +11653,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11517: checking for a minimum recommended value of tickadj" >&5
+echo "$as_me:11656: checking for a minimum recommended value of tickadj" >&5
 echo $ECHO_N "checking for a minimum recommended value of tickadj... $ECHO_C" >&6
 if test "${ac_cv_var_min_rec_tickadj+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11527,7 +11666,7 @@ case "$target" in
 esac
 ac_cv_var_min_rec_tickadj=$ans
 fi
-echo "$as_me:11530: result: $ac_cv_var_min_rec_tickadj" >&5
+echo "$as_me:11669: result: $ac_cv_var_min_rec_tickadj" >&5
 echo "${ECHO_T}$ac_cv_var_min_rec_tickadj" >&6
 case "$ac_cv_var_min_rec_tickadj" in
  ''|no) ;;
@@ -11537,7 +11676,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11540: checking if the TTY code permits PARENB and IGNPAR" >&5
+echo "$as_me:11679: checking if the TTY code permits PARENB and IGNPAR" >&5
 echo $ECHO_N "checking if the TTY code permits PARENB and IGNPAR... $ECHO_C" >&6
 if test "${ac_cv_var_no_parenb_ignpar+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11550,10 +11689,15 @@ case "$target" in
  mips-sgi-irix*)
     ans=yes
     ;;
+ i?86-*-freebsd[123].*)
+    ;;
+ i?86-*-freebsd*)
+    ans=yes
+    ;;
 esac
 ac_cv_var_no_parenb_ignpar=$ans
 fi
-echo "$as_me:11556: result: $ac_cv_var_no_parenb_ignpar" >&5
+echo "$as_me:11700: result: $ac_cv_var_no_parenb_ignpar" >&5
 echo "${ECHO_T}$ac_cv_var_no_parenb_ignpar" >&6
 case "$ac_cv_var_no_parenb_ignpar" in
  yes) cat >>confdefs.h <<\EOF
@@ -11562,7 +11706,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11565: checking if we're including debugging code" >&5
+echo "$as_me:11709: checking if we're including debugging code" >&5
 echo $ECHO_N "checking if we're including debugging code... $ECHO_C" >&6
 # Check whether --enable-debugging or --disable-debugging was given.
 if test "${enable_debugging+set}" = set; then
@@ -11577,10 +11721,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:11580: result: $ntp_ok" >&5
+echo "$as_me:11724: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:11583: checking for a the number of minutes in a DST adjustment" >&5
+echo "$as_me:11727: checking for a the number of minutes in a DST adjustment" >&5
 echo $ECHO_N "checking for a the number of minutes in a DST adjustment... $ECHO_C" >&6
 # Check whether --enable-dst_minutes or --disable-dst_minutes was given.
 if test "${enable_dst_minutes+set}" = set; then
@@ -11593,10 +11737,10 @@ cat >>confdefs.h <&5
+echo "$as_me:11740: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:11599: checking if we have the tty_clk line discipline/streams module" >&5
+echo "$as_me:11743: checking if we have the tty_clk line discipline/streams module" >&5
 echo $ECHO_N "checking if we have the tty_clk line discipline/streams module... $ECHO_C" >&6
 if test "${ac_cv_var_tty_clk+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11605,7 +11749,7 @@ else
   *yes*) ac_cv_var_tty_clk=yes ;;
  esac
 fi
-echo "$as_me:11608: result: $ac_cv_var_tty_clk" >&5
+echo "$as_me:11752: result: $ac_cv_var_tty_clk" >&5
 echo "${ECHO_T}$ac_cv_var_tty_clk" >&6
 case "$ac_cv_var_tty_clk" in
  yes) cat >>confdefs.h <<\EOF
@@ -11614,14 +11758,14 @@ EOF
  ;;
 esac
 
-echo "$as_me:11617: checking for the ppsclock streams module" >&5
+echo "$as_me:11761: checking for the ppsclock streams module" >&5
 echo $ECHO_N "checking for the ppsclock streams module... $ECHO_C" >&6
 if test "${ac_cv_var_ppsclock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_ppsclock=$ac_cv_struct_ppsclockev
 fi
-echo "$as_me:11624: result: $ac_cv_var_ppsclock" >&5
+echo "$as_me:11768: result: $ac_cv_var_ppsclock" >&5
 echo "${ECHO_T}$ac_cv_var_ppsclock" >&6
 case "$ac_cv_var_ppsclock" in
  yes) cat >>confdefs.h <<\EOF
@@ -11630,7 +11774,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11633: checking for kernel multicast support" >&5
+echo "$as_me:11777: checking for kernel multicast support" >&5
 echo $ECHO_N "checking for kernel multicast support... $ECHO_C" >&6
 if test "${ac_cv_var_mcast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11639,7 +11783,7 @@ else
   case "$target" in
    i386-sequent-sysv4) ;;
    *) cat >conftest.$ac_ext <<_ACEOF
-#line 11642 "configure"
+#line 11786 "configure"
 #include "confdefs.h"
 #include 
 #ifdef IP_ADD_MEMBERSHIP
@@ -11655,7 +11799,7 @@ rm -f conftest*
  ;;
   esac
 fi
-echo "$as_me:11658: result: $ac_cv_var_mcast" >&5
+echo "$as_me:11802: result: $ac_cv_var_mcast" >&5
 echo "${ECHO_T}$ac_cv_var_mcast" >&6
 case "$ac_cv_var_mcast" in
  yes) cat >>confdefs.h <<\EOF
@@ -11664,7 +11808,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:11667: checking availability of ntp_{adj,get}time()" >&5
+echo "$as_me:11811: checking availability of ntp_{adj,get}time()" >&5
 echo $ECHO_N "checking availability of ntp_{adj,get}time()... $ECHO_C" >&6
 if test "${ac_cv_var_ntp_syscalls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11679,7 +11823,7 @@ else
         ac_cv_var_ntp_syscalls=libc
         ;;
       *) cat >conftest.$ac_ext <<_ACEOF
-#line 11682 "configure"
+#line 11826 "configure"
 #include "confdefs.h"
 #include 
 #if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime)
@@ -11698,7 +11842,7 @@ rm -f conftest*
      ;;
  esac
 fi
-echo "$as_me:11701: result: $ac_cv_var_ntp_syscalls" >&5
+echo "$as_me:11845: result: $ac_cv_var_ntp_syscalls" >&5
 echo "${ECHO_T}$ac_cv_var_ntp_syscalls" >&6
 case "$ac_cv_var_ntp_syscalls" in
  libc)
@@ -11717,13 +11861,13 @@ EOF
     ;;
 esac
 
-echo "$as_me:11720: checking if sys/timex.h has STA_FLL" >&5
+echo "$as_me:11864: checking if sys/timex.h has STA_FLL" >&5
 echo $ECHO_N "checking if sys/timex.h has STA_FLL... $ECHO_C" >&6
 if test "${ac_cv_var_sta_fll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11726 "configure"
+#line 11870 "configure"
 #include "confdefs.h"
 #include 
 #ifdef STA_FLL
@@ -11740,10 +11884,10 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:11743: result: $ac_cv_var_sta_fll" >&5
+echo "$as_me:11887: result: $ac_cv_var_sta_fll" >&5
 echo "${ECHO_T}$ac_cv_var_sta_fll" >&6
 
-echo "$as_me:11746: checking if we have kernel PLL support" >&5
+echo "$as_me:11890: checking if we have kernel PLL support" >&5
 echo $ECHO_N "checking if we have kernel PLL support... $ECHO_C" >&6
 if test "${ac_cv_var_kernel_pll+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11756,7 +11900,7 @@ else
     ;;
 esac
 fi
-echo "$as_me:11759: result: $ac_cv_var_kernel_pll" >&5
+echo "$as_me:11903: result: $ac_cv_var_kernel_pll" >&5
 echo "${ECHO_T}$ac_cv_var_kernel_pll" >&6
 case "$ac_cv_var_kernel_pll" in
  yes)
@@ -11767,7 +11911,7 @@ EOF
     ;;
 esac
 
-echo "$as_me:11770: checking if SIOCGIFCONF returns buffer size in the buffer" >&5
+echo "$as_me:11914: checking if SIOCGIFCONF returns buffer size in the buffer" >&5
 echo $ECHO_N "checking if SIOCGIFCONF returns buffer size in the buffer... $ECHO_C" >&6
 if test "${ac_cv_var_size_returned_in_buffer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11786,7 +11930,7 @@ else
   esac
   ac_cv_var_size_returned_in_buffer=$ans
 fi
-echo "$as_me:11789: result: $ac_cv_var_size_returned_in_buffer" >&5
+echo "$as_me:11933: result: $ac_cv_var_size_returned_in_buffer" >&5
 echo "${ECHO_T}$ac_cv_var_size_returned_in_buffer" >&6
 case "$ac_cv_var_size_returned_in_buffer" in
  yes) cat >>confdefs.h <<\EOF
@@ -11796,11 +11940,11 @@ EOF
 esac
 
 # Check for ioctls TIOCGPPSEV
-echo "$as_me:11799: checking ioctl TIOCGPPSEV" >&5
+echo "$as_me:11943: checking ioctl TIOCGPPSEV" >&5
 echo $ECHO_N "checking ioctl TIOCGPPSEV... $ECHO_C" >&6
 if test "$ac_cv_header_termios_h" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 11803 "configure"
+#line 11947 "configure"
 #include "confdefs.h"
 #include 
 #ifdef TIOCGPPSEV
@@ -11826,15 +11970,15 @@ EOF
 
     ac_cv_var_oncore_ok=yes
 fi
-echo "$as_me:11829: result: $ntp_ok" >&5
+echo "$as_me:11973: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for ioctls TIOCSPPS
-echo "$as_me:11833: checking ioctl TIOCSPPS" >&5
+echo "$as_me:11977: checking ioctl TIOCSPPS" >&5
 echo $ECHO_N "checking ioctl TIOCSPPS... $ECHO_C" >&6
 if test "$ac_cv_header_termios_h" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 11837 "configure"
+#line 11981 "configure"
 #include "confdefs.h"
 #include 
 #ifdef TIOCSPPS
@@ -11860,15 +12004,15 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:11863: result: $ntp_ok" >&5
+echo "$as_me:12007: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for ioctls CIOGETEV
-echo "$as_me:11867: checking ioctl CIOGETEV" >&5
+echo "$as_me:12011: checking ioctl CIOGETEV" >&5
 echo $ECHO_N "checking ioctl CIOGETEV... $ECHO_C" >&6
 if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 11871 "configure"
+#line 12015 "configure"
 #include "confdefs.h"
 #include 
 #ifdef CIOGETEV
@@ -11894,7 +12038,7 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:11897: result: $ntp_ok" >&5
+echo "$as_me:12041: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # ATOM/PPSAPI stuff.
@@ -11927,23 +12071,23 @@ EOF
 esac
 
 # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG
-echo "$as_me:11930: checking for linux/serial.h" >&5
+echo "$as_me:12074: checking for linux/serial.h" >&5
 echo $ECHO_N "checking for linux/serial.h... $ECHO_C" >&6
 if test "${ac_cv_header_linux_serial_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11936 "configure"
+#line 12080 "configure"
 #include "confdefs.h"
 #include 
 _ACEOF
-if { (eval echo "$as_me:11940: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12084: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:11946: \$? = $ac_status" >&5
+  echo "$as_me:12090: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11962,15 +12106,15 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11965: result: $ac_cv_header_linux_serial_h" >&5
+echo "$as_me:12109: result: $ac_cv_header_linux_serial_h" >&5
 echo "${ECHO_T}$ac_cv_header_linux_serial_h" >&6
 
-echo "$as_me:11968: checking ioctl TIOCGSERIAL" >&5
+echo "$as_me:12112: checking ioctl TIOCGSERIAL" >&5
 echo $ECHO_N "checking ioctl TIOCGSERIAL... $ECHO_C" >&6
 case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in
   yesyes)
     cat >conftest.$ac_ext <<_ACEOF
-#line 11973 "configure"
+#line 12117 "configure"
 #include "confdefs.h"
 #include 
 typedef int u_int;
@@ -12008,11 +12152,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12011: result: $ntp_ok" >&5
+echo "$as_me:12155: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for SHMEM_STATUS support
-echo "$as_me:12015: checking SHMEM_STATUS support" >&5
+echo "$as_me:12159: checking SHMEM_STATUS support" >&5
 echo $ECHO_N "checking SHMEM_STATUS support... $ECHO_C" >&6
 case "$ac_cv_header_sys_mman_h" in
  yes) ntp_ok=yes ;;
@@ -12024,12 +12168,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12027: result: $ntp_ok" >&5
+echo "$as_me:12171: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 ntp_refclock=no
 
-echo "$as_me:12032: checking for hopf serial clock device" >&5
+echo "$as_me:12176: checking for hopf serial clock device" >&5
 echo $ECHO_N "checking for hopf serial clock device... $ECHO_C" >&6
 # Check whether --enable-HOPFSERIAL or --disable-HOPFSERIAL was given.
 if test "${enable_HOPFSERIAL+set}" = set; then
@@ -12045,10 +12189,10 @@ fi;
 EOF
 
   fi
-  echo "$as_me:12048: result: $ntp_ok" >&5
+  echo "$as_me:12192: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12051: checking for hopf PCI clock 6039" >&5
+echo "$as_me:12195: checking for hopf PCI clock 6039" >&5
 echo $ECHO_N "checking for hopf PCI clock 6039... $ECHO_C" >&6
 # Check whether --enable-HOPFPCI or --disable-HOPFPCI was given.
 if test "${enable_HOPFPCI+set}" = set; then
@@ -12064,11 +12208,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12067: result: $ntp_ok" >&5
+echo "$as_me:12211: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # HPUX only, and by explicit request
-echo "$as_me:12071: checking Datum/Bancomm bc635/VME interface" >&5
+echo "$as_me:12215: checking Datum/Bancomm bc635/VME interface" >&5
 echo $ECHO_N "checking Datum/Bancomm bc635/VME interface... $ECHO_C" >&6
 # Check whether --enable-BANCOMM or --disable-BANCOMM was given.
 if test "${enable_BANCOMM+set}" = set; then
@@ -12084,16 +12228,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12087: result: $ntp_ok" >&5
+echo "$as_me:12231: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
  yes*-*-hpux*) ;;
- yes*) { echo "$as_me:12091: WARNING: *** But the expected answer is... no ***" >&5
+ yes*) { echo "$as_me:12235: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
 #HPUX only, and only by explicit request
-echo "$as_me:12096: checking TrueTime GPS receiver/VME interface" >&5
+echo "$as_me:12240: checking TrueTime GPS receiver/VME interface" >&5
 echo $ECHO_N "checking TrueTime GPS receiver/VME interface... $ECHO_C" >&6
 # Check whether --enable-GPSVME or --disable-GPSVME was given.
 if test "${enable_GPSVME+set}" = set; then
@@ -12109,15 +12253,15 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12112: result: $ntp_ok" >&5
+echo "$as_me:12256: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
  yes*-*-hpux*) ;;
- yes*) { echo "$as_me:12116: WARNING: *** But the expected answer is... no ***" >&5
+ yes*) { echo "$as_me:12260: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
-echo "$as_me:12120: checking for PCL720 clock support" >&5
+echo "$as_me:12264: checking for PCL720 clock support" >&5
 echo $ECHO_N "checking for PCL720 clock support... $ECHO_C" >&6
 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in
  yesyesyes)
@@ -12131,10 +12275,10 @@ EOF
     ans=no
     ;;
 esac
-echo "$as_me:12134: result: $ans" >&5
+echo "$as_me:12278: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:12137: checking for SHM clock attached thru shared memory" >&5
+echo "$as_me:12281: checking for SHM clock attached thru shared memory" >&5
 echo $ECHO_N "checking for SHM clock attached thru shared memory... $ECHO_C" >&6
 # Check whether --enable-SHM or --disable-SHM was given.
 if test "${enable_SHM+set}" = set; then
@@ -12150,10 +12294,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12153: result: $ntp_ok" >&5
+echo "$as_me:12297: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12156: checking for default inclusion of all suitable non-PARSE clocks" >&5
+echo "$as_me:12300: checking for default inclusion of all suitable non-PARSE clocks" >&5
 echo $ECHO_N "checking for default inclusion of all suitable non-PARSE clocks... $ECHO_C" >&6
 # Check whether --enable-all-clocks or --disable-all-clocks was given.
 if test "${enable_all_clocks+set}" = set; then
@@ -12162,10 +12306,10 @@ if test "${enable_all_clocks+set}" = set; then
 else
   ntp_eac=yes
 fi;
-echo "$as_me:12165: result: $ntp_eac" >&5
+echo "$as_me:12309: result: $ntp_eac" >&5
 echo "${ECHO_T}$ntp_eac" >&6
 
-echo "$as_me:12168: checking if we have support for PARSE clocks" >&5
+echo "$as_me:12312: checking if we have support for PARSE clocks" >&5
 echo $ECHO_N "checking if we have support for PARSE clocks... $ECHO_C" >&6
 case "$ac_cv_var_atom_ok$ac_cv_header_termio_h$ac_cv_header_termios_h" in
  yes*yes*)
@@ -12174,10 +12318,10 @@ case "$ac_cv_var_atom_ok$ac_cv_header_termio_h$ac_cv_header_termios_h" in
  *) ntp_canparse=no
     ;;
 esac
-echo "$as_me:12177: result: $ntp_canparse" >&5
+echo "$as_me:12321: result: $ntp_canparse" >&5
 echo "${ECHO_T}$ntp_canparse" >&6
 
-echo "$as_me:12180: checking if we have support for audio clocks" >&5
+echo "$as_me:12324: checking if we have support for audio clocks" >&5
 echo $ECHO_N "checking if we have support for audio clocks... $ECHO_C" >&6
 case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
  *yes*)
@@ -12190,11 +12334,11 @@ EOF
     ;;
  *) ntp_canaudio=no ;;
 esac
-echo "$as_me:12193: result: $ntp_canaudio" >&5
+echo "$as_me:12337: result: $ntp_canaudio" >&5
 echo "${ECHO_T}$ntp_canaudio" >&6
 
 # Requires modem control
-echo "$as_me:12197: checking ACTS modem service" >&5
+echo "$as_me:12341: checking ACTS modem service" >&5
 echo $ECHO_N "checking ACTS modem service... $ECHO_C" >&6
 # Check whether --enable-ACTS or --disable-ACTS was given.
 if test "${enable_ACTS+set}" = set; then
@@ -12202,7 +12346,7 @@ if test "${enable_ACTS+set}" = set; then
   ntp_ok=$enableval
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12205 "configure"
+#line 12349 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_SYS_IOCTL_H
@@ -12229,10 +12373,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12232: result: $ntp_ok" >&5
+echo "$as_me:12376: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12235: checking Arbiter 1088A/B GPS receiver" >&5
+echo "$as_me:12379: checking Arbiter 1088A/B GPS receiver" >&5
 echo $ECHO_N "checking Arbiter 1088A/B GPS receiver... $ECHO_C" >&6
 # Check whether --enable-ARBITER or --disable-ARBITER was given.
 if test "${enable_ARBITER+set}" = set; then
@@ -12248,10 +12392,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12251: result: $ntp_ok" >&5
+echo "$as_me:12395: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12254: checking Arcron MSF receiver" >&5
+echo "$as_me:12398: checking Arcron MSF receiver" >&5
 echo $ECHO_N "checking Arcron MSF receiver... $ECHO_C" >&6
 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given.
 if test "${enable_ARCRON_MSF+set}" = set; then
@@ -12267,10 +12411,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12270: result: $ntp_ok" >&5
+echo "$as_me:12414: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12273: checking ATOM PPS interface" >&5
+echo "$as_me:12417: checking ATOM PPS interface" >&5
 echo $ECHO_N "checking ATOM PPS interface... $ECHO_C" >&6
 # Check whether --enable-ATOM or --disable-ATOM was given.
 if test "${enable_ATOM+set}" = set; then
@@ -12289,10 +12433,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12292: result: $ntp_ok" >&5
+echo "$as_me:12436: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12295: checking Austron 2200A/2201A GPS receiver" >&5
+echo "$as_me:12439: checking Austron 2200A/2201A GPS receiver" >&5
 echo $ECHO_N "checking Austron 2200A/2201A GPS receiver... $ECHO_C" >&6
 # Check whether --enable-AS2201 or --disable-AS2201 was given.
 if test "${enable_AS2201+set}" = set; then
@@ -12308,10 +12452,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12311: result: $ntp_ok" >&5
+echo "$as_me:12455: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12314: checking CHU modem/decoder" >&5
+echo "$as_me:12458: checking CHU modem/decoder" >&5
 echo $ECHO_N "checking CHU modem/decoder... $ECHO_C" >&6
 # Check whether --enable-CHU or --disable-CHU was given.
 if test "${enable_CHU+set}" = set; then
@@ -12327,11 +12471,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12330: result: $ntp_ok" >&5
+echo "$as_me:12474: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 ac_refclock_chu=$ntp_ok
 
-echo "$as_me:12334: checking CHU audio/decoder" >&5
+echo "$as_me:12478: checking CHU audio/decoder" >&5
 echo $ECHO_N "checking CHU audio/decoder... $ECHO_C" >&6
 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given.
 if test "${enable_AUDIO_CHU+set}" = set; then
@@ -12349,16 +12493,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12352: result: $ntp_ok" >&5
+echo "$as_me:12496: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 # We used to check for sunos/solaris target...
 case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in
- yes*no*) { echo "$as_me:12356: WARNING: *** But the expected answer is...no ***" >&5
+ yes*no*) { echo "$as_me:12500: WARNING: *** But the expected answer is...no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is...no ***" >&2;} ;;
 esac
 
 # Not under HP-UX
-echo "$as_me:12361: checking Datum Programmable Time System" >&5
+echo "$as_me:12505: checking Datum Programmable Time System" >&5
 echo $ECHO_N "checking Datum Programmable Time System... $ECHO_C" >&6
 # Check whether --enable-DATUM or --disable-DATUM was given.
 if test "${enable_DATUM+set}" = set; then
@@ -12380,10 +12524,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12383: result: $ntp_ok" >&5
+echo "$as_me:12527: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12386: checking Forum Graphic GPS" >&5
+echo "$as_me:12530: checking Forum Graphic GPS" >&5
 echo $ECHO_N "checking Forum Graphic GPS... $ECHO_C" >&6
 # Check whether --enable-FG or --disable-FG was given.
 if test "${enable_FG+set}" = set; then
@@ -12399,11 +12543,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12402: result: $ntp_ok" >&5
+echo "$as_me:12546: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Requires modem control
-echo "$as_me:12406: checking Heath GC-1000 WWV/WWVH receiver" >&5
+echo "$as_me:12550: checking Heath GC-1000 WWV/WWVH receiver" >&5
 echo $ECHO_N "checking Heath GC-1000 WWV/WWVH receiver... $ECHO_C" >&6
 # Check whether --enable-HEATH or --disable-HEATH was given.
 if test "${enable_HEATH+set}" = set; then
@@ -12411,7 +12555,7 @@ if test "${enable_HEATH+set}" = set; then
   ntp_ok=$enableval
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12414 "configure"
+#line 12558 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_SYS_IOCTL_H
@@ -12438,10 +12582,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12441: result: $ntp_ok" >&5
+echo "$as_me:12585: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12444: checking HP 58503A GPS receiver" >&5
+echo "$as_me:12588: checking HP 58503A GPS receiver" >&5
 echo $ECHO_N "checking HP 58503A GPS receiver... $ECHO_C" >&6
 # Check whether --enable-HPGPS or --disable-HPGPS was given.
 if test "${enable_HPGPS+set}" = set; then
@@ -12457,10 +12601,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12460: result: $ntp_ok" >&5
+echo "$as_me:12604: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12463: checking Sun IRIG audio decoder" >&5
+echo "$as_me:12607: checking Sun IRIG audio decoder" >&5
 echo $ECHO_N "checking Sun IRIG audio decoder... $ECHO_C" >&6
 # Check whether --enable-IRIG or --disable-IRIG was given.
 if test "${enable_IRIG+set}" = set; then
@@ -12479,14 +12623,33 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12482: result: $ntp_ok" >&5
+echo "$as_me:12626: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canaudio" in
- yesno) { echo "$as_me:12485: WARNING: *** But the expected answer is... no ***" >&5
+ yesno) { echo "$as_me:12629: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
-echo "$as_me:12489: checking Leitch CSD 5300 Master Clock System Driver" >&5
+echo "$as_me:12633: checking for JJY receiver" >&5
+echo $ECHO_N "checking for JJY receiver... $ECHO_C" >&6
+# Check whether --enable-JJY or --disable-JJY was given.
+if test "${enable_JJY+set}" = set; then
+  enableval="$enable_JJY"
+  ntp_ok=$enableval
+else
+  ntp_ok=$ntp_eac
+fi;
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+    cat >>confdefs.h <<\EOF
+#define CLOCK_JJY 1
+EOF
+
+fi
+echo "$as_me:12649: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
+
+echo "$as_me:12652: checking Leitch CSD 5300 Master Clock System Driver" >&5
 echo $ECHO_N "checking Leitch CSD 5300 Master Clock System Driver... $ECHO_C" >&6
 # Check whether --enable-LEITCH or --disable-LEITCH was given.
 if test "${enable_LEITCH+set}" = set; then
@@ -12502,10 +12665,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12505: result: $ntp_ok" >&5
+echo "$as_me:12668: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12508: checking local clock reference" >&5
+echo "$as_me:12671: checking local clock reference" >&5
 echo $ECHO_N "checking local clock reference... $ECHO_C" >&6
 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given.
 if test "${enable_LOCAL_CLOCK+set}" = set; then
@@ -12521,10 +12684,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12524: result: $ntp_ok" >&5
+echo "$as_me:12687: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12527: checking EES M201 MSF receiver" >&5
+echo "$as_me:12690: checking EES M201 MSF receiver" >&5
 echo $ECHO_N "checking EES M201 MSF receiver... $ECHO_C" >&6
 # Check whether --enable-MSFEES or --disable-MSFEES was given.
 if test "${enable_MSFEES+set}" = set; then
@@ -12540,11 +12703,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12543: result: $ntp_ok" >&5
+echo "$as_me:12706: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Not Ultrix
-echo "$as_me:12547: checking Magnavox MX4200 GPS receiver" >&5
+echo "$as_me:12710: checking Magnavox MX4200 GPS receiver" >&5
 echo $ECHO_N "checking Magnavox MX4200 GPS receiver... $ECHO_C" >&6
 # Check whether --enable-MX4200 or --disable-MX4200 was given.
 if test "${enable_MX4200+set}" = set; then
@@ -12565,14 +12728,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12568: result: $ntp_ok" >&5
+echo "$as_me:12731: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yes*-*-ultrix*) { echo "$as_me:12571: WARNING: *** But the expected answer is... no ***" >&5
+ yes*-*-ultrix*) { echo "$as_me:12734: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
-echo "$as_me:12575: checking NMEA GPS receiver" >&5
+echo "$as_me:12738: checking NMEA GPS receiver" >&5
 echo $ECHO_N "checking NMEA GPS receiver... $ECHO_C" >&6
 # Check whether --enable-NMEA or --disable-NMEA was given.
 if test "${enable_NMEA+set}" = set; then
@@ -12588,10 +12751,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12591: result: $ntp_ok" >&5
+echo "$as_me:12754: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12594: checking for ONCORE Motorola VP/UT Oncore GPS" >&5
+echo "$as_me:12757: checking for ONCORE Motorola VP/UT Oncore GPS" >&5
 echo $ECHO_N "checking for ONCORE Motorola VP/UT Oncore GPS... $ECHO_C" >&6
 # Check whether --enable-ONCORE or --disable-ONCORE was given.
 if test "${enable_ONCORE+set}" = set; then
@@ -12610,10 +12773,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12613: result: $ntp_ok" >&5
+echo "$as_me:12776: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12616: checking for Palisade clock" >&5
+echo "$as_me:12779: checking for Palisade clock" >&5
 echo $ECHO_N "checking for Palisade clock... $ECHO_C" >&6
 # Check whether --enable-PALISADE or --disable-PALISADE was given.
 if test "${enable_PALISADE+set}" = set; then
@@ -12636,10 +12799,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12639: result: $ntp_ok" >&5
+echo "$as_me:12802: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12642: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
+echo "$as_me:12805: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
 echo $ECHO_N "checking PST/Traconex 1020 WWV/WWVH receiver... $ECHO_C" >&6
 # Check whether --enable-PST or --disable-PST was given.
 if test "${enable_PST+set}" = set; then
@@ -12655,11 +12818,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12658: result: $ntp_ok" >&5
+echo "$as_me:12821: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Not Ultrix
-echo "$as_me:12662: checking Rockwell Jupiter GPS receiver" >&5
+echo "$as_me:12825: checking Rockwell Jupiter GPS receiver" >&5
 echo $ECHO_N "checking Rockwell Jupiter GPS receiver... $ECHO_C" >&6
 # Check whether --enable-JUPITER or --disable-JUPITER was given.
 if test "${enable_JUPITER+set}" = set; then
@@ -12680,15 +12843,15 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12683: result: $ntp_ok" >&5
+echo "$as_me:12846: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yes*-*-ultrix*) { echo "$as_me:12686: WARNING: *** But the expected answer is... no ***" >&5
+ yes*-*-ultrix*) { echo "$as_me:12849: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
 # Requires modem control
-echo "$as_me:12691: checking PTB modem service" >&5
+echo "$as_me:12854: checking PTB modem service" >&5
 echo $ECHO_N "checking PTB modem service... $ECHO_C" >&6
 # Check whether --enable-PTBACTS or --disable-PTBACTS was given.
 if test "${enable_PTBACTS+set}" = set; then
@@ -12696,7 +12859,7 @@ if test "${enable_PTBACTS+set}" = set; then
   ntp_ok=$enableval
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12699 "configure"
+#line 12862 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_SYS_IOCTL_H
@@ -12723,10 +12886,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12726: result: $ntp_ok" >&5
+echo "$as_me:12889: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12729: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
+echo "$as_me:12892: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
 echo $ECHO_N "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface... $ECHO_C" >&6
 # Check whether --enable-TPRO or --disable-TPRO was given.
 if test "${enable_TPRO+set}" = set; then
@@ -12748,14 +12911,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12751: result: $ntp_ok" >&5
+echo "$as_me:12914: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ac_cv_header_sys_tpro" in
- yesno) { echo "$as_me:12754: WARNING: *** But the expected answer is... no ***" >&5
+ yesno) { echo "$as_me:12917: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
-echo "$as_me:12758: checking TRAK 8810 GPS receiver" >&5
+echo "$as_me:12921: checking TRAK 8810 GPS receiver" >&5
 echo $ECHO_N "checking TRAK 8810 GPS receiver... $ECHO_C" >&6
 # Check whether --enable-TRAK or --disable-TRAK was given.
 if test "${enable_TRAK+set}" = set; then
@@ -12771,10 +12934,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12774: result: $ntp_ok" >&5
+echo "$as_me:12937: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12777: checking Chrono-log K-series WWVB receiver" >&5
+echo "$as_me:12940: checking Chrono-log K-series WWVB receiver" >&5
 echo $ECHO_N "checking Chrono-log K-series WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-CHRONOLOG or --disable-CHRONOLOG was given.
 if test "${enable_CHRONOLOG+set}" = set; then
@@ -12790,10 +12953,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12793: result: $ntp_ok" >&5
+echo "$as_me:12956: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12796: checking Dumb generic hh:mm:ss local clock" >&5
+echo "$as_me:12959: checking Dumb generic hh:mm:ss local clock" >&5
 echo $ECHO_N "checking Dumb generic hh:mm:ss local clock... $ECHO_C" >&6
 # Check whether --enable-DUMBCLOCK or --disable-DUMBCLOCK was given.
 if test "${enable_DUMBCLOCK+set}" = set; then
@@ -12809,10 +12972,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12812: result: $ntp_ok" >&5
+echo "$as_me:12975: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12815: checking Conrad parallel port radio clock" >&5
+echo "$as_me:12978: checking Conrad parallel port radio clock" >&5
 echo $ECHO_N "checking Conrad parallel port radio clock... $ECHO_C" >&6
 # Check whether --enable-PCF or --disable-PCF was given.
 if test "${enable_PCF+set}" = set; then
@@ -12828,10 +12991,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12831: result: $ntp_ok" >&5
+echo "$as_me:12994: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12834: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
+echo "$as_me:12997: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
 echo $ECHO_N "checking Spectracom 8170/Netclock/2 WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-SPECTRACOM or --disable-SPECTRACOM was given.
 if test "${enable_SPECTRACOM+set}" = set; then
@@ -12847,11 +13010,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12850: result: $ntp_ok" >&5
+echo "$as_me:13013: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
 # Not on a vax-dec-bsd
-echo "$as_me:12854: checking Kinemetrics/TrueTime receivers" >&5
+echo "$as_me:13017: checking Kinemetrics/TrueTime receivers" >&5
 echo $ECHO_N "checking Kinemetrics/TrueTime receivers... $ECHO_C" >&6
 # Check whether --enable-TRUETIME or --disable-TRUETIME was given.
 if test "${enable_TRUETIME+set}" = set; then
@@ -12874,14 +13037,34 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12877: result: $ntp_ok" >&5
+echo "$as_me:13040: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yesvax-dec-bsd) { echo "$as_me:12880: WARNING: *** But the expected answer is... no ***" >&5
+ yesvax-dec-bsd) { echo "$as_me:13043: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
-echo "$as_me:12884: checking Ultralink M320 WWVB receiver" >&5
+echo "$as_me:13047: checking TrueTime 560 IRIG-B decoder" >&5
+echo $ECHO_N "checking TrueTime 560 IRIG-B decoder... $ECHO_C" >&6
+# Check whether --enable-TT560 or --disable-TT560 was given.
+if test "${enable_TT560+set}" = set; then
+  enableval="$enable_TT560"
+  ntp_ok=$enableval
+else
+  ntp_ok=no
+fi;
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+
+cat >>confdefs.h <<\EOF
+#define CLOCK_TT560
+EOF
+
+fi
+echo "$as_me:13064: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
+
+echo "$as_me:13067: checking Ultralink M320 WWVB receiver" >&5
 echo $ECHO_N "checking Ultralink M320 WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-ULINK or --disable-ULINK was given.
 if test "${enable_ULINK+set}" = set; then
@@ -12897,10 +13080,10 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12900: result: $ntp_ok" >&5
+echo "$as_me:13083: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12903: checking WWV receiver" >&5
+echo "$as_me:13086: checking WWV receiver" >&5
 echo $ECHO_N "checking WWV receiver... $ECHO_C" >&6
 # Check whether --enable-WWV or --disable-WWV was given.
 if test "${enable_WWV+set}" = set; then
@@ -12919,15 +13102,15 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12922: result: $ntp_ok" >&5
+echo "$as_me:13105: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canaudio" in
- yesno) { echo "$as_me:12925: WARNING: *** But the expected answer is... no ***" >&5
+ yesno) { echo "$as_me:13108: WARNING: *** But the expected answer is... no ***" >&5
 echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;;
 esac
 
 # Requires modem control
-echo "$as_me:12930: checking USNO modem service" >&5
+echo "$as_me:13113: checking USNO modem service" >&5
 echo $ECHO_N "checking USNO modem service... $ECHO_C" >&6
 # Check whether --enable-USNO or --disable-USNO was given.
 if test "${enable_USNO+set}" = set; then
@@ -12935,7 +13118,7 @@ if test "${enable_USNO+set}" = set; then
   ntp_ok=$enableval
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12938 "configure"
+#line 13121 "configure"
 #include "confdefs.h"
 #include 
 #ifdef HAVE_SYS_IOCTL_H
@@ -12962,10 +13145,30 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:12965: result: $ntp_ok" >&5
+echo "$as_me:13148: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
+
+echo "$as_me:13151: checking for Zyfer receiver" >&5
+echo $ECHO_N "checking for Zyfer receiver... $ECHO_C" >&6
+# Check whether --enable-ZYFER or --disable-ZYFER was given.
+if test "${enable_ZYFER+set}" = set; then
+  enableval="$enable_ZYFER"
+  ntp_ok=$enableval
+else
+  ntp_ok=$ntp_eac
+fi;
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+
+cat >>confdefs.h <<\EOF
+#define CLOCK_ZYFER 1
+EOF
+
+fi
+echo "$as_me:13168: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 
-echo "$as_me:12968: checking for default inclusion of all suitable PARSE clocks" >&5
+echo "$as_me:13171: checking for default inclusion of all suitable PARSE clocks" >&5
 echo $ECHO_N "checking for default inclusion of all suitable PARSE clocks... $ECHO_C" >&6
 # Check whether --enable-parse-clocks or --disable-parse-clocks was given.
 if test "${enable_parse_clocks+set}" = set; then
@@ -12978,17 +13181,17 @@ else
     esac
     ntp_eapc=no
 fi;
-echo "$as_me:12981: result: $ntp_eapc" >&5
+echo "$as_me:13184: result: $ntp_eapc" >&5
 echo "${ECHO_T}$ntp_eapc" >&6
 
 case "$ntp_eac$ntp_eapc$ntp_canparse" in
  noyes*)
-    { { echo "$as_me:12986: error: \"--enable-parse-clocks\" requires \"--enable-all-clocks\"." >&5
+    { { echo "$as_me:13189: error: \"--enable-parse-clocks\" requires \"--enable-all-clocks\"." >&5
 echo "$as_me: error: \"--enable-parse-clocks\" requires \"--enable-all-clocks\"." >&2;}
    { (exit 1); exit 1; }; }
     ;;
  yesyesno)
-    { { echo "$as_me:12991: error: You said \"--enable-parse-clocks\" but PARSE isn't supported on this platform!" >&5
+    { { echo "$as_me:13194: error: You said \"--enable-parse-clocks\" but PARSE isn't supported on this platform!" >&5
 echo "$as_me: error: You said \"--enable-parse-clocks\" but PARSE isn't supported on this platform!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
@@ -12999,7 +13202,7 @@ ntp_libparse=no
 ntp_parseutil=no
 ntp_rawdcf=no
 
-echo "$as_me:13002: checking Diem Computime Radio Clock" >&5
+echo "$as_me:13205: checking Diem Computime Radio Clock" >&5
 echo $ECHO_N "checking Diem Computime Radio Clock... $ECHO_C" >&6
 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given.
 if test "${enable_COMPUTIME+set}" = set; then
@@ -13016,17 +13219,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13019: result: $ntp_ok" >&5
+echo "$as_me:13222: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13023: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13226: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13029: checking ELV/DCF7000 clock" >&5
+echo "$as_me:13232: checking ELV/DCF7000 clock" >&5
 echo $ECHO_N "checking ELV/DCF7000 clock... $ECHO_C" >&6
 # Check whether --enable-DCF7000 or --disable-DCF7000 was given.
 if test "${enable_DCF7000+set}" = set; then
@@ -13043,17 +13246,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13046: result: $ntp_ok" >&5
+echo "$as_me:13249: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13050: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13253: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13056: checking HOPF 6021 clock" >&5
+echo "$as_me:13259: checking HOPF 6021 clock" >&5
 echo $ECHO_N "checking HOPF 6021 clock... $ECHO_C" >&6
 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given.
 if test "${enable_HOPF6021+set}" = set; then
@@ -13070,17 +13273,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13073: result: $ntp_ok" >&5
+echo "$as_me:13276: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13077: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13280: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13083: checking Meinberg clocks" >&5
+echo "$as_me:13286: checking Meinberg clocks" >&5
 echo $ECHO_N "checking Meinberg clocks... $ECHO_C" >&6
 # Check whether --enable-MEINBERG or --disable-MEINBERG was given.
 if test "${enable_MEINBERG+set}" = set; then
@@ -13097,17 +13300,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13100: result: $ntp_ok" >&5
+echo "$as_me:13303: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13104: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13307: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13110: checking DCF77 raw time code" >&5
+echo "$as_me:13313: checking DCF77 raw time code" >&5
 echo $ECHO_N "checking DCF77 raw time code... $ECHO_C" >&6
 # Check whether --enable-RAWDCF or --disable-RAWDCF was given.
 if test "${enable_RAWDCF+set}" = set; then
@@ -13126,11 +13329,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13129: result: $ntp_ok" >&5
+echo "$as_me:13332: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13133: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13336: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
@@ -13138,7 +13341,7 @@ esac
 
 case "$ntp_rawdcf" in
  yes)
-    echo "$as_me:13141: checking if we must enable parity for RAWDCF" >&5
+    echo "$as_me:13344: checking if we must enable parity for RAWDCF" >&5
 echo $ECHO_N "checking if we must enable parity for RAWDCF... $ECHO_C" >&6
 if test "${ac_cv_var_rawdcf_parity+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13151,7 +13354,7 @@ else
     esac
     ac_cv_var_rawdcf_parity=$ans
 fi
-echo "$as_me:13154: result: $ac_cv_var_rawdcf_parity" >&5
+echo "$as_me:13357: result: $ac_cv_var_rawdcf_parity" >&5
 echo "${ECHO_T}$ac_cv_var_rawdcf_parity" >&6
     case "$ac_cv_var_rawdcf_parity" in
      yes) cat >>confdefs.h <<\EOF
@@ -13166,7 +13369,7 @@ EOF
     ;;
 esac
 
-echo "$as_me:13169: checking RCC 8000 clock" >&5
+echo "$as_me:13372: checking RCC 8000 clock" >&5
 echo $ECHO_N "checking RCC 8000 clock... $ECHO_C" >&6
 # Check whether --enable-RCC8000 or --disable-RCC8000 was given.
 if test "${enable_RCC8000+set}" = set; then
@@ -13183,17 +13386,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13186: result: $ntp_ok" >&5
+echo "$as_me:13389: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13190: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13393: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13196: checking Schmid DCF77 clock" >&5
+echo "$as_me:13399: checking Schmid DCF77 clock" >&5
 echo $ECHO_N "checking Schmid DCF77 clock... $ECHO_C" >&6
 # Check whether --enable-SCHMID or --disable-SCHMID was given.
 if test "${enable_SCHMID+set}" = set; then
@@ -13210,17 +13413,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13213: result: $ntp_ok" >&5
+echo "$as_me:13416: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13217: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13420: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13223: checking Trimble GPS receiver/TAIP protocol" >&5
+echo "$as_me:13426: checking Trimble GPS receiver/TAIP protocol" >&5
 echo $ECHO_N "checking Trimble GPS receiver/TAIP protocol... $ECHO_C" >&6
 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given.
 if test "${enable_TRIMTAIP+set}" = set; then
@@ -13237,17 +13440,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13240: result: $ntp_ok" >&5
+echo "$as_me:13443: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13244: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13447: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13250: checking Trimble GPS receiver/TSIP protocol" >&5
+echo "$as_me:13453: checking Trimble GPS receiver/TSIP protocol" >&5
 echo $ECHO_N "checking Trimble GPS receiver/TSIP protocol... $ECHO_C" >&6
 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given.
 if test "${enable_TRIMTSIP+set}" = set; then
@@ -13264,17 +13467,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13267: result: $ntp_ok" >&5
+echo "$as_me:13470: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13271: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13474: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13277: checking WHARTON 400A Series clock" >&5
+echo "$as_me:13480: checking WHARTON 400A Series clock" >&5
 echo $ECHO_N "checking WHARTON 400A Series clock... $ECHO_C" >&6
 # Check whether --enable-WHARTON or --disable-WHARTON was given.
 if test "${enable_WHARTON+set}" = set; then
@@ -13291,17 +13494,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13294: result: $ntp_ok" >&5
+echo "$as_me:13497: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13298: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13501: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13304: checking VARITEXT clock" >&5
+echo "$as_me:13507: checking VARITEXT clock" >&5
 echo $ECHO_N "checking VARITEXT clock... $ECHO_C" >&6
 # Check whether --enable-VARITEXT or --disable-VARITEXT was given.
 if test "${enable_VARITEXT+set}" = set; then
@@ -13318,17 +13521,17 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13321: result: $ntp_ok" >&5
+echo "$as_me:13524: result: $ntp_ok" >&5
 echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { { echo "$as_me:13325: error: That's a parse clock and this system doesn't support it!" >&5
+    { { echo "$as_me:13528: error: That's a parse clock and this system doesn't support it!" >&5
 echo "$as_me: error: That's a parse clock and this system doesn't support it!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:13331: checking if we need to make and use the parse libraries" >&5
+echo "$as_me:13534: checking if we need to make and use the parse libraries" >&5
 echo $ECHO_N "checking if we need to make and use the parse libraries... $ECHO_C" >&6
 ans=no
 case "$ntp_libparse" in
@@ -13351,10 +13554,10 @@ EOF
 
     ;;
 esac
-echo "$as_me:13354: result: $ans" >&5
+echo "$as_me:13557: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13357: checking for openssl library directory" >&5
+echo "$as_me:13560: checking for openssl library directory" >&5
 echo $ECHO_N "checking for openssl library directory... $ECHO_C" >&6
 
 # Check whether --with-openssl-libdir or --without-openssl-libdir was given.
@@ -13390,10 +13593,10 @@ case "$ans" in
     esac
     ;;
 esac
-echo "$as_me:13393: result: $ans" >&5
+echo "$as_me:13596: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13396: checking for openssl include directory" >&5
+echo "$as_me:13599: checking for openssl include directory" >&5
 echo $ECHO_N "checking for openssl include directory... $ECHO_C" >&6
 
 # Check whether --with-openssl-incdir or --without-openssl-incdir was given.
@@ -13429,10 +13632,10 @@ case "$ans" in
     esac
     ;;
 esac
-echo "$as_me:13432: result: $ans" >&5
+echo "$as_me:13635: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13435: checking for the level of crypto support" >&5
+echo "$as_me:13638: checking for the level of crypto support" >&5
 echo $ECHO_N "checking for the level of crypto support... $ECHO_C" >&6
 
 # Check whether --with-crypto or --without-crypto was given.
@@ -13512,6 +13715,22 @@ EOF
     ;;
 esac
 
+if test x$RSADIR = xrsaref2; then
+  isRSAREF_TRUE=
+  isRSAREF_FALSE='#'
+else
+  isRSAREF_TRUE='#'
+  isRSAREF_FALSE=
+fi
+
+if test x$RSADIR = xrsaeuro1; then
+  isRSAEURO_TRUE=
+  isRSAEURO_FALSE='#'
+else
+  isRSAEURO_TRUE='#'
+  isRSAEURO_FALSE=
+fi
+
 case "$ans" in
  no) ;;
  *)
@@ -13523,10 +13742,10 @@ EOF
     AUTOKEY=1
     ;;
 esac
-echo "$as_me:13526: result: $ans" >&5
+echo "$as_me:13745: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13529: checking if we want to compile with ElectricFence" >&5
+echo "$as_me:13748: checking if we want to compile with ElectricFence" >&5
 echo $ECHO_N "checking if we want to compile with ElectricFence... $ECHO_C" >&6
 
 # Check whether --with-electricfence or --without-electricfence was given.
@@ -13547,10 +13766,10 @@ case "$ans" in
     ans=yes
     ;;
 esac
-echo "$as_me:13550: result: $ans" >&5
+echo "$as_me:13769: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13553: checking if we can make dcf parse utilities" >&5
+echo "$as_me:13772: checking if we can make dcf parse utilities" >&5
 echo $ECHO_N "checking if we can make dcf parse utilities... $ECHO_C" >&6
 ans=no
 if test "$ntp_parseutil" = "yes"; then
@@ -13562,10 +13781,10 @@ if test "$ntp_parseutil" = "yes"; then
 	;;
     esac
 fi
-echo "$as_me:13565: result: $ans" >&5
+echo "$as_me:13784: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13568: checking if we can build kernel streams modules for parse" >&5
+echo "$as_me:13787: checking if we can build kernel streams modules for parse" >&5
 echo $ECHO_N "checking if we can build kernel streams modules for parse... $ECHO_C" >&6
 ans=no
 case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in
@@ -13590,10 +13809,10 @@ EOF
     esac
     ;;
 esac
-echo "$as_me:13593: result: $ans" >&5
+echo "$as_me:13812: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13596: checking if we need basic refclock support" >&5
+echo "$as_me:13815: checking if we need basic refclock support" >&5
 echo $ECHO_N "checking if we need basic refclock support... $ECHO_C" >&6
 if test "$ntp_refclock" = "yes"; then
     cat >>confdefs.h <<\EOF
@@ -13601,10 +13820,10 @@ if test "$ntp_refclock" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13604: result: $ntp_refclock" >&5
+echo "$as_me:13823: result: $ntp_refclock" >&5
 echo "${ECHO_T}$ntp_refclock" >&6
 
-echo "$as_me:13607: checking if we want HP-UX adjtimed support" >&5
+echo "$as_me:13826: checking if we want HP-UX adjtimed support" >&5
 echo $ECHO_N "checking if we want HP-UX adjtimed support... $ECHO_C" >&6
 case "$target" in
  *-*-hpux[56789]*)
@@ -13620,10 +13839,10 @@ if test "$ans" = "yes"; then
 EOF
 
 fi
-echo "$as_me:13623: result: $ans" >&5
+echo "$as_me:13842: result: $ans" >&5
 echo "${ECHO_T}$ans" >&6
 
-echo "$as_me:13626: checking if we can read kmem" >&5
+echo "$as_me:13845: checking if we can read kmem" >&5
 echo $ECHO_N "checking if we can read kmem... $ECHO_C" >&6
 if test "${ac_cv_var_can_kmem+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13664,7 +13883,7 @@ else
 fi;
 ac_cv_var_can_kmem=$ans
 fi
-echo "$as_me:13667: result: $ac_cv_var_can_kmem" >&5
+echo "$as_me:13886: result: $ac_cv_var_can_kmem" >&5
 echo "${ECHO_T}$ac_cv_var_can_kmem" >&6
 
 case "$ac_cv_var_can_kmem" in
@@ -13675,7 +13894,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:13678: checking if adjtime is accurate" >&5
+echo "$as_me:13897: checking if adjtime is accurate" >&5
 echo $ECHO_N "checking if adjtime is accurate... $ECHO_C" >&6
 if test "${ac_cv_var_adjtime_is_accurate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13717,7 +13936,7 @@ else
 fi;
 ac_cv_var_adjtime_is_accurate=$ans
 fi
-echo "$as_me:13720: result: $ac_cv_var_adjtime_is_accurate" >&5
+echo "$as_me:13939: result: $ac_cv_var_adjtime_is_accurate" >&5
 echo "${ECHO_T}$ac_cv_var_adjtime_is_accurate" >&6
 case "$ac_cv_var_adjtime_is_accurate" in
  yes) cat >>confdefs.h <<\EOF
@@ -13726,7 +13945,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:13729: checking the name of 'tick' in the kernel" >&5
+echo "$as_me:13948: checking the name of 'tick' in the kernel" >&5
 echo $ECHO_N "checking the name of 'tick' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_tick+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13745,6 +13964,9 @@ case "$target" in
  *-ibm-aix[34]*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=tick
     ;;
@@ -13760,7 +13982,7 @@ case "$target" in
 esac
 ac_cv_var_nlist_tick=$ans
 fi
-echo "$as_me:13763: result: $ac_cv_var_nlist_tick" >&5
+echo "$as_me:13985: result: $ac_cv_var_nlist_tick" >&5
 echo "${ECHO_T}$ac_cv_var_nlist_tick" >&6
 case "$ac_cv_var_nlist_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
@@ -13770,7 +13992,7 @@ EOF
  ;;
 esac
 #
-echo "$as_me:13773: checking for the units of 'tick'" >&5
+echo "$as_me:13995: checking for the units of 'tick'" >&5
 echo $ECHO_N "checking for the units of 'tick'... $ECHO_C" >&6
 if test "${ac_cv_var_tick_nano+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13783,7 +14005,7 @@ case "$target" in
 esac
 ac_cv_var_tick_nano=$ans
 fi
-echo "$as_me:13786: result: $ac_cv_var_tick_nano" >&5
+echo "$as_me:14008: result: $ac_cv_var_tick_nano" >&5
 echo "${ECHO_T}$ac_cv_var_tick_nano" >&6
 case "$ac_cv_var_tick_nano" in
  nsec)
@@ -13794,7 +14016,7 @@ EOF
     ;;
 esac
 #
-echo "$as_me:13797: checking the name of 'tickadj' in the kernel" >&5
+echo "$as_me:14019: checking the name of 'tickadj' in the kernel" >&5
 echo $ECHO_N "checking the name of 'tickadj' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_tickadj+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13819,6 +14041,9 @@ case "$target" in
  *-*-aix*)
     ans=tickadj
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=tickadj
     ;;
@@ -13837,7 +14062,7 @@ case "$target" in
 esac
 ac_cv_var_nlist_tickadj=$ans
 fi
-echo "$as_me:13840: result: $ac_cv_var_nlist_tickadj" >&5
+echo "$as_me:14065: result: $ac_cv_var_nlist_tickadj" >&5
 echo "${ECHO_T}$ac_cv_var_nlist_tickadj" >&6
 case "$ac_cv_var_nlist_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
@@ -13847,7 +14072,7 @@ EOF
  ;;
 esac
 #
-echo "$as_me:13850: checking for the units of 'tickadj'" >&5
+echo "$as_me:14075: checking for the units of 'tickadj'" >&5
 echo $ECHO_N "checking for the units of 'tickadj'... $ECHO_C" >&6
 if test "${ac_cv_var_tickadj_nano+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13860,7 +14085,7 @@ case "$target" in
 esac
 ac_cv_var_tickadj_nano=$ans
 fi
-echo "$as_me:13863: result: $ac_cv_var_tickadj_nano" >&5
+echo "$as_me:14088: result: $ac_cv_var_tickadj_nano" >&5
 echo "${ECHO_T}$ac_cv_var_tickadj_nano" >&6
 case "$ac_cv_var_tickadj_nano" in
  nsec)
@@ -13871,7 +14096,7 @@ EOF
     ;;
 esac
 #
-echo "$as_me:13874: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo "$as_me:14099: checking half-heartedly for 'dosynctodr' in the kernel" >&5
 echo $ECHO_N "checking half-heartedly for 'dosynctodr' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_dosynctodr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13889,6 +14114,9 @@ else
  *-*-hpux*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-nextstep*)
     ans=_dosynctodr
     ;;
@@ -13913,7 +14141,7 @@ else
 esac
 ac_cv_var_nlist_dosynctodr=$ans
 fi
-echo "$as_me:13916: result: $ac_cv_var_nlist_dosynctodr" >&5
+echo "$as_me:14144: result: $ac_cv_var_nlist_dosynctodr" >&5
 echo "${ECHO_T}$ac_cv_var_nlist_dosynctodr" >&6
 case "$ac_cv_var_nlist_dosynctodr" in
  no) ;;
@@ -13924,7 +14152,7 @@ EOF
      ;;
 esac
 #
-echo "$as_me:13927: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo "$as_me:14155: checking half-heartedly for 'noprintf' in the kernel" >&5
 echo $ECHO_N "checking half-heartedly for 'noprintf' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_noprintf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13942,6 +14170,9 @@ else
  *-*-hpux*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=noprintf
     ;;
@@ -13960,7 +14191,7 @@ else
 esac
 ac_cv_var_nlist_noprintf=$ans
 fi
-echo "$as_me:13963: result: $ac_cv_var_nlist_noprintf" >&5
+echo "$as_me:14194: result: $ac_cv_var_nlist_noprintf" >&5
 echo "${ECHO_T}$ac_cv_var_nlist_noprintf" >&6
 case "$ac_cv_var_nlist_noprintf" in
  no) ;;
@@ -13971,7 +14202,7 @@ EOF
      ;;
 esac
 
-echo "$as_me:13974: checking for a default value for 'tick'" >&5
+echo "$as_me:14205: checking for a default value for 'tick'" >&5
 echo $ECHO_N "checking for a default value for 'tick'... $ECHO_C" >&6
 if test "${ac_cv_var_tick+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13994,6 +14225,9 @@ else
       *-*-linux*)
 	 ans=txc.tick
 	 ;;
+      *-*-mpeix*)
+	 ans=no
+	 ;;
       *-*-winnt3.5)
 	 ans='(every / 10)'
 	 ;;
@@ -14004,7 +14238,7 @@ else
 fi;
 ac_cv_var_tick=$ans
 fi
-echo "$as_me:14007: result: $ac_cv_var_tick" >&5
+echo "$as_me:14241: result: $ac_cv_var_tick" >&5
 echo "${ECHO_T}$ac_cv_var_tick" >&6
 case "$ac_cv_var_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
@@ -14014,7 +14248,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:14017: checking for a default value for 'tickadj'" >&5
+echo "$as_me:14251: checking for a default value for 'tickadj'" >&5
 echo $ECHO_N "checking for a default value for 'tickadj'... $ECHO_C" >&6
 if test "${ac_cv_var_tickadj+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14055,6 +14289,9 @@ else
    *-*-irix*)
       ans=150
       ;;
+   *-*-mpeix*)
+      ans=no
+      ;;
    *-*-sco3.2v5.0*)
       ans=10000L/hz
       ;;
@@ -14072,7 +14309,7 @@ else
 fi;
 ac_cv_var_tickadj=$ans
 fi
-echo "$as_me:14075: result: $ac_cv_var_tickadj" >&5
+echo "$as_me:14312: result: $ac_cv_var_tickadj" >&5
 echo "${ECHO_T}$ac_cv_var_tickadj" >&6
 case "$ac_cv_var_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
@@ -14103,17 +14340,17 @@ esac
 ac_cv_make_tickadj=yes
 case "$ac_cv_var_can_kmem$ac_cv_var_tick$ac_cv_var_tickadj" in
  nonono)	# Don't read KMEM, no presets.  Bogus.
-    { echo "$as_me:14106: WARNING: Can't read kmem" >&5
+    { echo "$as_me:14343: WARNING: Can't read kmem" >&5
 echo "$as_me: WARNING: Can't read kmem" >&2;}
     ac_cv_make_tickadj=no
     ;;
  nono*)		# Don't read KMEM, no PRESET_TICK but PRESET_TICKADJ.  Bogus.
-    { echo "$as_me:14111: WARNING: Can't read kmem but no PRESET_TICK.  No tickadj." >&5
+    { echo "$as_me:14348: WARNING: Can't read kmem but no PRESET_TICK.  No tickadj." >&5
 echo "$as_me: WARNING: Can't read kmem but no PRESET_TICK.  No tickadj." >&2;}
     ac_cv_make_tickadj=no
     ;;
  no*no)		# Don't read KMEM, PRESET_TICK but no PRESET_TICKADJ.  Bogus.
-    { echo "$as_me:14116: WARNING: Can't read kmem but no PRESET_TICKADJ.  No tickadj." >&5
+    { echo "$as_me:14353: WARNING: Can't read kmem but no PRESET_TICKADJ.  No tickadj." >&5
 echo "$as_me: WARNING: Can't read kmem but no PRESET_TICKADJ.  No tickadj." >&2;}
     ac_cv_make_tickadj=no
     ;;
@@ -14122,7 +14359,7 @@ echo "$as_me: WARNING: Can't read kmem but no PRESET_TICKADJ.  No tickadj." >&2;
  yesnono)	# Read KMEM, no presets.  Cool.
     ;;
  yesno*)	# Read KMEM, no PRESET_TICK but PRESET_TICKADJ.  Bogus.
-    { echo "$as_me:14125: WARNING: PRESET_TICKADJ is defined but not PRESET_TICK.  Please report this." >&5
+    { echo "$as_me:14362: WARNING: PRESET_TICKADJ is defined but not PRESET_TICK.  Please report this." >&5
 echo "$as_me: WARNING: PRESET_TICKADJ is defined but not PRESET_TICK.  Please report this." >&2;}
     ;;
  yes*no)	# Read KMEM, PRESET_TICK but no PRESET_TICKADJ.  Cool.
@@ -14130,13 +14367,13 @@ echo "$as_me: WARNING: PRESET_TICKADJ is defined but not PRESET_TICK.  Please re
  yes*)		# READ KMEM, PRESET_TICK and PRESET_TICKADJ.
     ;;
  *)		# Generally bogus.
-    { { echo "$as_me:14133: error: This shouldn't happen." >&5
+    { { echo "$as_me:14370: error: This shouldn't happen." >&5
 echo "$as_me: error: This shouldn't happen." >&2;}
    { (exit 1); exit 1; }; }
     ;;
 esac
 
-echo "$as_me:14139: checking if we want and can make the ntptime utility" >&5
+echo "$as_me:14376: checking if we want and can make the ntptime utility" >&5
 echo $ECHO_N "checking if we want and can make the ntptime utility... $ECHO_C" >&6
 if test "${ac_cv_make_ntptime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14154,7 +14391,7 @@ else
 esac
 ac_cv_make_ntptime=$ans
 fi
-echo "$as_me:14157: result: $ac_cv_make_ntptime" >&5
+echo "$as_me:14394: result: $ac_cv_make_ntptime" >&5
 echo "${ECHO_T}$ac_cv_make_ntptime" >&6
 case "$ac_cv_make_ntptime" in
  yes)
@@ -14179,14 +14416,14 @@ case "$target" in
     esac
     ;;
 esac
-echo "$as_me:14182: checking if we want and can make the tickadj utility" >&5
+echo "$as_me:14419: checking if we want and can make the tickadj utility" >&5
 echo $ECHO_N "checking if we want and can make the tickadj utility... $ECHO_C" >&6
 if test "${ac_cv_make_tickadj+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_make_tickadj=yes
 fi
-echo "$as_me:14189: result: $ac_cv_make_tickadj" >&5
+echo "$as_me:14426: result: $ac_cv_make_tickadj" >&5
 echo "${ECHO_T}$ac_cv_make_tickadj" >&6
 case "$ac_cv_make_tickadj" in
  yes)
@@ -14194,7 +14431,7 @@ case "$ac_cv_make_tickadj" in
     ;;
 esac
 
-echo "$as_me:14197: checking if we want and can make the timetrim utility" >&5
+echo "$as_me:14434: checking if we want and can make the timetrim utility" >&5
 echo $ECHO_N "checking if we want and can make the timetrim utility... $ECHO_C" >&6
 if test "${ac_cv_make_timetrim+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14208,7 +14445,7 @@ else
     ;;
 esac
 fi
-echo "$as_me:14211: result: $ac_cv_make_timetrim" >&5
+echo "$as_me:14448: result: $ac_cv_make_timetrim" >&5
 echo "${ECHO_T}$ac_cv_make_timetrim" >&6
 case "$ac_cv_make_timetrim" in
  yes)
@@ -14216,7 +14453,7 @@ case "$ac_cv_make_timetrim" in
     ;;
 esac
 
-echo "$as_me:14219: checking if we want UDP wildcard delivery" >&5
+echo "$as_me:14456: checking if we want UDP wildcard delivery" >&5
 echo $ECHO_N "checking if we want UDP wildcard delivery... $ECHO_C" >&6
 if test "${ac_cv_var_udp_wildcard_delivery+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14258,6 +14495,9 @@ else
       *-*-linux*)
 	 ans=yes
 	 ;;
+      *-*-mpeix*)
+	 ans=yes
+	 ;;
       *-*-osf*)
 	 ans=yes
 	 ;;
@@ -14274,7 +14514,7 @@ else
 fi;
 ac_cv_var_udp_wildcard_delivery=$ans
 fi
-echo "$as_me:14277: result: $ac_cv_var_udp_wildcard_delivery" >&5
+echo "$as_me:14517: result: $ac_cv_var_udp_wildcard_delivery" >&5
 echo "${ECHO_T}$ac_cv_var_udp_wildcard_delivery" >&6
 case "$ac_cv_var_udp_wildcard_delivery" in
  yes) cat >>confdefs.h <<\EOF
@@ -14294,7 +14534,7 @@ case "$host" in
     ;;
 esac
 
-echo "$as_me:14297: checking if we should always slew the time" >&5
+echo "$as_me:14537: checking if we should always slew the time" >&5
 echo $ECHO_N "checking if we should always slew the time... $ECHO_C" >&6
 if test "${ac_cv_var_slew_always+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14324,7 +14564,7 @@ else
 fi;
 ac_cv_var_slew_always=$ans
 fi
-echo "$as_me:14327: result: $ac_cv_var_slew_always" >&5
+echo "$as_me:14567: result: $ac_cv_var_slew_always" >&5
 echo "${ECHO_T}$ac_cv_var_slew_always" >&6
 case "$ac_cv_var_slew_always" in
  yes) cat >>confdefs.h <<\EOF
@@ -14333,7 +14573,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:14336: checking if we should step and slew the time" >&5
+echo "$as_me:14576: checking if we should step and slew the time" >&5
 echo $ECHO_N "checking if we should step and slew the time... $ECHO_C" >&6
 if test "${ac_cv_var_step_slew+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14366,7 +14606,7 @@ else
 fi;
 ac_cv_var_step_slew=$ans
 fi
-echo "$as_me:14369: result: $ac_cv_var_step_slew" >&5
+echo "$as_me:14609: result: $ac_cv_var_step_slew" >&5
 echo "${ECHO_T}$ac_cv_var_step_slew" >&6
 case "$ac_cv_var_step_slew" in
  yes) cat >>confdefs.h <<\EOF
@@ -14375,7 +14615,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:14378: checking if ntpdate should step the time" >&5
+echo "$as_me:14618: checking if ntpdate should step the time" >&5
 echo $ECHO_N "checking if ntpdate should step the time... $ECHO_C" >&6
 if test "${ac_cv_var_ntpdate_step+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14396,7 +14636,7 @@ else
 fi;
 ac_cv_var_ntpdate_step=$ans
 fi
-echo "$as_me:14399: result: $ac_cv_var_ntpdate_step" >&5
+echo "$as_me:14639: result: $ac_cv_var_ntpdate_step" >&5
 echo "${ECHO_T}$ac_cv_var_ntpdate_step" >&6
 case "$ac_cv_var_ntpdate_step" in
  yes) cat >>confdefs.h <<\EOF
@@ -14405,7 +14645,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:14408: checking if we should sync TODR clock every hour" >&5
+echo "$as_me:14648: checking if we should sync TODR clock every hour" >&5
 echo $ECHO_N "checking if we should sync TODR clock every hour... $ECHO_C" >&6
 if test "${ac_cv_var_sync_todr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14428,7 +14668,7 @@ else
 fi;
 ac_cv_var_sync_todr=$ans
 fi
-echo "$as_me:14431: result: $ac_cv_var_sync_todr" >&5
+echo "$as_me:14671: result: $ac_cv_var_sync_todr" >&5
 echo "${ECHO_T}$ac_cv_var_sync_todr" >&6
 case "$ac_cv_var_sync_todr" in
  yes) cat >>confdefs.h <<\EOF
@@ -14437,7 +14677,7 @@ EOF
  ;;
 esac
 
-echo "$as_me:14440: checking if we should avoid kernel FLL bug" >&5
+echo "$as_me:14680: checking if we should avoid kernel FLL bug" >&5
 echo $ECHO_N "checking if we should avoid kernel FLL bug... $ECHO_C" >&6
 if test "${ac_cv_var_kernel_fll_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14495,7 +14735,7 @@ else
 fi;
 ac_cv_var_kernel_fll_bug=$ans
 fi
-echo "$as_me:14498: result: $ac_cv_var_kernel_fll_bug" >&5
+echo "$as_me:14738: result: $ac_cv_var_kernel_fll_bug" >&5
 echo "${ECHO_T}$ac_cv_var_kernel_fll_bug" >&6
 case "$ac_cv_var_kernel_fll_bug" in
  yes) cat >>confdefs.h <<\EOF
@@ -14525,9 +14765,10 @@ cat >>confdefs.h <&5
+{ echo "$as_me:14856: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -14744,7 +14985,7 @@ EOF
 cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:14791: error: ambiguous option: $1
+    { { echo "$as_me:15032: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -14806,48 +15047,15 @@ Try \`$0 --help' for more information." >&2;}
     CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
 
-  # Handling of arguments.
-  'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  'adjtimed/Makefile' ) CONFIG_FILES="$CONFIG_FILES adjtimed/Makefile" ;;
-  'clockstuff/Makefile' ) CONFIG_FILES="$CONFIG_FILES clockstuff/Makefile" ;;
-  'ElectricFence/Makefile' ) CONFIG_FILES="$CONFIG_FILES ElectricFence/Makefile" ;;
-  'include/Makefile' ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  'kernel/Makefile' ) CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
-  'kernel/sys/Makefile' ) CONFIG_FILES="$CONFIG_FILES kernel/sys/Makefile" ;;
-  'libntp/Makefile' ) CONFIG_FILES="$CONFIG_FILES libntp/Makefile" ;;
-  'libparse/Makefile' ) CONFIG_FILES="$CONFIG_FILES libparse/Makefile" ;;
-  'librsaref/Makefile' ) CONFIG_FILES="$CONFIG_FILES librsaref/Makefile" ;;
-  'ntpd/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpd/Makefile" ;;
-  'ntpdc/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpdc/Makefile" ;;
-  'ntpdate/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpdate/Makefile" ;;
-  'ntpq/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpq/Makefile" ;;
-  'ntptrace/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntptrace/Makefile" ;;
-  'parseutil/Makefile' ) CONFIG_FILES="$CONFIG_FILES parseutil/Makefile" ;;
-  'scripts/Makefile' ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
-  'scripts/calc_tickadj' ) CONFIG_FILES="$CONFIG_FILES scripts/calc_tickadj" ;;
-  'scripts/checktime' ) CONFIG_FILES="$CONFIG_FILES scripts/checktime" ;;
-  'scripts/freq_adj' ) CONFIG_FILES="$CONFIG_FILES scripts/freq_adj" ;;
-  'scripts/mkver' ) CONFIG_FILES="$CONFIG_FILES scripts/mkver" ;;
-  'scripts/ntp-wait' ) CONFIG_FILES="$CONFIG_FILES scripts/ntp-wait" ;;
-  'scripts/ntpsweep' ) CONFIG_FILES="$CONFIG_FILES scripts/ntpsweep" ;;
-  'scripts/ntpver' ) CONFIG_FILES="$CONFIG_FILES scripts/ntpver" ;;
-  'scripts/plot_summary' ) CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;;
-  'scripts/summary' ) CONFIG_FILES="$CONFIG_FILES scripts/summary" ;;
-  'util/Makefile' ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
-  'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  'default-2' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
-  'default' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-
   # This is an error.
-  -*) { { echo "$as_me:14843: error: unrecognized option: $1
+  -*) { { echo "$as_me:15051: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
-  *) { { echo "$as_me:14848: error: invalid argument: $1" >&5
-echo "$as_me: error: invalid argument: $1" >&2;}
-   { (exit 1); exit 1; }; };;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
   shift
 done
@@ -14859,14 +15067,68 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.50, executed with
+This file was extended by $as_me 2.52, executed with
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
   > $ac_cs_invocation
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 
+cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "adjtimed/Makefile" ) CONFIG_FILES="$CONFIG_FILES adjtimed/Makefile" ;;
+  "clockstuff/Makefile" ) CONFIG_FILES="$CONFIG_FILES clockstuff/Makefile" ;;
+  "ElectricFence/Makefile" ) CONFIG_FILES="$CONFIG_FILES ElectricFence/Makefile" ;;
+  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+  "kernel/Makefile" ) CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
+  "kernel/sys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kernel/sys/Makefile" ;;
+  "libntp/Makefile" ) CONFIG_FILES="$CONFIG_FILES libntp/Makefile" ;;
+  "libparse/Makefile" ) CONFIG_FILES="$CONFIG_FILES libparse/Makefile" ;;
+  "librsaref/Makefile" ) CONFIG_FILES="$CONFIG_FILES librsaref/Makefile" ;;
+  "ntpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntpd/Makefile" ;;
+  "ntpdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntpdc/Makefile" ;;
+  "ntpdate/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntpdate/Makefile" ;;
+  "ntpq/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntpq/Makefile" ;;
+  "ntptrace/Makefile" ) CONFIG_FILES="$CONFIG_FILES ntptrace/Makefile" ;;
+  "parseutil/Makefile" ) CONFIG_FILES="$CONFIG_FILES parseutil/Makefile" ;;
+  "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
+  "scripts/calc_tickadj" ) CONFIG_FILES="$CONFIG_FILES scripts/calc_tickadj" ;;
+  "scripts/checktime" ) CONFIG_FILES="$CONFIG_FILES scripts/checktime" ;;
+  "scripts/freq_adj" ) CONFIG_FILES="$CONFIG_FILES scripts/freq_adj" ;;
+  "scripts/mkver" ) CONFIG_FILES="$CONFIG_FILES scripts/mkver" ;;
+  "scripts/ntp-wait" ) CONFIG_FILES="$CONFIG_FILES scripts/ntp-wait" ;;
+  "scripts/ntpsweep" ) CONFIG_FILES="$CONFIG_FILES scripts/ntpsweep" ;;
+  "scripts/ntpver" ) CONFIG_FILES="$CONFIG_FILES scripts/ntpver" ;;
+  "scripts/plot_summary" ) CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;;
+  "scripts/summary" ) CONFIG_FILES="$CONFIG_FILES scripts/summary" ;;
+  "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  *) { { echo "$as_me:15126: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -14881,7 +15143,7 @@ fi
 $debug ||
 {
   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit $?); exit $?; }' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 
 # Create a (secure) tmp directory for tmp files.
@@ -14902,25 +15164,6 @@ $debug ||
 EOF
 
 cat >>$CONFIG_STATUS < `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
-      ;;
-    esac
-    am_indx=\`expr \$am_indx + 1\`
-  done
-AMDEP="$AMDEP"
-ac_aux_dir="$ac_aux_dir"
-
-EOF
-
-cat >>$CONFIG_STATUS <&5
+    { echo "$as_me:15403: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -15168,7 +15418,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15171: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15421: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15181,7 +15431,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15184: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15434: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15242,7 +15492,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:15245: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:15495: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -15253,7 +15503,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:15256: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15506: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -15266,7 +15516,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:15269: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15519: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -15383,7 +15633,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:15386: $ac_file is unchanged" >&5
+      { echo "$as_me:15636: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -15422,6 +15672,12 @@ done; }
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
+  # Run the commands associated with the file.
+  case $ac_file in
+    config.h ) # update the timestamp
+echo timestamp >"./stamp-h1"
+ ;;
+  esac
 done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
@@ -15434,9 +15690,8 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   case $ac_dest in
-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp >	   stamp-h ;;
-    default-2 )
-test x"$AMDEP" != x"" ||
+    default-1 )
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
diff --git a/contrib/ntp/configure.in b/contrib/ntp/configure.in
index 9a40c8a..470b926 100644
--- a/contrib/ntp/configure.in
+++ b/contrib/ntp/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.1.0)
+AM_INIT_AUTOMAKE(ntp, 4.1.1a)
 AC_PREREQ(2.49)
 
 ac_cv_var_oncore_ok=no
@@ -26,7 +26,7 @@ case "$target" in
  i386-sequent-sysv4)
     case "$CC" in
      cc)
-	CFLAGS="$CFLAGS -Wc,+Abi-socket"
+	CFLAGS="$CFLAGS -Wc,+abi-socket"
 	;;
     esac
     ;;
@@ -37,6 +37,11 @@ case "$target" in
 	;;
     esac
     ;;
+ *-*-mpeix*)
+    CPPFLAGS="$CPPFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB"
+    LDFLAGS="$LDFLAGS -L/SYSLOG/PUB"
+    LIBS="$LIBS -lcurses"
+    ;;
 esac
 
 case "$host" in
@@ -185,7 +190,9 @@ AC_CHECK_LIB(kvm, main)		dnl We already know about -lelf here...
 AC_CHECK_LIB(ld, nlist)
 AC_CHECK_LIB(mld, nlist)
 AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent, , , -lsocket))
-AC_CHECK_FUNC(openlog, , AC_CHECK_LIB(gen, openlog))
+AC_CHECK_FUNC(openlog, , 
+  AC_CHECK_LIB(gen, openlog, , 
+  AC_CHECK_LIB(syslog, openlog, , , -lsocket)))
 AC_CHECK_LIB(readline, readline)
 
 dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt
@@ -208,7 +215,8 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(bstring.h errno.h fcntl.h ieeefp.h math.h memory.h netdb.h)
 AC_CHECK_HEADERS(poll.h resolv.h sched.h sgtty.h stdlib.h string.h termio.h)
 AC_CHECK_HEADERS(termios.h timepps.h timex.h unistd.h utmp.h utmpx.h)
-AC_CHECK_HEADERS(arpa/nameser.h net/if.h netinet/in_systm.h netinet/in.h)
+AC_CHECK_HEADERS(arpa/nameser.h net/if.h netinet/in_system.h)
+AC_CHECK_HEADERS(netinet/in_systm.h netinet/in.h netinet/ip.h)
 AC_CHECK_HEADERS(netinfo/ni.h, [AC_DEFINE(HAVE_NETINFO)])
 AC_CHECK_HEADERS(sun/audioio.h sys/audioio.h)
 dnl AC_CHECK_HEADERS(sys/chudefs.h)
@@ -225,7 +233,7 @@ case "$target" in
     AC_CHECK_HEADERS(sys/sio.h)
     ;;
 esac
-AC_CHECK_HEADERS(sys/select.h sys/sockio.h sys/stat.h sys/stream.h)
+AC_CHECK_HEADERS(sys/select.h sys/signal.h sys/sockio.h sys/stat.h sys/stream.h)
 AC_CHECK_HEADERS(sys/stropts.h sys/sysctl.h sys/syssgi.h sys/termios.h)
 AC_CHECK_HEADERS(sys/time.h)
 AC_EGREP_CPP(yes,
@@ -233,7 +241,7 @@ AC_EGREP_CPP(yes,
 #ifdef PPS_API_VERS_1
 yes
 #endif
-], AC_CHECK_HEADERS(sys/timepps.h))
+], [AC_CHECK_HEADERS(sys/timepps.h)])
 AC_CHECK_HEADERS(sys/timers.h sys/timex.h sys/tpro.h sys/types.h sys/wait.h)
 AC_HEADER_TIME
 case "$target" in
@@ -564,7 +572,7 @@ case "$target" in
 	# this conditional will need to change.  Maybe use AC_TRY_RUN
 	# instead to try to set the time to itself and check errno.
     ;;
- *) AC_CHECK_FUNCS(clock_settime)
+ *) AC_CHECK_FUNCS(clock_gettime clock_settime)
     ;;
 esac
 AC_CHECK_FUNCS(daemon)
@@ -578,7 +586,12 @@ AC_CHECK_FUNCS(finite, ,
       AC_DEFINE(HAVE_ISFINITE)],
       AC_MSG_RESULT(no))
     LIBS=$_libs])])
-AC_CHECK_FUNCS(getbootfile getclock getdtablesize getrusage gettimeofday)
+AC_CHECK_FUNCS(getbootfile getclock getdtablesize getrusage)
+AC_CHECK_FUNC(gettimeofday, ,[
+case "$target" in
+  *-*-mpeix*) ac_cv_func_gettimeofday=yes
+    ;;
+esac])
 case "$target" in
  *-pc-cygwin*)
     ;;
@@ -636,8 +649,13 @@ case "$target" in
  *) AC_CHECK_FUNCS(sched_setscheduler)
     ;;
 esac
-AC_CHECK_FUNCS(setlinebuf)
-AC_CHECK_FUNCS(setpgid setpriority setsid settimeofday setvbuf sigaction)
+AC_CHECK_FUNCS(setlinebuf setpgid setpriority setsid)
+AC_CHECK_FUNCS(settimeofday, ,[
+case "$target" in
+  *-*-mpeix*) ac_cv_func_settimeofday=yes
+    ;;
+esac])
+AC_CHECK_FUNCS(setvbuf sigaction)
 AC_CHECK_FUNCS(sigvec sigset sigsuspend stime strchr sysconf sysctl)
 AC_REPLACE_FUNCS(snprintf strdup strerror)
 case "$target" in
@@ -795,6 +813,17 @@ case "$target" in
  *-*-aix4.3.*)
     AC_DEFINE(DECL_HSTRERROR_0)		# Needed for XLC under AIX 4.3.2
     ;;
+ *-*-mpeix*)
+    AC_DEFINE(DECL_ADJTIME_0)
+    AC_DEFINE(DECL_INET_NTOA_0)
+    AC_DEFINE(DECL_MKTEMP_0)
+    AC_DEFINE(DECL_MRAND48_0)
+    AC_DEFINE(DECL_SELECT_0)
+    AC_DEFINE(DECL_SETITIMER_0)
+    AC_DEFINE(DECL_SRAND48_0)
+    AC_DEFINE(DECL_SYSLOG_0)
+    AC_DEFINE(DECL_TIMEOFDAY_0)
+    ;;
  *-*-osf[[45]]*)
     AC_DEFINE(DECL_PLOCK_0)
     AC_DEFINE(DECL_STIME_1)
@@ -952,7 +981,7 @@ esac
 
 AC_CACHE_CHECK(if we need a ctty for F_SETOWN, ac_cv_func_ctty_for_f_setown,
 [case "$target" in
- *-*-bsdi[23]*)
+ *-*-bsdi[[23]]*)
     ans=yes
     ;;
  *-*-freebsd*)
@@ -1247,6 +1276,11 @@ case "$target" in
  mips-sgi-irix*)
     ans=yes
     ;;
+ i?86-*-freebsd[[123]].*)
+    ;;
+ i?86-*-freebsd*)
+    ans=yes
+    ;;
 esac
 ac_cv_var_no_parenb_ignpar=$ans])
 case "$ac_cv_var_no_parenb_ignpar" in
@@ -1528,7 +1562,6 @@ AC_ARG_ENABLE(HOPFSERIAL,		[  --enable-HOPFSERIAL     + hopf serial clock device
   fi
   AC_MSG_RESULT($ntp_ok)
 
-
 AC_MSG_CHECKING(for hopf PCI clock 6039)
 AC_ARG_ENABLE(HOPFPCI,		[  --enable-HOPFPCI        + hopf 6039 PCI board],
       [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
@@ -1766,6 +1799,15 @@ case "$ntp_ok$ntp_canaudio" in
  yesno) AC_MSG_WARN(*** But the expected answer is... no ***) ;;
 esac
 
+AC_MSG_CHECKING(for JJY receiver)
+AC_ARG_ENABLE(JJY,		[  --enable-JJY            + JJY receiver],
+      [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+    AC_DEFINE(CLOCK_JJY)
+fi
+AC_MSG_RESULT($ntp_ok)
+
 AC_MSG_CHECKING(Leitch CSD 5300 Master Clock System Driver)
 AC_ARG_ENABLE(LEITCH,		[  --enable-LEITCH         + Leitch CSD 5300 Master Clock System Driver],
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
@@ -1982,6 +2024,16 @@ case "$ntp_ok$target" in
  yesvax-dec-bsd) AC_MSG_WARN(*** But the expected answer is... no ***) ;;
 esac
 
+AC_MSG_CHECKING(TrueTime 560 IRIG-B decoder)
+AC_ARG_ENABLE(TT560,
+    AC_HELP_STRING([--enable-TT650], [- TrueTime 560 IRIG-B decoder]),
+    [ntp_ok=$enableval], [ntp_ok=no])
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+    AC_DEFINE(CLOCK_TT560, , [TrueTime 560 IRIG-B decoder?])
+fi
+AC_MSG_RESULT($ntp_ok)
+
 AC_MSG_CHECKING(Ultralink M320 WWVB receiver)
 AC_ARG_ENABLE(ULINK,		[  --enable-ULINK          + Ultralink WWVB receiver],
     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
@@ -2026,6 +2078,16 @@ if test "$ntp_ok" = "yes"; then
 fi
 AC_MSG_RESULT($ntp_ok)
 
+AC_MSG_CHECKING(for Zyfer receiver)
+AC_ARG_ENABLE(ZYFER,
+    AC_HELP_STRING([--enable-ZYFER], [+ Zyfer GPStarplus receiver]),
+    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+if test "$ntp_ok" = "yes"; then
+    ntp_refclock=yes
+    AC_DEFINE(CLOCK_ZYFER, 1, [Zyfer GPStarplus])
+fi
+AC_MSG_RESULT($ntp_ok)
+
 AC_MSG_CHECKING(for default inclusion of all suitable PARSE clocks)
 AC_ARG_ENABLE(parse-clocks,	[  --enable-parse-clocks   - include all suitable PARSE clocks:],
     [ntp_eapc=$enableval],
@@ -2389,6 +2451,8 @@ case "$ans" in
     esac
     ;;
 esac
+AM_CONDITIONAL(isRSAREF, test x$RSADIR = xrsaref2)
+AM_CONDITIONAL(isRSAEURO, test x$RSADIR = xrsaeuro1)
 AC_SUBST(AUTOKEY)
 case "$ans" in
  no) ;;
@@ -2573,6 +2637,9 @@ case "$target" in
  *-ibm-aix[[34]]*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=tick
     ;;
@@ -2629,6 +2696,9 @@ case "$target" in
  *-*-aix*)
     ans=tickadj
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=tickadj
     ;;
@@ -2681,6 +2751,9 @@ ac_cv_var_nlist_dosynctodr,
  *-*-hpux*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-nextstep*)
     ans=_dosynctodr
     ;;
@@ -2725,6 +2798,9 @@ ac_cv_var_nlist_noprintf,
  *-*-hpux*)
     ans=no
     ;;
+ *-*-mpeix*)
+    ans=no
+    ;;
  *-*-ptx*)
     ans=noprintf
     ;;
@@ -2781,6 +2857,9 @@ AC_CACHE_CHECK(for a default value for 'tick', ac_cv_var_tick,
       *-*-linux*)
 	 ans=txc.tick
 	 ;;
+      *-*-mpeix*)
+	 ans=no
+	 ;;
       *-*-winnt3.5)
 	 ans='(every / 10)'
 	 ;;
@@ -2828,6 +2907,9 @@ AC_CACHE_CHECK(for a default value for 'tickadj', ac_cv_var_tickadj,
    *-*-irix*)
       ans=150
       ;;
+   *-*-mpeix*)
+      ans=no
+      ;;
    *-*-sco3.2v5.0*)
       ans=10000L/hz
       ;;
@@ -2987,6 +3069,9 @@ AC_CACHE_CHECK(if we want UDP wildcard delivery, ac_cv_var_udp_wildcard_delivery
       *-*-linux*)
 	 ans=yes
 	 ;;
+      *-*-mpeix*)
+	 ans=yes
+	 ;;
       *-*-osf*)
 	 ans=yes
 	 ;;
@@ -3170,9 +3255,10 @@ esac
 
 AC_DEFINE_DIR(NTP_KEYSDIR, sysconfdir, [Default location of crypto key info])
 
-# This is necessary so that .o files in LIBOBJS are also built via
-# the ANSI2KNR-filtering rules.
-LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
+# HMS: I think we avoid this problem now...
+## This is necessary so that .o files in LIBOBJS are also built via
+## the ANSI2KNR-filtering rules.
+#LIB@&t@OBJS=`echo "$LIB@&t@OBJS" | sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
 
 AC_CONFIG_FILES(Makefile adjtimed/Makefile clockstuff/Makefile \
 ElectricFence/Makefile
diff --git a/contrib/ntp/html/driver40.htm b/contrib/ntp/html/driver40.htm
new file mode 100644
index 0000000..f9fc7b6
--- /dev/null
+++ b/contrib/ntp/html/driver40.htm
@@ -0,0 +1,141 @@
+
+
+
+
+JJY Receivers
+
+
+
JJY Receivers

+
+

+
Synopsis

+
+Address: 127.127.40.u 

+Reference ID: JJY 

+Driver ID: JJY 

+Serial Port: /dev/jjyu; 9600 baud, 8-bits, no
+parity, 1 stop bit 
+
+
Description

+
+
This driver supports the following JJY receivers sold in
+Japan.

+
+
    
+
  • 
+
    Tristate Ltd. JJY01 
+http://www.tristate.ne.jp/rf-clock.htm (Japanese only)
    
+Time code format
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    CommandReply
    date<CR><LF>YYYY/MM/DD WWW<CR><LF>
    stim<CR><LF>HH:MM:SS<CR><LF>
    
+
    • 
+
+
  • 
+
    C-DEX Co.,Ltd. JST2000 
+http://www.c-dex.co.jp/ (Japanese only)
    
+Time code format
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
    CommandReply
    <ENQ>1J<ETX><STX>JYYMMDD HHMMSSS<ETX>
    
+
    • 
+

+
+
JJY is the radio station which transmites the JST (Japan
+Standard Time) in long wave radio. The station JJY is operated by
+the Communication Research Laboratory. An operating announcement
+and some information are avaiable from http://www.crl.go.jp/ (English and
+Japanese)http://jjy.crl.go.jp/
+(Written in Japanese only

+
+
The user is expected to provide a symbolic link to an available
+serial port device. This is typically performed by a command such
+as:

+
+
ln -s /dev/ttyS0 /dev/jjy0

+
+
Windows NT does not support symbolic links to device files.
+COMX: is the unit used by the driver, based on the refclock
+unit number, where unit 1 corresponds to COM1: and unit 3
+corresponds to COM3:

+
+
Monitor Data

+
+
The driver writes each timecode as received to the 
+clockstats file.

+
+
Fudge Factors

+
+

+
time1 time

+
+
Specifies the time offset calibration factor, in seconds and
+fraction, with default 0.0.

+
+
time2 time

+
+
Not used by this driver.

+
+
stratum number

+
+
Specifies the driver stratum, in decimal from 0 to 15, with
+default 0.

+
+
refid string

+
+
Specifies the driver reference identifier, an ASCII string from
+one to four characters, with default WWVB.

+
+
flag1 0 | 1

+
+
Not used by this driver.

+
+
flag2 0 | 1

+
+
Not used by this driver.

+
+
flag3 0 | 1

+
+
Not used by this driver.

+
+
flag4 0 | 1

+
+
Enable verbose clockstats recording if set.

+

+
+

++"gif" 
+
+
David L. Mills
+<mills@udel.edu>

+
+
+
diff --git a/contrib/ntp/html/driver42.html b/contrib/ntp/html/driver42.html
new file mode 100644
index 0000000..3622b84
--- /dev/null
+++ b/contrib/ntp/html/driver42.html
@@ -0,0 +1,39 @@
+
+
+   
+   
+   Zyfer GPStarplus Receiver
+
+
+
+
Zyfer GPStarplus Receiver

+
+

+
Synopsis

+Address: 127.127.42.u
+
Reference ID: GPS
+
Driver ID: Zyfer GPStarplus
+
Serial Port: /dev/zyferu; 9600 baud, 8-bits, no parity
+
Features: (none)
+
+
Description

+This driver supports the Zyfer GPStarplus
+receiver.
+
+
The receiver has a DB15 port on the back which has input TxD and RxD
+lines for configuration and control, and a separate TxD line for the
+once-per-second timestamp.
+
+
Additionally, there are BNC connectors on the back for things like PPS
+and IRIG output.
+
+
+Additional Information
+
+
Reference Clock Drivers 
+

+

+Harlan Stenn (stenn@whimsy.udel.edu)

+
+
+
diff --git a/contrib/ntp/html/hints/mpeix b/contrib/ntp/html/hints/mpeix
new file mode 100644
index 0000000..83c7241e
--- /dev/null
+++ b/contrib/ntp/html/hints/mpeix
@@ -0,0 +1,50 @@
+HP e3000 MPE/iX NTP Hints - May 29, 2001
+----------------------------------------
+
+NTP was first ported to MPE several years ago, but those diffs were never
+submitted back to the official NTP distribution.  For more information about
+that deprecated port, please see http://www.bixby.org/mark/xntpix.html.
+
+NTP was re-ported to MPE in May 2001.  What follows are hints learned from
+working with NTP 4.0.99k23.  For additional information about NTP on MPE,
+please see http://jazz.external.hp.com/src/hp_freeware/ntp/.
+
+MPE lacks the clock-related APIs expected by NTP, so adjtime(), gettimeofday(),
+and settimeofday() all had to be implemented from scratch by calling
+privileged, undocumented internal OS functions.
+
+Unfortunately the implementation of adjtime() has exposed a sub-second accuracy
+bug when slewing the system time.  This bug is documented in SR 5003462838, and
+exists on all current versions of MPE.  It has not been fixed at the time of
+this writing.  The adjtime() code may possibly need to be altered if/when this
+bug is fixed.
+
+This bug has a side-effect whereby the ntpd daemon will screw up the hardware
+PDC clock time by many minutes if used for continuous clock adjustments or in
+the one-time -q mode.  But note that you can safely run ntpd in order to become
+a time server if you include "disable ntp" in the ntp.conf configuration file.
+
+The one-time clock adjustment functionality of ntpdate and ntp_timeset is not
+affected by this bug side-effect.  You can safely use these commands to alter
+your system time with reasonable accuracy.
+
+The only reference clock that has been tested on MPE is the local clock.  So
+building NTP with --disable-all-clocks --enable-LOCAL_CLOCK is strongly
+recommended.
+
+NTP makes use of Privileged Mode (PM) capability in order to bind to the NTP
+network port (123) and to access the low-level clock functions.
+
+NTP was ported using the gcc compiler.  Attempting to use the HP C/iX compiler
+is not recommended and has not been tested.
+
+Please note that NTP is not an HP product and is NOT supported by HP.  The best
+place for asking MPE-specific questions about NTP is the HP3000-L mailing list
+at http://raven.utc.edu/Archives/hp3000-l.html or the associated Usenet
+newsgroup of comp.sys.hp.mpe.
+
+The original author of this port is:
+
+Mark Bixby
+HP CSY MPE Internet & Interoperability Engineer
+mark_bixby@hp.com
diff --git a/contrib/ntp/html/hints/vxworks.html b/contrib/ntp/html/hints/vxworks.html
index 4df83c5..49662ff 100644
--- a/contrib/ntp/html/hints/vxworks.html
+++ b/contrib/ntp/html/hints/vxworks.html
@@ -6,10 +6,10 @@
 
 
VxWorks port of NTP 

 
-
Please look at the Vxworks file in the html directory.
+
Please look at the Vxworks file in the html directory.
 
-
Casey Crellin 

-casey@csc.co.za 

+
Casey Crellin 

+casey@csc.co.za 

 
 


 

diff --git a/contrib/ntp/html/qth.htm b/contrib/ntp/html/qth.htm
index 200d3fb..1756edb 100644
--- a/contrib/ntp/html/qth.htm
+++ b/contrib/ntp/html/qth.htm
@@ -57,6 +57,18 @@ published by the ITU and other sources.
 47:10N 2:12E
 
 
+
+JJY ( Fukushima, JAPAN )
+40 KHz
+37:22 N   140:51 E
+
+
+
+JJY ( Saga, JAPAN )
+60 KHz
+33:28 N   130:11 E
+
+
 
 
 
GPS_HP)

 (GPS_ONCORE)

 Type 31 Rockwell Jupiter GPS (GPS_JUPITER)

 Type 32 Chrono-log K-series WWVB
-receiver Type 33 Dumb Clock Type 34 Ultralink WWVB Receivers

+receiver (CHRONOLOG)

+Type 33 Dumb Clock (DUMBCLOCK)

+Type 34 Ultralink WWVB Receivers (ULINK)

 Type 35 Conrad Parallel Port Radio Clock
 (PCF)

 Type 36 Radio WWV/H Audio
-Demodulator/Decoder(WWV)

+Demodulator/Decoder (WWV)

 Type 37 Forum Graphic GPS Dating station
 (FG)

 Type 38 hopf GPS/DCF77 6021/komp for
 Serial Line (HOPF_S)

 Type 39 hopf GPS/DCF77 6039 for PCI-Bus
-(HOPF_P)

+(HOPF_P)

+Type 40 JJY Receivers (JJY)

+

+ 
 
 
* All TrueTime receivers are now supported by one driver, type
 5. Types 15 and 25 will be retained only for a limited time and may
diff --git a/contrib/ntp/include/Makefile.in b/contrib/ntp/include/Makefile.in
index e034ae1..136e6dd 100644
--- a/contrib/ntp/include/Makefile.in
+++ b/contrib/ntp/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,20 +104,17 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 ETAGS_ARGS = $(srcdir)/Makefile.am
-#EXTRA_DIST = TAGS
 
+#EXTRA_DIST = TAGS
 noinst_HEADERS = \
 	adjtime.h \
 	audio.h \
@@ -168,8 +162,6 @@ noinst_HEADERS = \
 	recvbuff.h \
 	trimble.h
 
-EXEEXT =
-OBJEXT = o
 subdir = include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -178,19 +170,17 @@ DIST_SOURCES =
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  include/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 
 tags: TAGS
 
@@ -203,7 +193,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -219,10 +209,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -231,7 +221,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -256,23 +250,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -281,11 +272,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -293,7 +284,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -307,14 +298,16 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \
 	distclean-generic distclean-tags distdir dvi dvi-am info \
 	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic tags uninstall uninstall-am
-
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/ntp/include/ntp.h b/contrib/ntp/include/ntp.h
index f7ade0d..5881df1 100644
--- a/contrib/ntp/include/ntp.h
+++ b/contrib/ntp/include/ntp.h
@@ -457,7 +457,9 @@ struct peer {
 #define REFCLK_FG		37	/* Forum Graphic GPS */
 #define REFCLK_HOPF_SERIAL	38	/* hopf DCF77/GPS serial line receiver  */
 #define REFCLK_HOPF_PCI		39	/* hopf DCF77/GPS PCI receiver  */
-#define REFCLK_MAX		39	/* Grow as needed... */
+#define REFCLK_JJY		40	/* JJY receiver  */
+#define REFCLK_ZYFER		41	/* Zyfer GPStarplus receiver  */
+#define REFCLK_MAX		41	/* Grow as needed... */
 
 /*
  * We tell reference clocks from real peers by giving the reference
diff --git a/contrib/ntp/include/ntp_machine.h b/contrib/ntp/include/ntp_machine.h
index d14f5c1..17026a7 100644
--- a/contrib/ntp/include/ntp_machine.h
+++ b/contrib/ntp/include/ntp_machine.h
@@ -434,6 +434,48 @@ struct servent *getservbyname P((char *name, char *type));
 # endif
 #endif	/* NTP_SYSCALLS_STD */
 
+#ifdef MPE
+# include 
+# include 
+# include 
+# include 
+
+/* missing functions that are easily renamed */
+
+# define _getch getchar
+
+/* special functions that require MPE-specific wrappers */
+
+# define bind	__ntp_mpe_bind
+# define fcntl	__ntp_mpe_fcntl
+
+/* standard macros missing from MPE include files */
+
+# define IN_CLASSD(i)	((((long)(i))&0xf0000000)==0xe0000000)
+# define IN_MULTICAST IN_CLASSD
+# define ITIMER_REAL 0
+# define MAXHOSTNAMELEN 64
+
+/* standard structures missing from MPE include files */
+
+struct itimerval { 
+        struct timeval it_interval;    /* timer interval */
+        struct timeval it_value;       /* current value */
+};
+
+/* various declarations to make gcc stop complaining */
+
+extern int __filbuf(FILE *);
+extern int __flsbuf(int, FILE *);
+extern int gethostname(char *, int);
+extern unsigned long inet_addr(char *);
+extern char *strdup(const char *);
+
+/* miscellaneous NTP macros */
+
+# define HAVE_NO_NICE
+#endif /* MPE */
+
 #ifdef HAVE_RTPRIO
 # define HAVE_NO_NICE
 #else
diff --git a/contrib/ntp/include/ntp_request.h b/contrib/ntp/include/ntp_request.h
index a64094a..9e76df5 100644
--- a/contrib/ntp/include/ntp_request.h
+++ b/contrib/ntp/include/ntp_request.h
@@ -129,8 +129,19 @@ struct req_pkt {
 };
 
 /*
+ * The req_pkt_tail structure is used by ntpd to adjust for different
+ * packet sizes that may arrive.
+ */
+struct req_pkt_tail {
+	l_fp tstamp;			/* time stamp, for authentication */
+	keyid_t keyid;			/* encryption key */
+	char mac[MAX_MAC_LEN-sizeof(u_int32)]; /* (optional) 8 byte auth code */
+};
+
+/*
  * Input packet lengths.  One with the mac, one without.
  */
+#define	REQ_LEN_HDR	8	/* 4 * u_char + 2 * u_short */
 #define	REQ_LEN_MAC	(sizeof(struct req_pkt))
 #define	REQ_LEN_NOMAC	(sizeof(struct req_pkt) - MAX_MAC_LEN)
 
@@ -285,7 +296,7 @@ struct resp_pkt {
 #define INFO_FLAG_KERNEL	0x8
 #define INFO_FLAG_MONITOR	0x40
 #define INFO_FLAG_FILEGEN	0x80
-#define INFO_FLAG_PLL_SYNC	0x10
+#define INFO_FLAG_CAL		0x10
 #define INFO_FLAG_PPS_SYNC	0x20
 
 /*
@@ -521,6 +532,18 @@ struct info_timer_stats {
 /*
  * Structure for passing peer configuration information
  */
+struct old_conf_peer {
+	u_int32 peeraddr;	/* address to poll */
+	u_char hmode;		/* mode, either broadcast, active or client */
+	u_char version;		/* version number to poll with */
+	u_char minpoll;		/* min host poll interval */
+	u_char maxpoll;		/* max host poll interval */
+	u_char flags;		/* flags for this request */
+	u_char ttl;		/* time to live (multicast) or refclock mode */
+	u_short unused;		/* unused */
+	keyid_t keyid;		/* key to use for this association */
+};
+
 struct conf_peer {
 	u_int32 peeraddr;	/* address to poll */
 	u_char hmode;		/* mode, either broadcast, active or client */
@@ -560,12 +583,14 @@ struct conf_sys_flags {
 /*
  * System flags we can set/clear
  */
-#define	SYS_FLAG_BCLIENT	0x1
-#define	SYS_FLAG_PPS		0x2
-#define SYS_FLAG_NTP		0x4
-#define SYS_FLAG_KERNEL		0x8
+#define	SYS_FLAG_BCLIENT	0x01
+#define	SYS_FLAG_PPS		0x02
+#define SYS_FLAG_NTP		0x04
+#define SYS_FLAG_KERNEL		0x08
 #define SYS_FLAG_MONITOR	0x10
 #define SYS_FLAG_FILEGEN	0x20
+#define SYS_FLAG_AUTH		0x40
+#define SYS_FLAG_CAL		0x80
 
 /*
  * Structure used for returning restrict entries
diff --git a/contrib/ntp/include/ntpd.h b/contrib/ntp/include/ntpd.h
index d3db2fb..2e030e6 100644
--- a/contrib/ntp/include/ntpd.h
+++ b/contrib/ntp/include/ntpd.h
@@ -298,7 +298,7 @@ extern int	state;			/* clock discipline state */
 extern int	tc_counter;		/* poll-adjust counter */
 extern u_long	last_time;		/* time of last clock update (s) */
 extern double	last_offset;		/* last clock offset (s) */
-extern double	allan_xpt;		/* Allan intercept (s) */
+extern u_char	allan_xpt;		/* Allan intercept (s) */
 extern double	sys_error;		/* system RMS error (s) */
 extern double	sys_jitter;		/* system RMS jitter (s) */
 
diff --git a/contrib/ntp/kernel/Makefile.in b/contrib/ntp/kernel/Makefile.in
index 0b8beb2..ef204a8 100644
--- a/contrib/ntp/kernel/Makefile.in
+++ b/contrib/ntp/kernel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,42 +104,40 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 SUBDIRS = sys
 ETAGS_ARGS = Makefile.am
 EXTRA_DIST = chuinit.c clkinit.c tty_chu.c tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c
-EXEEXT =
-OBJEXT = o
 subdir = kernel
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DIST_COMMON = README Makefile.am Makefile.in
 
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README Makefile.am Makefile.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  kernel/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -150,10 +145,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -218,9 +210,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -234,10 +226,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -246,7 +238,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -272,7 +268,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-recursive
 all-am: Makefile
-
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -285,23 +280,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
@@ -310,11 +302,11 @@ distclean: distclean-recursive
 
 distclean-am: clean-am distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-recursive
 
 dvi-am:
 
-info:
+info: info-recursive
 
 info-am:
 
@@ -322,7 +314,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-recursive
 
 install-man:
 
@@ -336,20 +328,24 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am all-recursive check check-am check-recursive clean \
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive distclean distclean-generic \
 	distclean-recursive distclean-tags distdir dvi dvi-am \
 	dvi-recursive info info-am info-recursive install install-am \
 	install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-recursive install-man \
+	install-info install-info-am install-info-recursive install-man \
 	install-recursive install-strip installcheck installcheck-am \
-	installcheck-recursive installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
 	mostlyclean-recursive tags tags-recursive uninstall \
-	uninstall-am uninstall-info-recursive uninstall-recursive
-
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/ntp/kernel/sys/Makefile.in b/contrib/ntp/kernel/sys/Makefile.in
index 54f9ac9..58467a0 100644
--- a/contrib/ntp/kernel/sys/Makefile.in
+++ b/contrib/ntp/kernel/sys/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../../util/ansi2knr
 noinst_HEADERS = bsd_audioirig.h chudefs.h clkdefs.h i8253.h parsestreams.h \
 pcl720.h ppsclock.h timex.h tpro.h
@@ -125,8 +119,6 @@ pcl720.h ppsclock.h timex.h tpro.h
 # HMS: Avoid bug in automake 
 #ETAGS_ARGS = ""
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = kernel/sys
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -135,19 +127,17 @@ DIST_SOURCES =
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  kernel/sys/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 
 tags: TAGS
 
@@ -160,7 +150,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -176,10 +166,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -188,7 +178,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -213,23 +207,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -238,11 +229,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -250,7 +241,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -264,14 +255,16 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \
 	distclean-generic distclean-tags distdir dvi dvi-am info \
 	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic tags uninstall uninstall-am
-
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/ntp/libntp/Makefile.am b/contrib/ntp/libntp/Makefile.am
index 654981b..bf3dc99 100644
--- a/contrib/ntp/libntp/Makefile.am
+++ b/contrib/ntp/libntp/Makefile.am
@@ -2,21 +2,18 @@
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a
 libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-	authencrypt.c authkeys.c authparity.c authreadkeys.c authusekey.c \
-	buftvtots.c caljulian.c calleapwhen.c caltontp.c calyearstart.c \
-	clocktime.c clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \
-	emalloc.c findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
-	hextolfp.c humandate.c inttoa.c lib_strbuf.c machines.c md5c.c \
-	memmove.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
+	audio.c authencrypt.c authkeys.c authparity.c authreadkeys.c \
+	authusekey.c binio.c buftvtots.c caljulian.c calleapwhen.c caltontp.c \
+	calyearstart.c clocktime.c clocktypes.c decodenetnum.c dofptoa.c \
+	dolfptoa.c emalloc.c findconfig.c fptoa.c fptoms.c getopt.c \
+	gpstolfp.c hextoint.c hextolfp.c humandate.c icom.c ieee754io.c \
+	inttoa.c iosignal.c lib_strbuf.c machines.c md5c.c memmove.c \
+	mfp_mul.c mfptoa.c mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c \
 	msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
-	ranny.c refnumtoa.c statestr.c syssignal.c systime.c tsftomsu.c \
-	tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
-	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
-	icom.c audio.c
-EXTRA_libntp_a_SOURCES = adjtimex.c log.c mktime.c random.c snprintf.c \
-	strdup.c strerror.c
-libntp_a_LIBADD = @LIBOBJS@
-libntp_a_DEPENDENCIES = @LIBOBJS@
+	ranny.c recvbuff.c refnumtoa.c snprintf.c statestr.c strdup.c \
+	strerror.c syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
+	uglydate.c uinttoa.c utvtoa.c ymd2yd.c
+EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 ETAGS_ARGS = Makefile.am
 
diff --git a/contrib/ntp/libntp/Makefile.in b/contrib/ntp/libntp/Makefile.in
index d88ab32..8b4049e 100644
--- a/contrib/ntp/libntp/Makefile.in
+++ b/contrib/ntp/libntp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,310 +104,390 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a
 libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-	authencrypt.c authkeys.c authparity.c authreadkeys.c authusekey.c \
-	buftvtots.c caljulian.c calleapwhen.c caltontp.c calyearstart.c \
-	clocktime.c clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \
-	emalloc.c findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
-	hextolfp.c humandate.c inttoa.c lib_strbuf.c machines.c md5c.c \
-	memmove.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
+	audio.c authencrypt.c authkeys.c authparity.c authreadkeys.c \
+	authusekey.c binio.c buftvtots.c caljulian.c calleapwhen.c caltontp.c \
+	calyearstart.c clocktime.c clocktypes.c decodenetnum.c dofptoa.c \
+	dolfptoa.c emalloc.c findconfig.c fptoa.c fptoms.c getopt.c \
+	gpstolfp.c hextoint.c hextolfp.c humandate.c icom.c ieee754io.c \
+	inttoa.c iosignal.c lib_strbuf.c machines.c md5c.c memmove.c \
+	mfp_mul.c mfptoa.c mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c \
 	msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
-	ranny.c refnumtoa.c statestr.c syssignal.c systime.c tsftomsu.c \
-	tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
-	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
-	icom.c audio.c
-
-EXTRA_libntp_a_SOURCES = adjtimex.c log.c mktime.c random.c snprintf.c \
-	strdup.c strerror.c
+	ranny.c recvbuff.c refnumtoa.c snprintf.c statestr.c strdup.c \
+	strerror.c syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
+	uglydate.c uinttoa.c utvtoa.c ymd2yd.c
 
-libntp_a_LIBADD = @LIBOBJS@
-libntp_a_DEPENDENCIES = @LIBOBJS@
+EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h log.h
 
 EXTRA_DIST = README
-EXEEXT =
-OBJEXT = o
 subdir = libntp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 libntp_a_AR = $(AR) cru
+libntp_a_LIBADD =
 am_libntp_a_OBJECTS = a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \
-atoint$U.$(OBJEXT) atolfp$U.$(OBJEXT) atouint$U.$(OBJEXT) \
-authencrypt$U.$(OBJEXT) authkeys$U.$(OBJEXT) authparity$U.$(OBJEXT) \
-authreadkeys$U.$(OBJEXT) authusekey$U.$(OBJEXT) buftvtots$U.$(OBJEXT) \
-caljulian$U.$(OBJEXT) calleapwhen$U.$(OBJEXT) caltontp$U.$(OBJEXT) \
-calyearstart$U.$(OBJEXT) clocktime$U.$(OBJEXT) clocktypes$U.$(OBJEXT) \
-decodenetnum$U.$(OBJEXT) dofptoa$U.$(OBJEXT) dolfptoa$U.$(OBJEXT) \
-emalloc$U.$(OBJEXT) findconfig$U.$(OBJEXT) fptoa$U.$(OBJEXT) \
-fptoms$U.$(OBJEXT) getopt$U.$(OBJEXT) hextoint$U.$(OBJEXT) \
-hextolfp$U.$(OBJEXT) humandate$U.$(OBJEXT) inttoa$U.$(OBJEXT) \
-lib_strbuf$U.$(OBJEXT) machines$U.$(OBJEXT) md5c$U.$(OBJEXT) \
-memmove$U.$(OBJEXT) mfptoa$U.$(OBJEXT) mfptoms$U.$(OBJEXT) \
-modetoa$U.$(OBJEXT) mstolfp$U.$(OBJEXT) msutotsf$U.$(OBJEXT) \
-msyslog$U.$(OBJEXT) netof$U.$(OBJEXT) numtoa$U.$(OBJEXT) \
-numtohost$U.$(OBJEXT) octtoint$U.$(OBJEXT) prettydate$U.$(OBJEXT) \
-ranny$U.$(OBJEXT) refnumtoa$U.$(OBJEXT) statestr$U.$(OBJEXT) \
-syssignal$U.$(OBJEXT) systime$U.$(OBJEXT) tsftomsu$U.$(OBJEXT) \
-tstotv$U.$(OBJEXT) tvtoa$U.$(OBJEXT) tvtots$U.$(OBJEXT) \
-uglydate$U.$(OBJEXT) uinttoa$U.$(OBJEXT) utvtoa$U.$(OBJEXT) \
-ymd2yd$U.$(OBJEXT) mfp_mul$U.$(OBJEXT) binio$U.$(OBJEXT) \
-ieee754io$U.$(OBJEXT) gpstolfp$U.$(OBJEXT) recvbuff$U.$(OBJEXT) \
-iosignal$U.$(OBJEXT) icom$U.$(OBJEXT) audio$U.$(OBJEXT)
+	atoint$U.$(OBJEXT) atolfp$U.$(OBJEXT) atouint$U.$(OBJEXT) \
+	audio$U.$(OBJEXT) authencrypt$U.$(OBJEXT) authkeys$U.$(OBJEXT) \
+	authparity$U.$(OBJEXT) authreadkeys$U.$(OBJEXT) \
+	authusekey$U.$(OBJEXT) binio$U.$(OBJEXT) buftvtots$U.$(OBJEXT) \
+	caljulian$U.$(OBJEXT) calleapwhen$U.$(OBJEXT) \
+	caltontp$U.$(OBJEXT) calyearstart$U.$(OBJEXT) \
+	clocktime$U.$(OBJEXT) clocktypes$U.$(OBJEXT) \
+	decodenetnum$U.$(OBJEXT) dofptoa$U.$(OBJEXT) \
+	dolfptoa$U.$(OBJEXT) emalloc$U.$(OBJEXT) findconfig$U.$(OBJEXT) \
+	fptoa$U.$(OBJEXT) fptoms$U.$(OBJEXT) getopt$U.$(OBJEXT) \
+	gpstolfp$U.$(OBJEXT) hextoint$U.$(OBJEXT) hextolfp$U.$(OBJEXT) \
+	humandate$U.$(OBJEXT) icom$U.$(OBJEXT) ieee754io$U.$(OBJEXT) \
+	inttoa$U.$(OBJEXT) iosignal$U.$(OBJEXT) lib_strbuf$U.$(OBJEXT) \
+	machines$U.$(OBJEXT) md5c$U.$(OBJEXT) memmove$U.$(OBJEXT) \
+	mfp_mul$U.$(OBJEXT) mfptoa$U.$(OBJEXT) mfptoms$U.$(OBJEXT) \
+	mktime$U.$(OBJEXT) modetoa$U.$(OBJEXT) mstolfp$U.$(OBJEXT) \
+	msutotsf$U.$(OBJEXT) msyslog$U.$(OBJEXT) netof$U.$(OBJEXT) \
+	numtoa$U.$(OBJEXT) numtohost$U.$(OBJEXT) octtoint$U.$(OBJEXT) \
+	prettydate$U.$(OBJEXT) ranny$U.$(OBJEXT) recvbuff$U.$(OBJEXT) \
+	refnumtoa$U.$(OBJEXT) snprintf$U.$(OBJEXT) statestr$U.$(OBJEXT) \
+	strdup$U.$(OBJEXT) strerror$U.$(OBJEXT) syssignal$U.$(OBJEXT) \
+	systime$U.$(OBJEXT) tsftomsu$U.$(OBJEXT) tstotv$U.$(OBJEXT) \
+	tvtoa$U.$(OBJEXT) tvtots$U.$(OBJEXT) uglydate$U.$(OBJEXT) \
+	uinttoa$U.$(OBJEXT) utvtoa$U.$(OBJEXT) ymd2yd$U.$(OBJEXT)
 libntp_a_OBJECTS = $(am_libntp_a_OBJECTS)
-AR = ar
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/a_md5encrypt$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/adjtime$U.Po $(DEPDIR)/adjtimex$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/atoint$U.Po $(DEPDIR)/atolfp$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/atouint$U.Po $(DEPDIR)/audio$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/authencrypt$U.Po $(DEPDIR)/authkeys$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/authparity$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/authreadkeys$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/authusekey$U.Po $(DEPDIR)/binio$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/buftvtots$U.Po $(DEPDIR)/caljulian$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/calleapwhen$U.Po $(DEPDIR)/caltontp$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/calyearstart$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clocktime$U.Po $(DEPDIR)/clocktypes$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/decodenetnum$U.Po $(DEPDIR)/dofptoa$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/dolfptoa$U.Po $(DEPDIR)/emalloc$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/findconfig$U.Po $(DEPDIR)/fptoa$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/fptoms$U.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/gpstolfp$U.Po $(DEPDIR)/hextoint$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/hextolfp$U.Po $(DEPDIR)/humandate$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/icom$U.Po $(DEPDIR)/ieee754io$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/inttoa$U.Po $(DEPDIR)/iosignal$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/lib_strbuf$U.Po $(DEPDIR)/log$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/machines$U.Po $(DEPDIR)/md5c$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memmove$U.Po $(DEPDIR)/mfp_mul$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mfptoa$U.Po $(DEPDIR)/mfptoms$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mktime$U.Po $(DEPDIR)/modetoa$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mstolfp$U.Po $(DEPDIR)/msutotsf$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/msyslog$U.Po $(DEPDIR)/netof$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/numtoa$U.Po $(DEPDIR)/numtohost$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/octtoint$U.Po $(DEPDIR)/prettydate$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/random$U.Po $(DEPDIR)/ranny$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/recvbuff$U.Po $(DEPDIR)/refnumtoa$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/snprintf$U.Po $(DEPDIR)/statestr$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strdup$U.Po $(DEPDIR)/strerror$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/syssignal$U.Po $(DEPDIR)/systime$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tsftomsu$U.Po $(DEPDIR)/tstotv$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tvtoa$U.Po $(DEPDIR)/tvtots$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/uglydate$U.Po $(DEPDIR)/uinttoa$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/utvtoa$U.Po $(DEPDIR)/ymd2yd$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/*.Po $(DEPDIR)/a_md5encrypt$U.Po \
-@AMDEP@ $(DEPDIR)/adjtime$U.Po $(DEPDIR)/adjtimex$U.Po \
-@AMDEP@ $(DEPDIR)/atoint$U.Po $(DEPDIR)/atolfp$U.Po \
-@AMDEP@ $(DEPDIR)/atouint$U.Po $(DEPDIR)/audio$U.Po \
-@AMDEP@ $(DEPDIR)/authencrypt$U.Po $(DEPDIR)/authkeys$U.Po \
-@AMDEP@ $(DEPDIR)/authparity$U.Po $(DEPDIR)/authreadkeys$U.Po \
-@AMDEP@ $(DEPDIR)/authusekey$U.Po $(DEPDIR)/binio$U.Po \
-@AMDEP@ $(DEPDIR)/buftvtots$U.Po $(DEPDIR)/caljulian$U.Po \
-@AMDEP@ $(DEPDIR)/calleapwhen$U.Po $(DEPDIR)/caltontp$U.Po \
-@AMDEP@ $(DEPDIR)/calyearstart$U.Po $(DEPDIR)/clocktime$U.Po \
-@AMDEP@ $(DEPDIR)/clocktypes$U.Po $(DEPDIR)/decodenetnum$U.Po \
-@AMDEP@ $(DEPDIR)/dofptoa$U.Po $(DEPDIR)/dolfptoa$U.Po \
-@AMDEP@ $(DEPDIR)/emalloc$U.Po $(DEPDIR)/findconfig$U.Po \
-@AMDEP@ $(DEPDIR)/fptoa$U.Po $(DEPDIR)/fptoms$U.Po $(DEPDIR)/getopt$U.Po \
-@AMDEP@ $(DEPDIR)/gpstolfp$U.Po $(DEPDIR)/hextoint$U.Po \
-@AMDEP@ $(DEPDIR)/hextolfp$U.Po $(DEPDIR)/humandate$U.Po \
-@AMDEP@ $(DEPDIR)/icom$U.Po $(DEPDIR)/ieee754io$U.Po \
-@AMDEP@ $(DEPDIR)/inttoa$U.Po $(DEPDIR)/iosignal$U.Po \
-@AMDEP@ $(DEPDIR)/lib_strbuf$U.Po $(DEPDIR)/log$U.Po \
-@AMDEP@ $(DEPDIR)/machines$U.Po $(DEPDIR)/md5c$U.Po \
-@AMDEP@ $(DEPDIR)/memmove$U.Po $(DEPDIR)/mfp_mul$U.Po \
-@AMDEP@ $(DEPDIR)/mfptoa$U.Po $(DEPDIR)/mfptoms$U.Po \
-@AMDEP@ $(DEPDIR)/mktime$U.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modetoa$U.Po \
-@AMDEP@ $(DEPDIR)/mstolfp$U.Po $(DEPDIR)/msutotsf$U.Po \
-@AMDEP@ $(DEPDIR)/msyslog$U.Po $(DEPDIR)/netof$U.Po \
-@AMDEP@ $(DEPDIR)/numtoa$U.Po $(DEPDIR)/numtohost$U.Po \
-@AMDEP@ $(DEPDIR)/octtoint$U.Po $(DEPDIR)/prettydate$U.Po \
-@AMDEP@ $(DEPDIR)/random$U.Po $(DEPDIR)/ranny$U.Po \
-@AMDEP@ $(DEPDIR)/recvbuff$U.Po $(DEPDIR)/refnumtoa$U.Po \
-@AMDEP@ $(DEPDIR)/snprintf$U.Po $(DEPDIR)/snprintf.Po \
-@AMDEP@ $(DEPDIR)/statestr$U.Po $(DEPDIR)/strdup$U.Po \
-@AMDEP@ $(DEPDIR)/strdup.Po $(DEPDIR)/strerror$U.Po \
-@AMDEP@ $(DEPDIR)/strerror.Po $(DEPDIR)/syssignal$U.Po \
-@AMDEP@ $(DEPDIR)/systime$U.Po $(DEPDIR)/tsftomsu$U.Po \
-@AMDEP@ $(DEPDIR)/tstotv$U.Po $(DEPDIR)/tvtoa$U.Po $(DEPDIR)/tvtots$U.Po \
-@AMDEP@ $(DEPDIR)/uglydate$U.Po $(DEPDIR)/uinttoa$U.Po \
-@AMDEP@ $(DEPDIR)/utvtoa$U.Po $(DEPDIR)/ymd2yd$U.Po
-DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in mktime.c \
-snprintf.c strdup.c strerror.c
-
+DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
 SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES)
-OBJECTS = $(am_libntp_a_OBJECTS)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  libntp/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
+AR = ar
+
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES) 
+	-rm -f libntp.a
+	$(libntp_a_AR) libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD)
+	$(RANLIB) libntp.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES)
-	-rm -f libntp.a
-	$(libntp_a_AR) libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD)
-	$(RANLIB) libntp.a
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/a_md5encrypt$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/adjtime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/adjtimex$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atoint$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atolfp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/atouint$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/audio$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authencrypt$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authkeys$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authparity$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authreadkeys$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/authusekey$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/binio$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/buftvtots$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/caljulian$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/calleapwhen$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/caltontp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/calyearstart$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clocktime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clocktypes$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/decodenetnum$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dofptoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dolfptoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/emalloc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/findconfig$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fptoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fptoms$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gpstolfp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hextoint$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hextolfp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/humandate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icom$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ieee754io$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inttoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iosignal$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lib_strbuf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/log$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/machines$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5c$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mfp_mul$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mfptoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mfptoms$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mktime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/modetoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mstolfp$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/msutotsf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/msyslog$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/netof$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/numtoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/numtohost$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/octtoint$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/prettydate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/random$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ranny$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recvbuff$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refnumtoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/statestr$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/syssignal$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/systime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tsftomsu$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tstotv$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tvtoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tvtots$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uglydate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/uinttoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utvtoa$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ymd2yd$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 a_md5encrypt_.c: a_md5encrypt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/a_md5encrypt.c; then echo $(srcdir)/a_md5encrypt.c; else echo a_md5encrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > a_md5encrypt_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/a_md5encrypt.c; then echo $(srcdir)/a_md5encrypt.c; else echo a_md5encrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > a_md5encrypt_.c || rm -f a_md5encrypt_.c
 adjtime_.c: adjtime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtime.c; then echo $(srcdir)/adjtime.c; else echo adjtime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtime.c; then echo $(srcdir)/adjtime.c; else echo adjtime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtime_.c || rm -f adjtime_.c
 adjtimex_.c: adjtimex.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimex.c; then echo $(srcdir)/adjtimex.c; else echo adjtimex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimex_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimex.c; then echo $(srcdir)/adjtimex.c; else echo adjtimex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimex_.c || rm -f adjtimex_.c
 atoint_.c: atoint.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atoint.c; then echo $(srcdir)/atoint.c; else echo atoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atoint_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atoint.c; then echo $(srcdir)/atoint.c; else echo atoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atoint_.c || rm -f atoint_.c
 atolfp_.c: atolfp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atolfp.c; then echo $(srcdir)/atolfp.c; else echo atolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atolfp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atolfp.c; then echo $(srcdir)/atolfp.c; else echo atolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atolfp_.c || rm -f atolfp_.c
 atouint_.c: atouint.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atouint.c; then echo $(srcdir)/atouint.c; else echo atouint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atouint_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atouint.c; then echo $(srcdir)/atouint.c; else echo atouint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atouint_.c || rm -f atouint_.c
 audio_.c: audio.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/audio.c; then echo $(srcdir)/audio.c; else echo audio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > audio_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/audio.c; then echo $(srcdir)/audio.c; else echo audio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > audio_.c || rm -f audio_.c
 authencrypt_.c: authencrypt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authencrypt.c; then echo $(srcdir)/authencrypt.c; else echo authencrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authencrypt_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authencrypt.c; then echo $(srcdir)/authencrypt.c; else echo authencrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authencrypt_.c || rm -f authencrypt_.c
 authkeys_.c: authkeys.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authkeys.c; then echo $(srcdir)/authkeys.c; else echo authkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authkeys_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authkeys.c; then echo $(srcdir)/authkeys.c; else echo authkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authkeys_.c || rm -f authkeys_.c
 authparity_.c: authparity.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authparity.c; then echo $(srcdir)/authparity.c; else echo authparity.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authparity_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authparity.c; then echo $(srcdir)/authparity.c; else echo authparity.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authparity_.c || rm -f authparity_.c
 authreadkeys_.c: authreadkeys.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authreadkeys.c; then echo $(srcdir)/authreadkeys.c; else echo authreadkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authreadkeys_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authreadkeys.c; then echo $(srcdir)/authreadkeys.c; else echo authreadkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authreadkeys_.c || rm -f authreadkeys_.c
 authusekey_.c: authusekey.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authusekey.c; then echo $(srcdir)/authusekey.c; else echo authusekey.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authusekey_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authusekey.c; then echo $(srcdir)/authusekey.c; else echo authusekey.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authusekey_.c || rm -f authusekey_.c
 binio_.c: binio.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/binio.c; then echo $(srcdir)/binio.c; else echo binio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > binio_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/binio.c; then echo $(srcdir)/binio.c; else echo binio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > binio_.c || rm -f binio_.c
 buftvtots_.c: buftvtots.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/buftvtots.c; then echo $(srcdir)/buftvtots.c; else echo buftvtots.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > buftvtots_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/buftvtots.c; then echo $(srcdir)/buftvtots.c; else echo buftvtots.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > buftvtots_.c || rm -f buftvtots_.c
 caljulian_.c: caljulian.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caljulian.c; then echo $(srcdir)/caljulian.c; else echo caljulian.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > caljulian_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caljulian.c; then echo $(srcdir)/caljulian.c; else echo caljulian.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > caljulian_.c || rm -f caljulian_.c
 calleapwhen_.c: calleapwhen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calleapwhen.c; then echo $(srcdir)/calleapwhen.c; else echo calleapwhen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calleapwhen_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calleapwhen.c; then echo $(srcdir)/calleapwhen.c; else echo calleapwhen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calleapwhen_.c || rm -f calleapwhen_.c
 caltontp_.c: caltontp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caltontp.c; then echo $(srcdir)/caltontp.c; else echo caltontp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > caltontp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caltontp.c; then echo $(srcdir)/caltontp.c; else echo caltontp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > caltontp_.c || rm -f caltontp_.c
 calyearstart_.c: calyearstart.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calyearstart.c; then echo $(srcdir)/calyearstart.c; else echo calyearstart.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calyearstart_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calyearstart.c; then echo $(srcdir)/calyearstart.c; else echo calyearstart.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calyearstart_.c || rm -f calyearstart_.c
 clocktime_.c: clocktime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clocktime.c; then echo $(srcdir)/clocktime.c; else echo clocktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clocktime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clocktime.c; then echo $(srcdir)/clocktime.c; else echo clocktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clocktime_.c || rm -f clocktime_.c
 clocktypes_.c: clocktypes.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clocktypes.c; then echo $(srcdir)/clocktypes.c; else echo clocktypes.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clocktypes_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clocktypes.c; then echo $(srcdir)/clocktypes.c; else echo clocktypes.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clocktypes_.c || rm -f clocktypes_.c
 decodenetnum_.c: decodenetnum.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/decodenetnum.c; then echo $(srcdir)/decodenetnum.c; else echo decodenetnum.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > decodenetnum_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/decodenetnum.c; then echo $(srcdir)/decodenetnum.c; else echo decodenetnum.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > decodenetnum_.c || rm -f decodenetnum_.c
 dofptoa_.c: dofptoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dofptoa.c; then echo $(srcdir)/dofptoa.c; else echo dofptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dofptoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dofptoa.c; then echo $(srcdir)/dofptoa.c; else echo dofptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dofptoa_.c || rm -f dofptoa_.c
 dolfptoa_.c: dolfptoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dolfptoa.c; then echo $(srcdir)/dolfptoa.c; else echo dolfptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dolfptoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dolfptoa.c; then echo $(srcdir)/dolfptoa.c; else echo dolfptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dolfptoa_.c || rm -f dolfptoa_.c
 emalloc_.c: emalloc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/emalloc.c; then echo $(srcdir)/emalloc.c; else echo emalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > emalloc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/emalloc.c; then echo $(srcdir)/emalloc.c; else echo emalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > emalloc_.c || rm -f emalloc_.c
 findconfig_.c: findconfig.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/findconfig.c; then echo $(srcdir)/findconfig.c; else echo findconfig.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > findconfig_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/findconfig.c; then echo $(srcdir)/findconfig.c; else echo findconfig.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > findconfig_.c || rm -f findconfig_.c
 fptoa_.c: fptoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fptoa.c; then echo $(srcdir)/fptoa.c; else echo fptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fptoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fptoa.c; then echo $(srcdir)/fptoa.c; else echo fptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fptoa_.c || rm -f fptoa_.c
 fptoms_.c: fptoms.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fptoms.c; then echo $(srcdir)/fptoms.c; else echo fptoms.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fptoms_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fptoms.c; then echo $(srcdir)/fptoms.c; else echo fptoms.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fptoms_.c || rm -f fptoms_.c
 getopt_.c: getopt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c || rm -f getopt_.c
 gpstolfp_.c: gpstolfp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gpstolfp.c; then echo $(srcdir)/gpstolfp.c; else echo gpstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gpstolfp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gpstolfp.c; then echo $(srcdir)/gpstolfp.c; else echo gpstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gpstolfp_.c || rm -f gpstolfp_.c
 hextoint_.c: hextoint.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextoint.c; then echo $(srcdir)/hextoint.c; else echo hextoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hextoint_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextoint.c; then echo $(srcdir)/hextoint.c; else echo hextoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hextoint_.c || rm -f hextoint_.c
 hextolfp_.c: hextolfp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextolfp.c; then echo $(srcdir)/hextolfp.c; else echo hextolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hextolfp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextolfp.c; then echo $(srcdir)/hextolfp.c; else echo hextolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hextolfp_.c || rm -f hextolfp_.c
 humandate_.c: humandate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/humandate.c; then echo $(srcdir)/humandate.c; else echo humandate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > humandate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/humandate.c; then echo $(srcdir)/humandate.c; else echo humandate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > humandate_.c || rm -f humandate_.c
 icom_.c: icom.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/icom.c; then echo $(srcdir)/icom.c; else echo icom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > icom_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/icom.c; then echo $(srcdir)/icom.c; else echo icom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > icom_.c || rm -f icom_.c
 ieee754io_.c: ieee754io.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ieee754io.c; then echo $(srcdir)/ieee754io.c; else echo ieee754io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ieee754io_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ieee754io.c; then echo $(srcdir)/ieee754io.c; else echo ieee754io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ieee754io_.c || rm -f ieee754io_.c
 inttoa_.c: inttoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/inttoa.c; then echo $(srcdir)/inttoa.c; else echo inttoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > inttoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/inttoa.c; then echo $(srcdir)/inttoa.c; else echo inttoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > inttoa_.c || rm -f inttoa_.c
 iosignal_.c: iosignal.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/iosignal.c; then echo $(srcdir)/iosignal.c; else echo iosignal.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > iosignal_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/iosignal.c; then echo $(srcdir)/iosignal.c; else echo iosignal.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > iosignal_.c || rm -f iosignal_.c
 lib_strbuf_.c: lib_strbuf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lib_strbuf.c; then echo $(srcdir)/lib_strbuf.c; else echo lib_strbuf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lib_strbuf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lib_strbuf.c; then echo $(srcdir)/lib_strbuf.c; else echo lib_strbuf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lib_strbuf_.c || rm -f lib_strbuf_.c
 log_.c: log.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/log.c; then echo $(srcdir)/log.c; else echo log.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > log_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/log.c; then echo $(srcdir)/log.c; else echo log.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > log_.c || rm -f log_.c
 machines_.c: machines.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/machines.c; then echo $(srcdir)/machines.c; else echo machines.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > machines_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/machines.c; then echo $(srcdir)/machines.c; else echo machines.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > machines_.c || rm -f machines_.c
 md5c_.c: md5c.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5c.c; then echo $(srcdir)/md5c.c; else echo md5c.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5c_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5c.c; then echo $(srcdir)/md5c.c; else echo md5c.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5c_.c || rm -f md5c_.c
 memmove_.c: memmove.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c || rm -f memmove_.c
 mfp_mul_.c: mfp_mul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfp_mul.c; then echo $(srcdir)/mfp_mul.c; else echo mfp_mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfp_mul_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfp_mul.c; then echo $(srcdir)/mfp_mul.c; else echo mfp_mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfp_mul_.c || rm -f mfp_mul_.c
 mfptoa_.c: mfptoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfptoa.c; then echo $(srcdir)/mfptoa.c; else echo mfptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfptoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfptoa.c; then echo $(srcdir)/mfptoa.c; else echo mfptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfptoa_.c || rm -f mfptoa_.c
 mfptoms_.c: mfptoms.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfptoms.c; then echo $(srcdir)/mfptoms.c; else echo mfptoms.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfptoms_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfptoms.c; then echo $(srcdir)/mfptoms.c; else echo mfptoms.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfptoms_.c || rm -f mfptoms_.c
 mktime_.c: mktime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c || rm -f mktime_.c
 modetoa_.c: modetoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/modetoa.c; then echo $(srcdir)/modetoa.c; else echo modetoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > modetoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/modetoa.c; then echo $(srcdir)/modetoa.c; else echo modetoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > modetoa_.c || rm -f modetoa_.c
 mstolfp_.c: mstolfp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mstolfp.c; then echo $(srcdir)/mstolfp.c; else echo mstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mstolfp_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mstolfp.c; then echo $(srcdir)/mstolfp.c; else echo mstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mstolfp_.c || rm -f mstolfp_.c
 msutotsf_.c: msutotsf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msutotsf.c; then echo $(srcdir)/msutotsf.c; else echo msutotsf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > msutotsf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msutotsf.c; then echo $(srcdir)/msutotsf.c; else echo msutotsf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > msutotsf_.c || rm -f msutotsf_.c
 msyslog_.c: msyslog.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msyslog.c; then echo $(srcdir)/msyslog.c; else echo msyslog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > msyslog_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msyslog.c; then echo $(srcdir)/msyslog.c; else echo msyslog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > msyslog_.c || rm -f msyslog_.c
 netof_.c: netof.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/netof.c; then echo $(srcdir)/netof.c; else echo netof.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > netof_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/netof.c; then echo $(srcdir)/netof.c; else echo netof.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > netof_.c || rm -f netof_.c
 numtoa_.c: numtoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/numtoa.c; then echo $(srcdir)/numtoa.c; else echo numtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > numtoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/numtoa.c; then echo $(srcdir)/numtoa.c; else echo numtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > numtoa_.c || rm -f numtoa_.c
 numtohost_.c: numtohost.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/numtohost.c; then echo $(srcdir)/numtohost.c; else echo numtohost.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > numtohost_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/numtohost.c; then echo $(srcdir)/numtohost.c; else echo numtohost.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > numtohost_.c || rm -f numtohost_.c
 octtoint_.c: octtoint.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/octtoint.c; then echo $(srcdir)/octtoint.c; else echo octtoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > octtoint_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/octtoint.c; then echo $(srcdir)/octtoint.c; else echo octtoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > octtoint_.c || rm -f octtoint_.c
 prettydate_.c: prettydate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/prettydate.c; then echo $(srcdir)/prettydate.c; else echo prettydate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > prettydate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/prettydate.c; then echo $(srcdir)/prettydate.c; else echo prettydate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > prettydate_.c || rm -f prettydate_.c
 random_.c: random.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/random.c; then echo $(srcdir)/random.c; else echo random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > random_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/random.c; then echo $(srcdir)/random.c; else echo random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > random_.c || rm -f random_.c
 ranny_.c: ranny.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ranny.c; then echo $(srcdir)/ranny.c; else echo ranny.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ranny_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ranny.c; then echo $(srcdir)/ranny.c; else echo ranny.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ranny_.c || rm -f ranny_.c
 recvbuff_.c: recvbuff.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/recvbuff.c; then echo $(srcdir)/recvbuff.c; else echo recvbuff.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > recvbuff_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/recvbuff.c; then echo $(srcdir)/recvbuff.c; else echo recvbuff.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > recvbuff_.c || rm -f recvbuff_.c
 refnumtoa_.c: refnumtoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refnumtoa.c; then echo $(srcdir)/refnumtoa.c; else echo refnumtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refnumtoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refnumtoa.c; then echo $(srcdir)/refnumtoa.c; else echo refnumtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refnumtoa_.c || rm -f refnumtoa_.c
 snprintf_.c: snprintf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/snprintf.c; then echo $(srcdir)/snprintf.c; else echo snprintf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > snprintf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/snprintf.c; then echo $(srcdir)/snprintf.c; else echo snprintf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > snprintf_.c || rm -f snprintf_.c
 statestr_.c: statestr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/statestr.c; then echo $(srcdir)/statestr.c; else echo statestr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > statestr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/statestr.c; then echo $(srcdir)/statestr.c; else echo statestr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > statestr_.c || rm -f statestr_.c
 strdup_.c: strdup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strdup_.c || rm -f strdup_.c
 strerror_.c: strerror.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strerror.c; then echo $(srcdir)/strerror.c; else echo strerror.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strerror_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strerror.c; then echo $(srcdir)/strerror.c; else echo strerror.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strerror_.c || rm -f strerror_.c
 syssignal_.c: syssignal.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/syssignal.c; then echo $(srcdir)/syssignal.c; else echo syssignal.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > syssignal_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/syssignal.c; then echo $(srcdir)/syssignal.c; else echo syssignal.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > syssignal_.c || rm -f syssignal_.c
 systime_.c: systime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/systime.c; then echo $(srcdir)/systime.c; else echo systime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > systime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/systime.c; then echo $(srcdir)/systime.c; else echo systime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > systime_.c || rm -f systime_.c
 tsftomsu_.c: tsftomsu.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tsftomsu.c; then echo $(srcdir)/tsftomsu.c; else echo tsftomsu.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tsftomsu_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tsftomsu.c; then echo $(srcdir)/tsftomsu.c; else echo tsftomsu.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tsftomsu_.c || rm -f tsftomsu_.c
 tstotv_.c: tstotv.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tstotv.c; then echo $(srcdir)/tstotv.c; else echo tstotv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tstotv_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tstotv.c; then echo $(srcdir)/tstotv.c; else echo tstotv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tstotv_.c || rm -f tstotv_.c
 tvtoa_.c: tvtoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tvtoa.c; then echo $(srcdir)/tvtoa.c; else echo tvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tvtoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tvtoa.c; then echo $(srcdir)/tvtoa.c; else echo tvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tvtoa_.c || rm -f tvtoa_.c
 tvtots_.c: tvtots.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tvtots.c; then echo $(srcdir)/tvtots.c; else echo tvtots.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tvtots_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tvtots.c; then echo $(srcdir)/tvtots.c; else echo tvtots.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tvtots_.c || rm -f tvtots_.c
 uglydate_.c: uglydate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/uglydate.c; then echo $(srcdir)/uglydate.c; else echo uglydate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > uglydate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/uglydate.c; then echo $(srcdir)/uglydate.c; else echo uglydate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > uglydate_.c || rm -f uglydate_.c
 uinttoa_.c: uinttoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/uinttoa.c; then echo $(srcdir)/uinttoa.c; else echo uinttoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > uinttoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/uinttoa.c; then echo $(srcdir)/uinttoa.c; else echo uinttoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > uinttoa_.c || rm -f uinttoa_.c
 utvtoa_.c: utvtoa.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utvtoa.c; then echo $(srcdir)/utvtoa.c; else echo utvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > utvtoa_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utvtoa.c; then echo $(srcdir)/utvtoa.c; else echo utvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > utvtoa_.c || rm -f utvtoa_.c
 ymd2yd_.c: ymd2yd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ymd2yd.c; then echo $(srcdir)/ymd2yd.c; else echo ymd2yd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ymd2yd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ymd2yd.c; then echo $(srcdir)/ymd2yd.c; else echo ymd2yd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ymd2yd_.c || rm -f ymd2yd_.c
 a_md5encrypt_.$(OBJEXT) adjtime_.$(OBJEXT) adjtimex_.$(OBJEXT) \
 atoint_.$(OBJEXT) atolfp_.$(OBJEXT) atouint_.$(OBJEXT) audio_.$(OBJEXT) \
 authencrypt_.$(OBJEXT) authkeys_.$(OBJEXT) authparity_.$(OBJEXT) \
@@ -435,6 +512,7 @@ syssignal_.$(OBJEXT) systime_.$(OBJEXT) tsftomsu_.$(OBJEXT) \
 tstotv_.$(OBJEXT) tvtoa_.$(OBJEXT) tvtots_.$(OBJEXT) \
 uglydate_.$(OBJEXT) uinttoa_.$(OBJEXT) utvtoa_.$(OBJEXT) \
 ymd2yd_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -447,7 +525,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -463,106 +541,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/*.Po
-@AMDEP@@_am_include@ $(DEPDIR)/a_md5encrypt$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/adjtime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/adjtimex$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/atoint$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/atolfp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/atouint$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/audio$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/authencrypt$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/authkeys$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/authparity$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/authreadkeys$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/authusekey$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/binio$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/buftvtots$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/caljulian$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/calleapwhen$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/caltontp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/calyearstart$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clocktime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clocktypes$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/decodenetnum$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dofptoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/dolfptoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/emalloc$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/findconfig$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fptoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/fptoms$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/getopt$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/gpstolfp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/hextoint$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/hextolfp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/humandate$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/icom$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ieee754io$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/inttoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/iosignal$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/lib_strbuf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/log$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/machines$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/md5c$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/memmove$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mfp_mul$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mfptoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mfptoms$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mktime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mktime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/modetoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/mstolfp$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/msutotsf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/msyslog$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/netof$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/numtoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/numtohost$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/octtoint$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/prettydate$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/random$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ranny$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/recvbuff$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refnumtoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/snprintf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/snprintf.Po
-@AMDEP@@_am_include@ $(DEPDIR)/statestr$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strdup$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strdup.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strerror$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/strerror.Po
-@AMDEP@@_am_include@ $(DEPDIR)/syssignal$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/systime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tsftomsu$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tstotv$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tvtoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tvtots$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/uglydate$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/uinttoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/utvtoa$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ymd2yd$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -571,7 +553,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -596,23 +582,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
@@ -622,11 +605,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -634,7 +617,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -648,15 +631,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-.PHONY: all all-am check check-am clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr tags uninstall uninstall-am
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-info-am
 
 
 ../include/des.h:
@@ -667,7 +653,6 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
 #strerror_.c: strerror.c $(ANSI2KNR)
 #	$(ANSI2KNR) $< strerror_.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/libntp/adjtime.c b/contrib/ntp/libntp/adjtime.c
index 72be860..a9989f0 100644
--- a/contrib/ntp/libntp/adjtime.c
+++ b/contrib/ntp/libntp/adjtime.c
@@ -2,6 +2,103 @@
 #include 
 #endif
 
+#ifdef MPE 
+/*
+ * MPE lacks adjtime(), so we define our own.  But note that time slewing has
+ * a sub-second accuracy bug documented in SR 5003462838 which prevents ntpd
+ * from being able to maintain clock synch.  Because of the bug, this adjtime()
+ * implementation as used by ntpd has a side-effect of screwing up the hardware
+ * PDC clock, which will need to be reset with a reboot.
+ *
+ * This problem affects all versions of MPE at the time of this writing (when
+ * MPE/iX 7.0 is the most current).  It only causes bad things to happen when
+ * doing continuous clock synchronization with ntpd; note that you CAN run ntpd
+ * with "disable ntp" in ntp.conf if you wish to provide a time server.
+ *
+ * The one-time clock adjustment functionality of ntpdate and ntp_timeset can
+ * be used without screwing up the PDC clock.
+ * 
+ */
+#include 
+
+int adjtime(struct timeval *delta, struct timeval *olddelta);
+
+int adjtime(struct timeval *delta, struct timeval *olddelta)
+
+{
+/* Documented, supported MPE system intrinsics. */
+
+extern void GETPRIVMODE(void);
+extern void GETUSERMODE(void);
+
+/* Undocumented, unsupported MPE internal functions. */
+
+extern long long current_correction_usecs(void);
+extern long long get_time(void);
+extern void get_time_change_info(long long *, char *, char *);
+extern long long pdc_time(int *);
+extern void set_time_correction(long long, int, int);
+extern long long ticks_to_micro(long long);
+
+long long big_sec, big_usec, new_correction = 0LL;
+long long prev_correction;
+
+if (delta != NULL) {
+  /* Adjustment required.  Convert delta to 64-bit microseconds. */
+  big_sec = (long)delta->tv_sec;
+  big_usec = delta->tv_usec;
+  new_correction = (big_sec * 1000000LL) + big_usec;
+}
+
+GETPRIVMODE();
+
+/* Determine how much of a previous correction (if any) we're interrupting. */
+prev_correction = current_correction_usecs();
+
+if (delta != NULL) {
+  /* Adjustment required. */
+
+#if 0
+  /* Speculative code disabled until bug SR 5003462838 is fixed.  This bug
+     prevents accurate time slewing, and indeed renders ntpd inoperable. */
+
+  if (prev_correction != 0LL) {
+    /* A previous adjustment did not complete.  Since the PDC UTC clock was
+    immediately jumped at the start of the previous adjustment, we must
+    explicitly reset it to the value of the MPE local time clock minus the
+    time zone offset. */
+
+    char pwf_since_boot, recover_pwf_time;
+    long long offset_ticks, offset_usecs, pdc_usecs_current, pdc_usecs_wanted;
+    int hpe_status;
+
+    get_time_change_info(&offset_ticks, &pwf_since_boot, &recover_pwf_time);
+    offset_usecs = ticks_to_micro(offset_ticks);
+    pdc_usecs_wanted = get_time() - offset_usecs;
+    pdc_usecs_current = pdc_time(&hpe_status);
+    if (hpe_status == 0) 
+      /* Force new PDC time by starting an extra correction. */
+      set_time_correction(pdc_usecs_wanted - pdc_usecs_current,0,1);
+  }
+#endif
+    
+  /* Immediately jump the PDC time to the new value, and then initiate a 
+     gradual MPE time correction slew. */
+  set_time_correction(new_correction,0,1);
+}
+
+GETUSERMODE();
+
+if (olddelta != NULL) {
+  /* Caller wants to know remaining amount of previous correction. */
+  (long)olddelta->tv_sec = prev_correction / 1000000LL;
+  olddelta->tv_usec = prev_correction % 1000000LL;
+}
+
+return 0;
+}
+#endif /* MPE */
+
 #ifdef NEED_HPUX_ADJTIME
 /*************************************************************************/
 /* (c) Copyright Tai Jin, 1988.  All Rights Reserved.                    */
diff --git a/contrib/ntp/libntp/clocktypes.c b/contrib/ntp/libntp/clocktypes.c
index cdfe356..3e767ce 100644
--- a/contrib/ntp/libntp/clocktypes.c
+++ b/contrib/ntp/libntp/clocktypes.c
@@ -90,6 +90,10 @@ struct clktype clktypes[] = {
 	  "HOPF_S"},
 	{ REFCLK_HOPF_PCI,	"hopf Elektronic PCI receiver (39)",
 	  "HOPF_P"},
+	{ REFCLK_JJY,	"JJY receiver (40)",
+	  "JJY" },
+	{ REFCLK_ZYFER,	"Zyfer GPStarplus receiver (41)",
+	  "GPS_ZYFER" },
 	{ -1,			"", "" }
 };
 
diff --git a/contrib/ntp/libntp/iosignal.c b/contrib/ntp/libntp/iosignal.c
index 3c78d48..cda5e96 100644
--- a/contrib/ntp/libntp/iosignal.c
+++ b/contrib/ntp/libntp/iosignal.c
@@ -27,6 +27,19 @@
 
 #if defined(HAVE_SIGNALED_IO)
 static int sigio_block_count = 0;
+# if defined(HAVE_SIGACTION)
+/*
+ * If sigaction() is used for signal handling and a signal is
+ * pending then the kernel blocks the signal before it calls
+ * the signal handler.
+ *
+ * The variable below is used to take care that the SIGIO signal
+ * is not unintentionally unblocked inside the sigio_handler()
+ * if the handler executes a piece of code that is normally
+ * bracketed by BLOCKIO()/UNBLOCKIO() calls.
+ */
+static int sigio_handler_active = 0;
+# endif
 extern	void	input_handler	P((l_fp *));
 
 /*
@@ -282,7 +295,21 @@ sigio_handler(
 	l_fp ts;
 
 	get_systime(&ts);
+
+# if defined(HAVE_SIGACTION)
+	sigio_handler_active++;
+	if (sigio_handler_active != 1)  /* This should never happen! */
+	    msyslog(LOG_ERR, "sigio_handler: sigio_handler_active != 1");
+# endif
+
 	(void)input_handler(&ts);
+
+# if defined(HAVE_SIGACTION)
+	sigio_handler_active--;
+	if (sigio_handler_active != 0)  /* This should never happen! */
+	    msyslog(LOG_ERR, "sigio_handler: sigio_handler_active != 0");
+# endif
+
 	errno = saved_errno;
 }
 
@@ -326,27 +353,30 @@ block_io_and_alarm(void)
 void
 block_sigio(void)
 {
-	sigset_t set;
-
-	++sigio_block_count;
-	if (sigio_block_count > 1)
-	    msyslog(LOG_INFO, "block_sigio: sigio_block_count > 1");
-	if (sigio_block_count < 1)
-	    msyslog(LOG_INFO, "block_sigio: sigio_block_count < 1");
-
-	if (sigemptyset(&set))
-	    msyslog(LOG_ERR, "block_sigio: sigemptyset() failed: %m");
-#  if defined(USE_SIGIO)
-	if (sigaddset(&set, SIGIO))
-	    msyslog(LOG_ERR, "block_sigio: sigaddset(SIGIO) failed: %m");
-#  endif
-#  if defined(USE_SIGPOLL)
-	if (sigaddset(&set, SIGPOLL))
-	    msyslog(LOG_ERR, "block_sigio: sigaddset(SIGPOLL) failed: %m");
-#  endif
-
-	if (sigprocmask(SIG_BLOCK, &set, NULL))
-	    msyslog(LOG_ERR, "block_sigio: sigprocmask() failed: %m");
+	if ( sigio_handler_active == 0 )  /* not called from within signal handler */
+	{
+		sigset_t set;
+
+		++sigio_block_count;
+		if (sigio_block_count > 1)
+		    msyslog(LOG_INFO, "block_sigio: sigio_block_count > 1");
+		if (sigio_block_count < 1)
+		    msyslog(LOG_INFO, "block_sigio: sigio_block_count < 1");
+
+		if (sigemptyset(&set))
+		    msyslog(LOG_ERR, "block_sigio: sigemptyset() failed: %m");
+#	if defined(USE_SIGIO)
+		if (sigaddset(&set, SIGIO))
+		    msyslog(LOG_ERR, "block_sigio: sigaddset(SIGIO) failed: %m");
+#	endif
+#	if defined(USE_SIGPOLL)
+		if (sigaddset(&set, SIGPOLL))
+		    msyslog(LOG_ERR, "block_sigio: sigaddset(SIGPOLL) failed: %m");
+#	endif
+
+		if (sigprocmask(SIG_BLOCK, &set, NULL))
+		    msyslog(LOG_ERR, "block_sigio: sigprocmask() failed: %m");
+	}
 }
 
 void
@@ -375,28 +405,31 @@ unblock_io_and_alarm(void)
 void
 unblock_sigio(void)
 {
-	sigset_t unset;
-
-	--sigio_block_count;
-	if (sigio_block_count > 0)
-	    msyslog(LOG_INFO, "unblock_sigio: sigio_block_count > 0");
-	if (sigio_block_count < 0)
-	    msyslog(LOG_INFO, "unblock_sigio: sigio_block_count < 0");
-
-	if (sigemptyset(&unset))
-	    msyslog(LOG_ERR, "unblock_sigio: sigemptyset() failed: %m");
-
-#  if defined(USE_SIGIO)
-	if (sigaddset(&unset, SIGIO))
-	    msyslog(LOG_ERR, "unblock_sigio: sigaddset(SIGIO) failed: %m");
-#  endif
-#  if defined(USE_SIGPOLL)
-	if (sigaddset(&unset, SIGPOLL))
-	    msyslog(LOG_ERR, "unblock_sigio: sigaddset(SIGPOLL) failed: %m");
-#  endif
-
-	if (sigprocmask(SIG_UNBLOCK, &unset, NULL))
-	    msyslog(LOG_ERR, "unblock_sigio: sigprocmask() failed: %m");
+	if ( sigio_handler_active == 0 )  /* not called from within signal handler */
+	{
+		sigset_t unset;
+
+		--sigio_block_count;
+		if (sigio_block_count > 0)
+		    msyslog(LOG_INFO, "unblock_sigio: sigio_block_count > 0");
+		if (sigio_block_count < 0)
+		    msyslog(LOG_INFO, "unblock_sigio: sigio_block_count < 0");
+
+		if (sigemptyset(&unset))
+		    msyslog(LOG_ERR, "unblock_sigio: sigemptyset() failed: %m");
+
+#	if defined(USE_SIGIO)
+		if (sigaddset(&unset, SIGIO))
+		    msyslog(LOG_ERR, "unblock_sigio: sigaddset(SIGIO) failed: %m");
+#	endif
+#	if defined(USE_SIGPOLL)
+		if (sigaddset(&unset, SIGPOLL))
+		    msyslog(LOG_ERR, "unblock_sigio: sigaddset(SIGPOLL) failed: %m");
+#	endif
+
+		if (sigprocmask(SIG_UNBLOCK, &unset, NULL))
+		    msyslog(LOG_ERR, "unblock_sigio: sigprocmask() failed: %m");
+	}
 }
 
 void
diff --git a/contrib/ntp/libntp/machines.c b/contrib/ntp/libntp/machines.c
index a3dcf2f..d0db63c 100644
--- a/contrib/ntp/libntp/machines.c
+++ b/contrib/ntp/libntp/machines.c
@@ -125,6 +125,290 @@ gettimeofday(
 }
 #endif /* SYS_PTX */
 
+#ifdef MPE
+/* This is a substitute for bind() that if called for an AF_INET socket
+port less than 1024, GETPRIVMODE() and GETUSERMODE() calls will be done. */
+
+#undef bind
+#include 
+#include 
+#include 
+#include 
+
+extern void GETPRIVMODE(void);
+extern void GETUSERMODE(void);
+
+int __ntp_mpe_bind(int s, void *addr, int addrlen);
+
+int __ntp_mpe_bind(int s, void *addr, int addrlen) {
+	int priv = 0;
+	int result;
+
+if (addrlen == sizeof(struct sockaddr_in)) { /* AF_INET */
+	if (((struct sockaddr_in *)addr)->sin_port > 0 &&
+	    ((struct sockaddr_in *)addr)->sin_port < 1024) {
+		priv = 1;
+		GETPRIVMODE();
+	}
+/*	((struct sockaddr_in *)addr)->sin_addr.s_addr = 0; */
+	result = bind(s,addr,addrlen);
+	if (priv == 1) GETUSERMODE();
+} else /* AF_UNIX */
+	result = bind(s,addr,addrlen);
+
+return result;
+}
+
+/*
+ * MPE stupidly requires sfcntl() to be used on sockets instead of fcntl(),
+ * so we define a wrapper to analyze the file descriptor and call the correct
+ * function.
+ */
+
+#undef fcntl
+#include 
+#include 
+
+int __ntp_mpe_fcntl(int fd, int cmd, int arg);
+
+int __ntp_mpe_fcntl(int fd, int cmd, int arg) {
+	int len;
+	struct sockaddr sa;
+
+	extern int sfcntl(int, int, int);
+
+	len = sizeof sa;
+	if (getsockname(fd, &sa, &len) == -1) {
+		if (errno == EAFNOSUPPORT) /* AF_UNIX socket */
+			return sfcntl(fd, cmd, arg);
+		if (errno == ENOTSOCK) /* file or pipe */
+			return fcntl(fd, cmd, arg);
+		return (-1); /* unknown getsockname() failure */
+	} else /* AF_INET socket */
+		return sfcntl(fd, cmd, arg);
+}
+
+/*
+ * Setitimer emulation support.  Note that we implement this using alarm(),
+ * and since alarm() only delivers one signal, we must re-enable the alarm
+ * by enabling our own SIGALRM setitimer_mpe_handler routine to be called
+ * before the real handler routine and re-enable the alarm at that time.
+ *
+ * Note that this solution assumes that sigaction(SIGALRM) is called before
+ * calling setitimer().  If it should ever to become necessary to support
+ * sigaction(SIGALRM) after calling setitimer(), it will be necessary to trap
+ * those sigaction() calls.
+ */
+
+#include 
+#include 
+
+/*
+ * Some global data that needs to be shared between setitimer() and
+ * setitimer_mpe_handler().
+ */
+
+struct {
+	unsigned long current_msec;	/* current alarm() value in effect */
+	unsigned long interval_msec;	/* next alarm() value from setitimer */
+	unsigned long value_msec;	/* first alarm() value from setitimer */
+	struct itimerval current_itimerval; /* current itimerval in effect */
+	struct sigaction oldact;	/* SIGALRM state saved by setitimer */
+} setitimer_mpe_ctx = { 0, 0, 0 };
+
+/*
+ * Undocumented, unsupported function to do alarm() in milliseconds.
+ */
+
+extern unsigned int px_alarm(unsigned long, int *);
+
+/*
+ * The SIGALRM handler routine enabled by setitimer().  Re-enable the alarm or
+ * restore the original SIGALRM setting if no more alarms are needed.  Then
+ * call the original SIGALRM handler (if any).
+ */
+
+static RETSIGTYPE setitimer_mpe_handler(int sig)
+{
+int alarm_hpe_status;
+
+/* Update the new current alarm value */
+
+setitimer_mpe_ctx.current_msec = setitimer_mpe_ctx.interval_msec;
+
+if (setitimer_mpe_ctx.interval_msec > 0) {
+  /* Additional intervals needed; re-arm the alarm timer */
+  px_alarm(setitimer_mpe_ctx.interval_msec,&alarm_hpe_status);
+} else {
+  /* No more intervals, so restore previous original SIGALRM handler */
+  sigaction(SIGALRM, &setitimer_mpe_ctx.oldact, NULL);
+}
+
+/* Call the original SIGALRM handler if it is a function and not just a flag */
+
+if (setitimer_mpe_ctx.oldact.sa_handler != SIG_DFL &&
+    setitimer_mpe_ctx.oldact.sa_handler != SIG_ERR &&
+    setitimer_mpe_ctx.oldact.sa_handler != SIG_IGN)
+  (*setitimer_mpe_ctx.oldact.sa_handler)(SIGALRM);
+
+}
+
+/*
+ * Our implementation of setitimer().
+ */
+
+int
+setitimer(int which, struct itimerval *value,
+	    struct itimerval *ovalue)
+{
+
+int alarm_hpe_status;
+unsigned long remaining_msec, value_msec, interval_msec;
+struct sigaction newact;
+
+/* 
+ * Convert the initial interval to milliseconds
+ */
+
+if (value->it_value.tv_sec > (UINT_MAX / 1000))
+  value_msec = UINT_MAX;
+else
+  value_msec = value->it_value.tv_sec * 1000;
+
+value_msec += value->it_value.tv_usec / 1000;
+
+/*
+ * Convert the reset interval to milliseconds
+ */
+
+if (value->it_interval.tv_sec > (UINT_MAX / 1000))
+  interval_msec = UINT_MAX;
+else
+  interval_msec = value->it_interval.tv_sec * 1000;
+
+interval_msec += value->it_interval.tv_usec / 1000;
+
+if (value_msec > 0 && interval_msec > 0) {
+  /*
+   * We'll be starting an interval timer that will be repeating, so we need to
+   * insert our own SIGALRM signal handler to schedule the repeats.
+   */
+
+  /* Read the current SIGALRM action */
+
+  if (sigaction(SIGALRM, NULL, &setitimer_mpe_ctx.oldact) < 0) {
+    fprintf(stderr,"MPE setitimer old handler failed, errno=%d\n",errno);
+    return -1;
+  }
+
+  /* Initialize the new action to call our SIGALRM handler instead */
+
+  newact.sa_handler = &setitimer_mpe_handler;
+  newact.sa_mask = setitimer_mpe_ctx.oldact.sa_mask;
+  newact.sa_flags = setitimer_mpe_ctx.oldact.sa_flags;
+ 
+  if (sigaction(SIGALRM, &newact, NULL) < 0) {
+    fprintf(stderr,"MPE setitimer new handler failed, errno=%d\n",errno);
+    return -1;
+  }
+}
+
+/*
+ * Return previous itimerval if desired
+ */
+
+if (ovalue != NULL) *ovalue = setitimer_mpe_ctx.current_itimerval;
+
+/*
+ * Save current parameters for later usage
+ */
+
+setitimer_mpe_ctx.current_itimerval = *value;
+setitimer_mpe_ctx.current_msec = value_msec;
+setitimer_mpe_ctx.value_msec = value_msec;
+setitimer_mpe_ctx.interval_msec = interval_msec;
+
+/*
+ * Schedule the first alarm
+ */
+
+remaining_msec = px_alarm(value_msec, &alarm_hpe_status);
+if (alarm_hpe_status == 0)
+  return (0);
+else
+  return (-1);
+}
+
+/* 
+ * MPE lacks gettimeofday(), so we define our own.
+ */
+
+int gettimeofday(struct timeval *tvp)
+
+{
+/* Documented, supported MPE functions. */
+extern void GETPRIVMODE(void);
+extern void GETUSERMODE(void);
+
+/* Undocumented, unsupported MPE functions. */
+extern long long get_time(void);
+extern void get_time_change_info(long long *, char *, char *);
+extern long long ticks_to_micro(long long);
+
+char pwf_since_boot, recover_pwf_time;
+long long mpetime, offset_ticks, offset_usec;
+
+GETPRIVMODE();
+mpetime = get_time(); /* MPE local time usecs since Jan 1 1970 */
+get_time_change_info(&offset_ticks, &pwf_since_boot, &recover_pwf_time);
+offset_usec = ticks_to_micro(offset_ticks);  /* UTC offset usecs */
+GETUSERMODE();
+
+mpetime = mpetime - offset_usec;  /* Convert from local time to UTC */
+tvp->tv_sec = mpetime / 1000000LL;
+tvp->tv_usec = mpetime % 1000000LL;
+
+return 0;
+}
+
+/* 
+ * MPE lacks settimeofday(), so we define our own.
+ */
+
+#define HAVE_SETTIMEOFDAY
+
+int settimeofday(struct timeval *tvp)
+
+{
+/* Documented, supported MPE functions. */
+extern void GETPRIVMODE(void);
+extern void GETUSERMODE(void);
+
+/* Undocumented, unsupported MPE functions. */
+extern void get_time_change_info(long long *, char *, char *);
+extern void initialize_system_time(long long, int);
+extern void set_time_correction(long long, int, int);
+extern long long ticks_to_micro(long long);
+
+char pwf_since_boot, recover_pwf_time;
+long long big_sec, big_usec, mpetime, offset_ticks, offset_usec;
+
+big_sec = tvp->tv_sec;
+big_usec = tvp->tv_usec;
+mpetime = (big_sec * 1000000LL) + big_usec;  /* Desired UTC microseconds */
+
+GETPRIVMODE();
+set_time_correction(0LL,0,0); /* Cancel previous time correction, if any */
+get_time_change_info(&offset_ticks, &pwf_since_boot, &recover_pwf_time);
+offset_usec = ticks_to_micro(offset_ticks); /* UTC offset microseconds */
+mpetime = mpetime + offset_usec; /* Convert from UTC to local time */
+initialize_system_time(mpetime,1);
+GETUSERMODE();
+
+return 0;
+}
+#endif /* MPE */
+
 const char *set_tod_using = "UNKNOWN";
 
 int
@@ -133,53 +417,72 @@ ntp_set_tod(
 	void *tzp
 	)
 {
-	int rc;
+	int rc = -1;
+
+#ifdef DEBUG
+	if (debug)
+	    printf("In ntp_set_tod\n");
+#endif
 
 #ifdef HAVE_CLOCK_SETTIME
-	{
+	if (rc) {
 		struct timespec ts;
 
+		set_tod_using = "clock_settime";
 		/* Convert timeval to timespec */
 		ts.tv_sec = tvp->tv_sec;
 		ts.tv_nsec = 1000 *  tvp->tv_usec;
 
+		errno = 0;
 		rc = clock_settime(CLOCK_REALTIME, &ts);
-		if (!rc)
-		{
-			set_tod_using = "clock_settime";
-			return rc;
+#ifdef DEBUG
+		if (debug) {
+			printf("ntp_set_tod: %s: %d: %s\n",
+			       set_tod_using, rc, strerror(errno));
 		}
+#endif
 	}
 #endif /* HAVE_CLOCK_SETTIME */
 #ifdef HAVE_SETTIMEOFDAY
-	{
+	if (rc) {
+		set_tod_using = "settimeofday";
 		rc = SETTIMEOFDAY(tvp, tzp);
-		if (!rc)
-		{
-			set_tod_using = "settimeofday";
-			return rc;
+#ifdef DEBUG
+		if (debug) {
+			printf("ntp_set_tod: %s: %d: %s\n",
+			       set_tod_using, rc, strerror(errno));
 		}
+#endif
 	}
 #endif /* HAVE_SETTIMEOFDAY */
 #ifdef HAVE_STIME
-	{
+	if (rc) {
 		long tp = tvp->tv_sec;
 
+		set_tod_using = "stime";
 		rc = stime(&tp); /* lie as bad as SysVR4 */
-		if (!rc)
-		{
-			set_tod_using = "stime";
-			return rc;
+#ifdef DEBUG
+		if (debug) {
+			printf("ntp_set_tod: %s: %d: %s\n",
+			       set_tod_using, rc, strerror(errno));
 		}
+#endif
 	}
 #endif /* HAVE_STIME */
-	set_tod_using = "Failed!";
-	return -1;
+	if (rc)
+	    set_tod_using = "Failed!";
+#ifdef DEBUG
+	if (debug) {
+		printf("ntp_set_tod: Final result: %s: %d: %s\n",
+			set_tod_using, rc, strerror(errno));
+	}
+#endif
+	return rc;
 }
 
 #endif /* not SYS_WINNT */
 
-#if defined (SYS_WINNT) || defined (SYS_VXWORKS)
+#if defined (SYS_WINNT) || defined (SYS_VXWORKS) || defined(MPE)
 /* getpass is used in ntpq.c and ntpdc.c */
 
 char *
diff --git a/contrib/ntp/libntp/mktime.c b/contrib/ntp/libntp/mktime.c
index b9cd42e..6d944f9 100644
--- a/contrib/ntp/libntp/mktime.c
+++ b/contrib/ntp/libntp/mktime.c
@@ -62,6 +62,8 @@
 
 #include "ntp_machine.h"
 
+#if !HAVE_MKTIME
+
 #ifndef DSTMINUTES
 #define DSTMINUTES 60
 #endif
@@ -272,3 +274,6 @@ mktime(
 {
 	return time1(tmp);
 }
+#else
+int mktime_bs;
+#endif
diff --git a/contrib/ntp/libntp/snprintf.c b/contrib/ntp/libntp/snprintf.c
index d65f6a9..101bc17 100644
--- a/contrib/ntp/libntp/snprintf.c
+++ b/contrib/ntp/libntp/snprintf.c
@@ -1,5 +1,6 @@
 #include 
 
+#if !HAVE_SNPRINTF
 #include 
 
 #ifdef __STDC__
@@ -53,3 +54,6 @@ vsnprintf(str, n, fmt, ap)
 	return (vsprintf(str, fmt, ap));
 #endif
 }
+#else
+int snprintf_bs;
+#endif
diff --git a/contrib/ntp/libntp/strdup.c b/contrib/ntp/libntp/strdup.c
index 08ffc2f..2e26ba7 100644
--- a/contrib/ntp/libntp/strdup.c
+++ b/contrib/ntp/libntp/strdup.c
@@ -1,6 +1,11 @@
+#include "ntp_malloc.h"
+
+#if !HAVE_STRDUP
 
 #define NULL 0
 
+char *strdup(const char *s);
+
 char *
 strdup(
 	const char *s
@@ -18,3 +23,6 @@ strdup(
 	}
         return(cp);
 }
+#else
+int strdup_bs;
+#endif
diff --git a/contrib/ntp/libntp/strerror.c b/contrib/ntp/libntp/strerror.c
index a07bcd6..5a9595a 100644
--- a/contrib/ntp/libntp/strerror.c
+++ b/contrib/ntp/libntp/strerror.c
@@ -1,3 +1,6 @@
+#include 
+
+#if !HAVE_STRERROR
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -38,3 +41,6 @@ strerror(
 	(void)sprintf(ebuf, "Unknown error: %d", errnum);
 	return(ebuf);
 }
+#else
+int strerror_bs;
+#endif
diff --git a/contrib/ntp/libparse/Makefile.in b/contrib/ntp/libparse/Makefile.in
index 4ad2d3e..51546c1 100644
--- a/contrib/ntp/libparse/Makefile.in
+++ b/contrib/ntp/libparse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
@@ -164,36 +158,31 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/kernel
 ETAGS_ARGS = Makefile.am
 
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
-EXEEXT =
-OBJEXT = o
 subdir = libparse
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 libparse_a_AR = $(AR) cru
-libparse_a_LIBADD = 
+libparse_a_LIBADD =
 am_libparse_a_OBJECTS = parse$U.$(OBJEXT) parse_conf$U.$(OBJEXT) \
-clk_meinberg$U.$(OBJEXT) clk_schmid$U.$(OBJEXT) clk_rawdcf$U.$(OBJEXT) \
-clk_trimtsip$U.$(OBJEXT) clk_dcf7000$U.$(OBJEXT) \
-clk_trimtaip$U.$(OBJEXT) clk_rcc8000$U.$(OBJEXT) \
-clk_hopf6021$U.$(OBJEXT) clk_computime$U.$(OBJEXT) \
-clk_wharton$U.$(OBJEXT) clk_varitext$U.$(OBJEXT) data_mbg$U.$(OBJEXT) \
-info_trimble$U.$(OBJEXT) trim_info$U.$(OBJEXT)
+	clk_meinberg$U.$(OBJEXT) clk_schmid$U.$(OBJEXT) \
+	clk_rawdcf$U.$(OBJEXT) clk_trimtsip$U.$(OBJEXT) \
+	clk_dcf7000$U.$(OBJEXT) clk_trimtaip$U.$(OBJEXT) \
+	clk_rcc8000$U.$(OBJEXT) clk_hopf6021$U.$(OBJEXT) \
+	clk_computime$U.$(OBJEXT) clk_wharton$U.$(OBJEXT) \
+	clk_varitext$U.$(OBJEXT) data_mbg$U.$(OBJEXT) \
+	info_trimble$U.$(OBJEXT) trim_info$U.$(OBJEXT)
 libparse_a_OBJECTS = $(am_libparse_a_OBJECTS)
 libparse_kernel_a_AR = $(AR) cru
 libparse_kernel_a_DEPENDENCIES = kparse$U.o kparse_conf$U.o \
-kclk_computime$U.o kclk_dcf7000$U.o kclk_hopf6021$U.o kclk_meinberg$U.o \
-kclk_rawdcf$U.o kclk_rcc8000$U.o kclk_schmid$U.o kclk_trimtaip$U.o \
-kclk_trimtsip$U.o kclk_varitext$U.o kclk_wharton$U.o
+	kclk_computime$U.o kclk_dcf7000$U.o kclk_hopf6021$U.o \
+	kclk_meinberg$U.o kclk_rawdcf$U.o kclk_rcc8000$U.o \
+	kclk_schmid$U.o kclk_trimtaip$U.o kclk_trimtsip$U.o \
+	kclk_varitext$U.o kclk_wharton$U.o
+am_libparse_kernel_a_OBJECTS =
 libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS)
-AR = ar
 EXTRA_PROGRAMS = parsestreams$(EXEEXT) parsesolaris$(EXEEXT)
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
 PROGRAMS = $(noinst_PROGRAMS)
@@ -201,122 +190,162 @@ PROGRAMS = $(noinst_PROGRAMS)
 parsesolaris_SOURCES = parsesolaris.c
 parsesolaris_OBJECTS = parsesolaris$U.$(OBJEXT)
 parsesolaris_LDADD = $(LDADD)
-parsesolaris_DEPENDENCIES = 
-parsesolaris_LDFLAGS = 
+parsesolaris_DEPENDENCIES =
+parsesolaris_LDFLAGS =
 parsestreams_SOURCES = parsestreams.c
 parsestreams_OBJECTS = parsestreams$U.$(OBJEXT)
 parsestreams_LDADD = $(LDADD)
-parsestreams_DEPENDENCIES = 
-parsestreams_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+parsestreams_DEPENDENCIES =
+parsestreams_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/clk_computime$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_dcf7000$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_hopf6021$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_meinberg$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_rawdcf$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_rcc8000$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_schmid$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_trimtaip$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_trimtsip$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_varitext$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/clk_wharton$U.Po $(DEPDIR)/data_mbg$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/info_trimble$U.Po $(DEPDIR)/parse$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/parse_conf$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/parsesolaris$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/parsestreams$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/trim_info$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \
-parsesolaris.c parsestreams.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/clk_computime$U.Po \
-@AMDEP@ $(DEPDIR)/clk_dcf7000$U.Po $(DEPDIR)/clk_hopf6021$U.Po \
-@AMDEP@ $(DEPDIR)/clk_meinberg$U.Po $(DEPDIR)/clk_rawdcf$U.Po \
-@AMDEP@ $(DEPDIR)/clk_rcc8000$U.Po $(DEPDIR)/clk_schmid$U.Po \
-@AMDEP@ $(DEPDIR)/clk_trimtaip$U.Po $(DEPDIR)/clk_trimtsip$U.Po \
-@AMDEP@ $(DEPDIR)/clk_varitext$U.Po $(DEPDIR)/clk_wharton$U.Po \
-@AMDEP@ $(DEPDIR)/data_mbg$U.Po $(DEPDIR)/info_trimble$U.Po \
-@AMDEP@ $(DEPDIR)/parse$U.Po $(DEPDIR)/parse_conf$U.Po \
-@AMDEP@ $(DEPDIR)/parsesolaris$U.Po $(DEPDIR)/parsestreams$U.Po \
-@AMDEP@ $(DEPDIR)/trim_info$U.Po
+	parsesolaris.c parsestreams.c
 DIST_COMMON = README Makefile.am Makefile.in
-
 SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) parsesolaris.c parsestreams.c
-OBJECTS = $(am_libparse_a_OBJECTS) $(am_libparse_kernel_a_OBJECTS) parsesolaris$U.$(OBJEXT) parsestreams$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  libparse/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
+AR = ar
+
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) 
+	-rm -f libparse.a
+	$(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD)
+	$(RANLIB) libparse.a
+libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) 
+	-rm -f libparse_kernel.a
+	$(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD)
+	$(RANLIB) libparse_kernel.a
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) 
+	@rm -f parsesolaris$(EXEEXT)
+	$(LINK) $(parsesolaris_LDFLAGS) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS)
+parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) 
+	@rm -f parsestreams$(EXEEXT)
+	$(LINK) $(parsestreams_LDFLAGS) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES)
-	-rm -f libparse.a
-	$(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD)
-	$(RANLIB) libparse.a
-
-libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES)
-	-rm -f libparse_kernel.a
-	$(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD)
-	$(RANLIB) libparse_kernel.a
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_computime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_dcf7000$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_hopf6021$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_meinberg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_rawdcf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_rcc8000$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_schmid$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_trimtaip$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_trimtsip$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_varitext$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/clk_wharton$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/data_mbg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/info_trimble$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/parse$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/parse_conf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/parsesolaris$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/parsestreams$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/trim_info$U.Po@am__quote@
 
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+distclean-depend:
+	-rm -rf $(DEPDIR)
 
-parsesolaris: $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES)
-	@rm -f parsesolaris
-	$(LINK) $(parsesolaris_LDFLAGS) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS)
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
 
-parsestreams: $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES)
-	@rm -f parsestreams
-	$(LINK) $(parsestreams_LDFLAGS) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS)
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 clk_computime_.c: clk_computime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_computime.c; then echo $(srcdir)/clk_computime.c; else echo clk_computime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_computime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_computime.c; then echo $(srcdir)/clk_computime.c; else echo clk_computime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_computime_.c || rm -f clk_computime_.c
 clk_dcf7000_.c: clk_dcf7000.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_dcf7000.c; then echo $(srcdir)/clk_dcf7000.c; else echo clk_dcf7000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_dcf7000_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_dcf7000.c; then echo $(srcdir)/clk_dcf7000.c; else echo clk_dcf7000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_dcf7000_.c || rm -f clk_dcf7000_.c
 clk_hopf6021_.c: clk_hopf6021.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_hopf6021.c; then echo $(srcdir)/clk_hopf6021.c; else echo clk_hopf6021.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_hopf6021_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_hopf6021.c; then echo $(srcdir)/clk_hopf6021.c; else echo clk_hopf6021.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_hopf6021_.c || rm -f clk_hopf6021_.c
 clk_meinberg_.c: clk_meinberg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_meinberg.c; then echo $(srcdir)/clk_meinberg.c; else echo clk_meinberg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_meinberg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_meinberg.c; then echo $(srcdir)/clk_meinberg.c; else echo clk_meinberg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_meinberg_.c || rm -f clk_meinberg_.c
 clk_rawdcf_.c: clk_rawdcf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rawdcf.c; then echo $(srcdir)/clk_rawdcf.c; else echo clk_rawdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rawdcf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rawdcf.c; then echo $(srcdir)/clk_rawdcf.c; else echo clk_rawdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rawdcf_.c || rm -f clk_rawdcf_.c
 clk_rcc8000_.c: clk_rcc8000.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rcc8000.c; then echo $(srcdir)/clk_rcc8000.c; else echo clk_rcc8000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rcc8000_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_rcc8000.c; then echo $(srcdir)/clk_rcc8000.c; else echo clk_rcc8000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_rcc8000_.c || rm -f clk_rcc8000_.c
 clk_schmid_.c: clk_schmid.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_schmid.c; then echo $(srcdir)/clk_schmid.c; else echo clk_schmid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_schmid_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_schmid.c; then echo $(srcdir)/clk_schmid.c; else echo clk_schmid.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_schmid_.c || rm -f clk_schmid_.c
 clk_trimtaip_.c: clk_trimtaip.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtaip.c; then echo $(srcdir)/clk_trimtaip.c; else echo clk_trimtaip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtaip_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtaip.c; then echo $(srcdir)/clk_trimtaip.c; else echo clk_trimtaip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtaip_.c || rm -f clk_trimtaip_.c
 clk_trimtsip_.c: clk_trimtsip.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtsip.c; then echo $(srcdir)/clk_trimtsip.c; else echo clk_trimtsip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtsip_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_trimtsip.c; then echo $(srcdir)/clk_trimtsip.c; else echo clk_trimtsip.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_trimtsip_.c || rm -f clk_trimtsip_.c
 clk_varitext_.c: clk_varitext.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_varitext.c; then echo $(srcdir)/clk_varitext.c; else echo clk_varitext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_varitext_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_varitext.c; then echo $(srcdir)/clk_varitext.c; else echo clk_varitext.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_varitext_.c || rm -f clk_varitext_.c
 clk_wharton_.c: clk_wharton.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_wharton.c; then echo $(srcdir)/clk_wharton.c; else echo clk_wharton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_wharton_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clk_wharton.c; then echo $(srcdir)/clk_wharton.c; else echo clk_wharton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clk_wharton_.c || rm -f clk_wharton_.c
 data_mbg_.c: data_mbg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/data_mbg.c; then echo $(srcdir)/data_mbg.c; else echo data_mbg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > data_mbg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/data_mbg.c; then echo $(srcdir)/data_mbg.c; else echo data_mbg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > data_mbg_.c || rm -f data_mbg_.c
 info_trimble_.c: info_trimble.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/info_trimble.c; then echo $(srcdir)/info_trimble.c; else echo info_trimble.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > info_trimble_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/info_trimble.c; then echo $(srcdir)/info_trimble.c; else echo info_trimble.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > info_trimble_.c || rm -f info_trimble_.c
 parse_.c: parse.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse.c; then echo $(srcdir)/parse.c; else echo parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse.c; then echo $(srcdir)/parse.c; else echo parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_.c || rm -f parse_.c
 parse_conf_.c: parse_conf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse_conf.c; then echo $(srcdir)/parse_conf.c; else echo parse_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_conf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parse_conf.c; then echo $(srcdir)/parse_conf.c; else echo parse_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parse_conf_.c || rm -f parse_conf_.c
 parsesolaris_.c: parsesolaris.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsesolaris.c; then echo $(srcdir)/parsesolaris.c; else echo parsesolaris.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsesolaris_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsesolaris.c; then echo $(srcdir)/parsesolaris.c; else echo parsesolaris.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsesolaris_.c || rm -f parsesolaris_.c
 parsestreams_.c: parsestreams.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsestreams.c; then echo $(srcdir)/parsestreams.c; else echo parsestreams.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsestreams_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/parsestreams.c; then echo $(srcdir)/parsestreams.c; else echo parsestreams.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > parsestreams_.c || rm -f parsestreams_.c
 trim_info_.c: trim_info.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/trim_info.c; then echo $(srcdir)/trim_info.c; else echo trim_info.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > trim_info_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/trim_info.c; then echo $(srcdir)/trim_info.c; else echo trim_info.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > trim_info_.c || rm -f trim_info_.c
 clk_computime_.$(OBJEXT) clk_dcf7000_.$(OBJEXT) clk_hopf6021_.$(OBJEXT) \
 clk_meinberg_.$(OBJEXT) clk_rawdcf_.$(OBJEXT) clk_rcc8000_.$(OBJEXT) \
 clk_schmid_.$(OBJEXT) clk_trimtaip_.$(OBJEXT) clk_trimtsip_.$(OBJEXT) \
@@ -324,6 +353,7 @@ clk_varitext_.$(OBJEXT) clk_wharton_.$(OBJEXT) data_mbg_.$(OBJEXT) \
 info_trimble_.$(OBJEXT) parse_.$(OBJEXT) parse_conf_.$(OBJEXT) \
 parsesolaris_.$(OBJEXT) parsestreams_.$(OBJEXT) trim_info_.$(OBJEXT) : \
 $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -336,7 +366,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -352,47 +382,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/clk_computime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_dcf7000$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_hopf6021$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_meinberg$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_rawdcf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_rcc8000$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_schmid$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_trimtaip$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_trimtsip$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_varitext$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/clk_wharton$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/data_mbg$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/info_trimble$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/parse$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/parse_conf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/parsesolaris$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/parsestreams$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/trim_info$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -401,7 +394,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -426,24 +423,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
@@ -454,11 +448,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -466,7 +460,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -480,15 +474,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-.PHONY: all all-am check check-am clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES clean-noinstPROGRAMS distclean \
 	distclean-compile distclean-depend distclean-generic \
 	distclean-tags distdir dvi dvi-am info info-am install \
 	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
+	uninstall uninstall-am uninstall-info-am
 
 
 #
@@ -591,7 +588,6 @@ parsesolaris.o: sys/systm.h
 sys/systm.h:
 	mkdir sys && \
 	sed -e 's/ffs(long)/ffs(int)/' < /usr/include/sys/systm.h > sys/systm.h
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/librsaref/Makefile.am b/contrib/ntp/librsaref/Makefile.am
index 889251e..f745088 100644
--- a/contrib/ntp/librsaref/Makefile.am
+++ b/contrib/ntp/librsaref/Makefile.am
@@ -7,6 +7,9 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
 
+@isRSAREF_TRUE@foo = digit.c digit.h
+@isRSAEURO_TRUE@foo = md4c.c shsc.c
+
 nodist_librsaref_a_SOURCES = \
 	desc.c \
 	md2c.c \
@@ -27,7 +30,7 @@ nodist_librsaref_a_SOURCES = \
 	prime.h \
 	r_random.h \
 	rsa.h \
-	rsaref.h @RSASRCS@
+	rsaref.h $(foo)
 
 librsaref_a_LIBADD = @RSAOBJS@
 librsaref_a_DEPENDENCIES = $(librsaref_a_LIBADD)
diff --git a/contrib/ntp/librsaref/Makefile.in b/contrib/ntp/librsaref/Makefile.in
index 3faba02..d316d4b 100644
--- a/contrib/ntp/librsaref/Makefile.in
+++ b/contrib/ntp/librsaref/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+#AUTOMAKE_OPTIONS = ../util/ansi2knr
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +36,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +52,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +76,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +92,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,23 +105,22 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-#AUTOMAKE_OPTIONS = ../util/ansi2knr
-
-
 noinst_LIBRARIES = @MAKE_LIBRSAREF@
 EXTRA_LIBRARIES = librsaref.a
 CLEANFILES = $(EXTRA_LIBRARIES)
 
+
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
+@isRSAREF_TRUE@foo = digit.c digit.h
+@isRSAEURO_TRUE@foo = md4c.c shsc.c
 
 nodist_librsaref_a_SOURCES = \
 	desc.c \
@@ -145,7 +142,7 @@ nodist_librsaref_a_SOURCES = \
 	prime.h \
 	r_random.h \
 	rsa.h \
-	rsaref.h @RSASRCS@
+	rsaref.h $(foo)
 
 
 librsaref_a_LIBADD = @RSAOBJS@
@@ -156,57 +153,60 @@ INCLUDES = -I$(top_srcdir)/include
 ETAGS_ARGS = Makefile.am
 
 DISTCLEANFILES = $(nodist_librsaref_a_SOURCES) stamp-rsaref
-EXEEXT =
-OBJEXT = o
 subdir = librsaref
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
 librsaref_a_AR = $(AR) cru
 nodist_librsaref_a_OBJECTS = desc.$(OBJEXT) md2c.$(OBJEXT) \
-md5c.$(OBJEXT) nn.$(OBJEXT) prime.$(OBJEXT) r_dh.$(OBJEXT) \
-r_encode.$(OBJEXT) r_enhanc.$(OBJEXT) r_keygen.$(OBJEXT) \
-r_random.$(OBJEXT) r_stdlib.$(OBJEXT) rsa.$(OBJEXT)
+	md5c.$(OBJEXT) nn.$(OBJEXT) prime.$(OBJEXT) r_dh.$(OBJEXT) \
+	r_encode.$(OBJEXT) r_enhanc.$(OBJEXT) r_keygen.$(OBJEXT) \
+	r_random.$(OBJEXT) r_stdlib.$(OBJEXT) rsa.$(OBJEXT)
 librsaref_a_OBJECTS = $(nodist_librsaref_a_OBJECTS)
-AR = ar
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/desc.Po $(DEPDIR)/md2c.Po \
+@AMDEP_TRUE@	$(DEPDIR)/md5c.Po $(DEPDIR)/nn.Po \
+@AMDEP_TRUE@	$(DEPDIR)/prime.Po $(DEPDIR)/r_dh.Po \
+@AMDEP_TRUE@	$(DEPDIR)/r_encode.Po $(DEPDIR)/r_enhanc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/r_keygen.Po $(DEPDIR)/r_random.Po \
+@AMDEP_TRUE@	$(DEPDIR)/r_stdlib.Po $(DEPDIR)/rsa.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES =
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/desc.Po $(DEPDIR)/md2c.Po $(DEPDIR)/md5c.Po \
-@AMDEP@ $(DEPDIR)/nn.Po $(DEPDIR)/prime.Po $(DEPDIR)/r_dh.Po \
-@AMDEP@ $(DEPDIR)/r_encode.Po $(DEPDIR)/r_enhanc.Po \
-@AMDEP@ $(DEPDIR)/r_keygen.Po $(DEPDIR)/r_random.Po \
-@AMDEP@ $(DEPDIR)/r_stdlib.Po $(DEPDIR)/rsa.Po
 DIST_COMMON = Makefile.am Makefile.in
-
 SOURCES = $(nodist_librsaref_a_SOURCES)
-OBJECTS = $(nodist_librsaref_a_OBJECTS)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .h .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  librsaref/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
+AR = ar
+
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+librsaref.a: $(librsaref_a_OBJECTS) $(librsaref_a_DEPENDENCIES) 
+	-rm -f librsaref.a
+	$(librsaref_a_AR) librsaref.a $(librsaref_a_OBJECTS) $(librsaref_a_LIBADD)
+	$(RANLIB) librsaref.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -214,10 +214,35 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-librsaref.a: $(librsaref_a_OBJECTS) $(librsaref_a_DEPENDENCIES)
-	-rm -f librsaref.a
-	$(librsaref_a_AR) librsaref.a $(librsaref_a_OBJECTS) $(librsaref_a_LIBADD)
-	$(RANLIB) librsaref.a
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md2c.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/md5c.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/prime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_dh.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_encode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_enhanc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_keygen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_random.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/r_stdlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rsa.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
+uninstall-info-am:
 
 tags: TAGS
 
@@ -230,7 +255,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -246,41 +271,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/desc.Po
-@AMDEP@@_am_include@ $(DEPDIR)/md2c.Po
-@AMDEP@@_am_include@ $(DEPDIR)/md5c.Po
-@AMDEP@@_am_include@ $(DEPDIR)/nn.Po
-@AMDEP@@_am_include@ $(DEPDIR)/prime.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_dh.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_encode.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_enhanc.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_keygen.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_random.Po
-@AMDEP@@_am_include@ $(DEPDIR)/r_stdlib.Po
-@AMDEP@@_am_include@ $(DEPDIR)/rsa.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -289,7 +283,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -314,25 +312,22 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
@@ -343,11 +338,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -355,7 +350,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -369,15 +364,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-.PHONY: all all-am check check-am clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
 
 
 #EXTRA_DIST = 
@@ -400,7 +398,6 @@ stamp-rsaref:
 	done
 	@echo timestamp > stamp-rsarefT 2> /dev/null
 	@mv stamp-rsarefT stamp-rsaref
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/mkinstalldirs b/contrib/ntp/mkinstalldirs
index ffc77c6..6b3b5fc 100755
--- a/contrib/ntp/mkinstalldirs
+++ b/contrib/ntp/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.3 2001/04/23 03:27:24 stenn Exp $
+# $Id$
 
 errstatus=0
 
diff --git a/contrib/ntp/ntpd/Makefile.am b/contrib/ntp/ntpd/Makefile.am
index 718d996..0c1d4c1 100644
--- a/contrib/ntp/ntpd/Makefile.am
+++ b/contrib/ntp/ntpd/Makefile.am
@@ -20,22 +20,24 @@ EXTRA_PROGRAMS = check_y2k
 check-local: @MAKE_CHECK_Y2K@
 	test -z "@MAKE_CHECK_Y2K@" || ./@MAKE_CHECK_Y2K@
 
+# ntp_resolver.c is presently unused...
 ntpd_SOURCES = cmd_args.c jupiter.h map_vme.c ntp_config.c ntp_control.c \
 	ntp_crypto.c ntp_filegen.c \
 	ntp_intres.c ntp_io.c ntp_loopfilter.c ntp_monitor.c ntp_peer.c \
-	ntp_proto.c ntp_refclock.c ntp_request.c ntp_resolver.c \
-	ntp_restrict.c ntp_timer.c \
-	ntp_util.c ntpd.c refclock_acts.c refclock_arbiter.c refclock_arc.c \
-	refclock_as2201.c refclock_atom.c refclock_bancomm.c \
-	refclock_chronolog.c refclock_chu.c refclock_conf.c refclock_datum.c \
-	refclock_dumbclock.c refclock_fg.c refclock_gpsvme.c refclock_heath.c \
-	refclock_hopfser.c refclock_hopfpci.c \
-	refclock_hpgps.c refclock_irig.c refclock_jupiter.c refclock_leitch.c \
-	refclock_local.c refclock_msfees.c refclock_mx4200.c refclock_nmea.c \
-	refclock_oncore.c refclock_palisade.c refclock_palisade.h \
-	refclock_parse.c refclock_pcf.c refclock_pst.c refclock_ptbacts.c \
-	refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \
-	refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c
+	ntp_proto.c ntp_refclock.c ntp_request.c \
+	ntp_restrict.c ntp_timer.c ntp_util.c ntpd.c \
+	refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \
+	refclock_atom.c refclock_bancomm.c refclock_chronolog.c \
+	refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \
+	refclock_fg.c refclock_gpsvme.c refclock_heath.c refclock_hopfser.c \
+	refclock_hopfpci.c refclock_hpgps.c refclock_irig.c refclock_jjy.c \
+	refclock_jupiter.c refclock_leitch.c refclock_local.c \
+	refclock_msfees.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c \
+	refclock_palisade.c refclock_palisade.h refclock_parse.c \
+	refclock_pcf.c refclock_pst.c refclock_ptbacts.c refclock_shm.c \
+	refclock_tpro.c refclock_trak.c refclock_true.c refclock_tt560.c \
+	refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c \
+	refclock_zyfer.c
 
 $(PROGRAMS): $(LDADD)
 
@@ -46,5 +48,5 @@ $(PROGRAMS): $(LDADD)
 	cd ../libparse && $(MAKE)
 
 version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpd
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
 	$(COMPILE) -c version.c
diff --git a/contrib/ntp/ntpd/Makefile.in b/contrib/ntp/ntpd/Makefile.in
index 0e3ad1c..5eb698f 100644
--- a/contrib/ntp/ntpd/Makefile.in
+++ b/contrib/ntp/ntpd/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpd
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
@@ -135,25 +129,25 @@ ETAGS_ARGS = Makefile.am
 check_PROGRAMS = @MAKE_CHECK_Y2K@
 EXTRA_PROGRAMS = check_y2k
 
+# ntp_resolver.c is presently unused...
 ntpd_SOURCES = cmd_args.c jupiter.h map_vme.c ntp_config.c ntp_control.c \
 	ntp_crypto.c ntp_filegen.c \
 	ntp_intres.c ntp_io.c ntp_loopfilter.c ntp_monitor.c ntp_peer.c \
-	ntp_proto.c ntp_refclock.c ntp_request.c ntp_resolver.c \
-	ntp_restrict.c ntp_timer.c \
-	ntp_util.c ntpd.c refclock_acts.c refclock_arbiter.c refclock_arc.c \
-	refclock_as2201.c refclock_atom.c refclock_bancomm.c \
-	refclock_chronolog.c refclock_chu.c refclock_conf.c refclock_datum.c \
-	refclock_dumbclock.c refclock_fg.c refclock_gpsvme.c refclock_heath.c \
-	refclock_hopfser.c refclock_hopfpci.c \
-	refclock_hpgps.c refclock_irig.c refclock_jupiter.c refclock_leitch.c \
-	refclock_local.c refclock_msfees.c refclock_mx4200.c refclock_nmea.c \
-	refclock_oncore.c refclock_palisade.c refclock_palisade.h \
-	refclock_parse.c refclock_pcf.c refclock_pst.c refclock_ptbacts.c \
-	refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \
-	refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c
-
-EXEEXT =
-OBJEXT = o
+	ntp_proto.c ntp_refclock.c ntp_request.c \
+	ntp_restrict.c ntp_timer.c ntp_util.c ntpd.c \
+	refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \
+	refclock_atom.c refclock_bancomm.c refclock_chronolog.c \
+	refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \
+	refclock_fg.c refclock_gpsvme.c refclock_heath.c refclock_hopfser.c \
+	refclock_hopfpci.c refclock_hpgps.c refclock_irig.c refclock_jjy.c \
+	refclock_jupiter.c refclock_leitch.c refclock_local.c \
+	refclock_msfees.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c \
+	refclock_palisade.c refclock_palisade.h refclock_parse.c \
+	refclock_pcf.c refclock_pst.c refclock_ptbacts.c refclock_shm.c \
+	refclock_tpro.c refclock_trak.c refclock_true.c refclock_tt560.c \
+	refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c \
+	refclock_zyfer.c
+
 subdir = ntpd
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -163,94 +157,120 @@ bin_PROGRAMS = ntpd$(EXEEXT)
 check_PROGRAMS = @MAKE_CHECK_Y2K@
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 check_y2k_SOURCES = check_y2k.c
 check_y2k_OBJECTS = check_y2k$U.$(OBJEXT)
 check_y2k_LDADD = $(LDADD)
 check_y2k_DEPENDENCIES = version.o ../libntp/libntp.a
-check_y2k_LDFLAGS = 
+check_y2k_LDFLAGS =
 am_ntpd_OBJECTS = cmd_args$U.$(OBJEXT) map_vme$U.$(OBJEXT) \
-ntp_config$U.$(OBJEXT) ntp_control$U.$(OBJEXT) ntp_crypto$U.$(OBJEXT) \
-ntp_filegen$U.$(OBJEXT) ntp_intres$U.$(OBJEXT) ntp_io$U.$(OBJEXT) \
-ntp_loopfilter$U.$(OBJEXT) ntp_monitor$U.$(OBJEXT) ntp_peer$U.$(OBJEXT) \
-ntp_proto$U.$(OBJEXT) ntp_refclock$U.$(OBJEXT) ntp_request$U.$(OBJEXT) \
-ntp_resolver$U.$(OBJEXT) ntp_restrict$U.$(OBJEXT) ntp_timer$U.$(OBJEXT) \
-ntp_util$U.$(OBJEXT) ntpd$U.$(OBJEXT) refclock_acts$U.$(OBJEXT) \
-refclock_arbiter$U.$(OBJEXT) refclock_arc$U.$(OBJEXT) \
-refclock_as2201$U.$(OBJEXT) refclock_atom$U.$(OBJEXT) \
-refclock_bancomm$U.$(OBJEXT) refclock_chronolog$U.$(OBJEXT) \
-refclock_chu$U.$(OBJEXT) refclock_conf$U.$(OBJEXT) \
-refclock_datum$U.$(OBJEXT) refclock_dumbclock$U.$(OBJEXT) \
-refclock_fg$U.$(OBJEXT) refclock_gpsvme$U.$(OBJEXT) \
-refclock_heath$U.$(OBJEXT) refclock_hopfser$U.$(OBJEXT) \
-refclock_hopfpci$U.$(OBJEXT) refclock_hpgps$U.$(OBJEXT) \
-refclock_irig$U.$(OBJEXT) refclock_jupiter$U.$(OBJEXT) \
-refclock_leitch$U.$(OBJEXT) refclock_local$U.$(OBJEXT) \
-refclock_msfees$U.$(OBJEXT) refclock_mx4200$U.$(OBJEXT) \
-refclock_nmea$U.$(OBJEXT) refclock_oncore$U.$(OBJEXT) \
-refclock_palisade$U.$(OBJEXT) refclock_parse$U.$(OBJEXT) \
-refclock_pcf$U.$(OBJEXT) refclock_pst$U.$(OBJEXT) \
-refclock_ptbacts$U.$(OBJEXT) refclock_shm$U.$(OBJEXT) \
-refclock_tpro$U.$(OBJEXT) refclock_trak$U.$(OBJEXT) \
-refclock_true$U.$(OBJEXT) refclock_ulink$U.$(OBJEXT) \
-refclock_usno$U.$(OBJEXT) refclock_wwv$U.$(OBJEXT) \
-refclock_wwvb$U.$(OBJEXT)
+	ntp_config$U.$(OBJEXT) ntp_control$U.$(OBJEXT) \
+	ntp_crypto$U.$(OBJEXT) ntp_filegen$U.$(OBJEXT) \
+	ntp_intres$U.$(OBJEXT) ntp_io$U.$(OBJEXT) \
+	ntp_loopfilter$U.$(OBJEXT) ntp_monitor$U.$(OBJEXT) \
+	ntp_peer$U.$(OBJEXT) ntp_proto$U.$(OBJEXT) \
+	ntp_refclock$U.$(OBJEXT) ntp_request$U.$(OBJEXT) \
+	ntp_restrict$U.$(OBJEXT) ntp_timer$U.$(OBJEXT) \
+	ntp_util$U.$(OBJEXT) ntpd$U.$(OBJEXT) refclock_acts$U.$(OBJEXT) \
+	refclock_arbiter$U.$(OBJEXT) refclock_arc$U.$(OBJEXT) \
+	refclock_as2201$U.$(OBJEXT) refclock_atom$U.$(OBJEXT) \
+	refclock_bancomm$U.$(OBJEXT) refclock_chronolog$U.$(OBJEXT) \
+	refclock_chu$U.$(OBJEXT) refclock_conf$U.$(OBJEXT) \
+	refclock_datum$U.$(OBJEXT) refclock_dumbclock$U.$(OBJEXT) \
+	refclock_fg$U.$(OBJEXT) refclock_gpsvme$U.$(OBJEXT) \
+	refclock_heath$U.$(OBJEXT) refclock_hopfser$U.$(OBJEXT) \
+	refclock_hopfpci$U.$(OBJEXT) refclock_hpgps$U.$(OBJEXT) \
+	refclock_irig$U.$(OBJEXT) refclock_jjy$U.$(OBJEXT) \
+	refclock_jupiter$U.$(OBJEXT) refclock_leitch$U.$(OBJEXT) \
+	refclock_local$U.$(OBJEXT) refclock_msfees$U.$(OBJEXT) \
+	refclock_mx4200$U.$(OBJEXT) refclock_nmea$U.$(OBJEXT) \
+	refclock_oncore$U.$(OBJEXT) refclock_palisade$U.$(OBJEXT) \
+	refclock_parse$U.$(OBJEXT) refclock_pcf$U.$(OBJEXT) \
+	refclock_pst$U.$(OBJEXT) refclock_ptbacts$U.$(OBJEXT) \
+	refclock_shm$U.$(OBJEXT) refclock_tpro$U.$(OBJEXT) \
+	refclock_trak$U.$(OBJEXT) refclock_true$U.$(OBJEXT) \
+	refclock_tt560$U.$(OBJEXT) refclock_ulink$U.$(OBJEXT) \
+	refclock_usno$U.$(OBJEXT) refclock_wwv$U.$(OBJEXT) \
+	refclock_wwvb$U.$(OBJEXT) refclock_zyfer$U.$(OBJEXT)
 ntpd_OBJECTS = $(am_ntpd_OBJECTS)
 ntpd_DEPENDENCIES = version.o ../libntp/libntp.a
-ntpd_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ntpd_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/check_y2k$U.Po $(DEPDIR)/cmd_args$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/map_vme$U.Po $(DEPDIR)/ntp_config$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_control$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_crypto$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_filegen$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_intres$U.Po $(DEPDIR)/ntp_io$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_loopfilter$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_monitor$U.Po $(DEPDIR)/ntp_peer$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_proto$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_refclock$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_request$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_restrict$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntp_timer$U.Po $(DEPDIR)/ntp_util$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntpd$U.Po $(DEPDIR)/refclock_acts$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_arbiter$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_arc$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_as2201$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_atom$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_bancomm$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_chronolog$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_chu$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_conf$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_datum$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_dumbclock$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_fg$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_gpsvme$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_heath$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_hopfpci$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_hopfser$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_hpgps$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_irig$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_jjy$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_jupiter$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_leitch$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_local$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_msfees$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_mx4200$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_nmea$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_oncore$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_palisade$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_parse$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_pcf$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_pst$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_ptbacts$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_shm$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_tpro$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_trak$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_true$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_tt560$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_ulink$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_usno$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_wwv$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_wwvb$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/refclock_zyfer$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = check_y2k.c $(ntpd_SOURCES)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/check_y2k$U.Po $(DEPDIR)/cmd_args$U.Po \
-@AMDEP@ $(DEPDIR)/map_vme$U.Po $(DEPDIR)/ntp_config$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_control$U.Po $(DEPDIR)/ntp_crypto$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_filegen$U.Po $(DEPDIR)/ntp_intres$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_io$U.Po $(DEPDIR)/ntp_loopfilter$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_monitor$U.Po $(DEPDIR)/ntp_peer$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_proto$U.Po $(DEPDIR)/ntp_refclock$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_request$U.Po $(DEPDIR)/ntp_resolver$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_restrict$U.Po $(DEPDIR)/ntp_timer$U.Po \
-@AMDEP@ $(DEPDIR)/ntp_util$U.Po $(DEPDIR)/ntpd$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_acts$U.Po $(DEPDIR)/refclock_arbiter$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_arc$U.Po $(DEPDIR)/refclock_as2201$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_atom$U.Po $(DEPDIR)/refclock_bancomm$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_chronolog$U.Po $(DEPDIR)/refclock_chu$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_conf$U.Po $(DEPDIR)/refclock_datum$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_dumbclock$U.Po $(DEPDIR)/refclock_fg$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_gpsvme$U.Po $(DEPDIR)/refclock_heath$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_hopfpci$U.Po $(DEPDIR)/refclock_hopfser$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_hpgps$U.Po $(DEPDIR)/refclock_irig$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_jupiter$U.Po $(DEPDIR)/refclock_leitch$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_local$U.Po $(DEPDIR)/refclock_msfees$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_mx4200$U.Po $(DEPDIR)/refclock_nmea$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_oncore$U.Po $(DEPDIR)/refclock_palisade$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_parse$U.Po $(DEPDIR)/refclock_pcf$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_pst$U.Po $(DEPDIR)/refclock_ptbacts$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_shm$U.Po $(DEPDIR)/refclock_tpro$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_trak$U.Po $(DEPDIR)/refclock_true$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_ulink$U.Po $(DEPDIR)/refclock_usno$U.Po \
-@AMDEP@ $(DEPDIR)/refclock_wwv$U.Po $(DEPDIR)/refclock_wwvb$U.Po
 DIST_COMMON = Makefile.am Makefile.in
-
 SOURCES = check_y2k.c $(ntpd_SOURCES)
-OBJECTS = check_y2k$U.$(OBJEXT) $(am_ntpd_OBJECTS)
 
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .h .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ntpd/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -258,8 +278,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -278,161 +300,238 @@ clean-binPROGRAMS:
 
 clean-checkPROGRAMS:
 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+check_y2k$(EXEEXT): $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES) 
+	@rm -f check_y2k$(EXEEXT)
+	$(LINK) $(check_y2k_LDFLAGS) $(check_y2k_OBJECTS) $(check_y2k_LDADD) $(LIBS)
+ntpd$(EXEEXT): $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES) 
+	@rm -f ntpd$(EXEEXT)
+	$(LINK) $(ntpd_LDFLAGS) $(ntpd_OBJECTS) $(ntpd_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-check_y2k: $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES)
-	@rm -f check_y2k
-	$(LINK) $(check_y2k_LDFLAGS) $(check_y2k_OBJECTS) $(check_y2k_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/check_y2k$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cmd_args$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/map_vme$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_config$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_control$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_crypto$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_filegen$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_intres$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_io$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_loopfilter$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_monitor$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_peer$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_proto$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_refclock$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_request$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_restrict$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_timer$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp_util$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpd$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_acts$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_arbiter$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_arc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_as2201$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_atom$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_bancomm$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_chronolog$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_chu$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_conf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_datum$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_dumbclock$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_fg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_gpsvme$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_heath$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_hopfpci$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_hopfser$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_hpgps$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_irig$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_jjy$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_jupiter$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_leitch$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_local$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_msfees$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_mx4200$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_nmea$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_oncore$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_palisade$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_parse$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_pcf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_pst$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_ptbacts$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_shm$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_tpro$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_trak$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_true$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_tt560$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_ulink$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_usno$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_wwv$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_wwvb$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/refclock_zyfer$U.Po@am__quote@
 
-ntpd: $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES)
-	@rm -f ntpd
-	$(LINK) $(ntpd_LDFLAGS) $(ntpd_OBJECTS) $(ntpd_LDADD) $(LIBS)
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 check_y2k_.c: check_y2k.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/check_y2k.c; then echo $(srcdir)/check_y2k.c; else echo check_y2k.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > check_y2k_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/check_y2k.c; then echo $(srcdir)/check_y2k.c; else echo check_y2k.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > check_y2k_.c || rm -f check_y2k_.c
 cmd_args_.c: cmd_args.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cmd_args.c; then echo $(srcdir)/cmd_args.c; else echo cmd_args.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cmd_args_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/cmd_args.c; then echo $(srcdir)/cmd_args.c; else echo cmd_args.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > cmd_args_.c || rm -f cmd_args_.c
 map_vme_.c: map_vme.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/map_vme.c; then echo $(srcdir)/map_vme.c; else echo map_vme.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > map_vme_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/map_vme.c; then echo $(srcdir)/map_vme.c; else echo map_vme.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > map_vme_.c || rm -f map_vme_.c
 ntp_config_.c: ntp_config.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_config.c; then echo $(srcdir)/ntp_config.c; else echo ntp_config.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_config_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_config.c; then echo $(srcdir)/ntp_config.c; else echo ntp_config.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_config_.c || rm -f ntp_config_.c
 ntp_control_.c: ntp_control.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_control.c; then echo $(srcdir)/ntp_control.c; else echo ntp_control.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_control_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_control.c; then echo $(srcdir)/ntp_control.c; else echo ntp_control.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_control_.c || rm -f ntp_control_.c
 ntp_crypto_.c: ntp_crypto.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_crypto.c; then echo $(srcdir)/ntp_crypto.c; else echo ntp_crypto.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_crypto_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_crypto.c; then echo $(srcdir)/ntp_crypto.c; else echo ntp_crypto.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_crypto_.c || rm -f ntp_crypto_.c
 ntp_filegen_.c: ntp_filegen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_filegen.c; then echo $(srcdir)/ntp_filegen.c; else echo ntp_filegen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_filegen_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_filegen.c; then echo $(srcdir)/ntp_filegen.c; else echo ntp_filegen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_filegen_.c || rm -f ntp_filegen_.c
 ntp_intres_.c: ntp_intres.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_intres.c; then echo $(srcdir)/ntp_intres.c; else echo ntp_intres.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_intres_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_intres.c; then echo $(srcdir)/ntp_intres.c; else echo ntp_intres.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_intres_.c || rm -f ntp_intres_.c
 ntp_io_.c: ntp_io.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_io.c; then echo $(srcdir)/ntp_io.c; else echo ntp_io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_io_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_io.c; then echo $(srcdir)/ntp_io.c; else echo ntp_io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_io_.c || rm -f ntp_io_.c
 ntp_loopfilter_.c: ntp_loopfilter.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_loopfilter.c; then echo $(srcdir)/ntp_loopfilter.c; else echo ntp_loopfilter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_loopfilter_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_loopfilter.c; then echo $(srcdir)/ntp_loopfilter.c; else echo ntp_loopfilter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_loopfilter_.c || rm -f ntp_loopfilter_.c
 ntp_monitor_.c: ntp_monitor.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_monitor.c; then echo $(srcdir)/ntp_monitor.c; else echo ntp_monitor.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_monitor_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_monitor.c; then echo $(srcdir)/ntp_monitor.c; else echo ntp_monitor.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_monitor_.c || rm -f ntp_monitor_.c
 ntp_peer_.c: ntp_peer.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_peer.c; then echo $(srcdir)/ntp_peer.c; else echo ntp_peer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_peer_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_peer.c; then echo $(srcdir)/ntp_peer.c; else echo ntp_peer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_peer_.c || rm -f ntp_peer_.c
 ntp_proto_.c: ntp_proto.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_proto.c; then echo $(srcdir)/ntp_proto.c; else echo ntp_proto.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_proto_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_proto.c; then echo $(srcdir)/ntp_proto.c; else echo ntp_proto.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_proto_.c || rm -f ntp_proto_.c
 ntp_refclock_.c: ntp_refclock.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_refclock.c; then echo $(srcdir)/ntp_refclock.c; else echo ntp_refclock.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_refclock_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_refclock.c; then echo $(srcdir)/ntp_refclock.c; else echo ntp_refclock.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_refclock_.c || rm -f ntp_refclock_.c
 ntp_request_.c: ntp_request.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_request.c; then echo $(srcdir)/ntp_request.c; else echo ntp_request.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_request_.c
-ntp_resolver_.c: ntp_resolver.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_resolver.c; then echo $(srcdir)/ntp_resolver.c; else echo ntp_resolver.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_resolver_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_request.c; then echo $(srcdir)/ntp_request.c; else echo ntp_request.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_request_.c || rm -f ntp_request_.c
 ntp_restrict_.c: ntp_restrict.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_restrict.c; then echo $(srcdir)/ntp_restrict.c; else echo ntp_restrict.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_restrict_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_restrict.c; then echo $(srcdir)/ntp_restrict.c; else echo ntp_restrict.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_restrict_.c || rm -f ntp_restrict_.c
 ntp_timer_.c: ntp_timer.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_timer.c; then echo $(srcdir)/ntp_timer.c; else echo ntp_timer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_timer_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_timer.c; then echo $(srcdir)/ntp_timer.c; else echo ntp_timer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_timer_.c || rm -f ntp_timer_.c
 ntp_util_.c: ntp_util.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_util.c; then echo $(srcdir)/ntp_util.c; else echo ntp_util.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_util_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_util.c; then echo $(srcdir)/ntp_util.c; else echo ntp_util.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp_util_.c || rm -f ntp_util_.c
 ntpd_.c: ntpd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpd.c; then echo $(srcdir)/ntpd.c; else echo ntpd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpd.c; then echo $(srcdir)/ntpd.c; else echo ntpd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpd_.c || rm -f ntpd_.c
 refclock_acts_.c: refclock_acts.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_acts.c; then echo $(srcdir)/refclock_acts.c; else echo refclock_acts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_acts_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_acts.c; then echo $(srcdir)/refclock_acts.c; else echo refclock_acts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_acts_.c || rm -f refclock_acts_.c
 refclock_arbiter_.c: refclock_arbiter.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_arbiter.c; then echo $(srcdir)/refclock_arbiter.c; else echo refclock_arbiter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_arbiter_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_arbiter.c; then echo $(srcdir)/refclock_arbiter.c; else echo refclock_arbiter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_arbiter_.c || rm -f refclock_arbiter_.c
 refclock_arc_.c: refclock_arc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_arc.c; then echo $(srcdir)/refclock_arc.c; else echo refclock_arc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_arc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_arc.c; then echo $(srcdir)/refclock_arc.c; else echo refclock_arc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_arc_.c || rm -f refclock_arc_.c
 refclock_as2201_.c: refclock_as2201.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_as2201.c; then echo $(srcdir)/refclock_as2201.c; else echo refclock_as2201.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_as2201_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_as2201.c; then echo $(srcdir)/refclock_as2201.c; else echo refclock_as2201.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_as2201_.c || rm -f refclock_as2201_.c
 refclock_atom_.c: refclock_atom.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_atom.c; then echo $(srcdir)/refclock_atom.c; else echo refclock_atom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_atom_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_atom.c; then echo $(srcdir)/refclock_atom.c; else echo refclock_atom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_atom_.c || rm -f refclock_atom_.c
 refclock_bancomm_.c: refclock_bancomm.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_bancomm.c; then echo $(srcdir)/refclock_bancomm.c; else echo refclock_bancomm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_bancomm_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_bancomm.c; then echo $(srcdir)/refclock_bancomm.c; else echo refclock_bancomm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_bancomm_.c || rm -f refclock_bancomm_.c
 refclock_chronolog_.c: refclock_chronolog.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_chronolog.c; then echo $(srcdir)/refclock_chronolog.c; else echo refclock_chronolog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_chronolog_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_chronolog.c; then echo $(srcdir)/refclock_chronolog.c; else echo refclock_chronolog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_chronolog_.c || rm -f refclock_chronolog_.c
 refclock_chu_.c: refclock_chu.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_chu.c; then echo $(srcdir)/refclock_chu.c; else echo refclock_chu.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_chu_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_chu.c; then echo $(srcdir)/refclock_chu.c; else echo refclock_chu.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_chu_.c || rm -f refclock_chu_.c
 refclock_conf_.c: refclock_conf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_conf.c; then echo $(srcdir)/refclock_conf.c; else echo refclock_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_conf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_conf.c; then echo $(srcdir)/refclock_conf.c; else echo refclock_conf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_conf_.c || rm -f refclock_conf_.c
 refclock_datum_.c: refclock_datum.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_datum.c; then echo $(srcdir)/refclock_datum.c; else echo refclock_datum.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_datum_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_datum.c; then echo $(srcdir)/refclock_datum.c; else echo refclock_datum.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_datum_.c || rm -f refclock_datum_.c
 refclock_dumbclock_.c: refclock_dumbclock.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_dumbclock.c; then echo $(srcdir)/refclock_dumbclock.c; else echo refclock_dumbclock.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_dumbclock_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_dumbclock.c; then echo $(srcdir)/refclock_dumbclock.c; else echo refclock_dumbclock.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_dumbclock_.c || rm -f refclock_dumbclock_.c
 refclock_fg_.c: refclock_fg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_fg.c; then echo $(srcdir)/refclock_fg.c; else echo refclock_fg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_fg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_fg.c; then echo $(srcdir)/refclock_fg.c; else echo refclock_fg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_fg_.c || rm -f refclock_fg_.c
 refclock_gpsvme_.c: refclock_gpsvme.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_gpsvme.c; then echo $(srcdir)/refclock_gpsvme.c; else echo refclock_gpsvme.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_gpsvme_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_gpsvme.c; then echo $(srcdir)/refclock_gpsvme.c; else echo refclock_gpsvme.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_gpsvme_.c || rm -f refclock_gpsvme_.c
 refclock_heath_.c: refclock_heath.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_heath.c; then echo $(srcdir)/refclock_heath.c; else echo refclock_heath.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_heath_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_heath.c; then echo $(srcdir)/refclock_heath.c; else echo refclock_heath.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_heath_.c || rm -f refclock_heath_.c
 refclock_hopfpci_.c: refclock_hopfpci.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hopfpci.c; then echo $(srcdir)/refclock_hopfpci.c; else echo refclock_hopfpci.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hopfpci_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hopfpci.c; then echo $(srcdir)/refclock_hopfpci.c; else echo refclock_hopfpci.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hopfpci_.c || rm -f refclock_hopfpci_.c
 refclock_hopfser_.c: refclock_hopfser.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hopfser.c; then echo $(srcdir)/refclock_hopfser.c; else echo refclock_hopfser.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hopfser_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hopfser.c; then echo $(srcdir)/refclock_hopfser.c; else echo refclock_hopfser.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hopfser_.c || rm -f refclock_hopfser_.c
 refclock_hpgps_.c: refclock_hpgps.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hpgps.c; then echo $(srcdir)/refclock_hpgps.c; else echo refclock_hpgps.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hpgps_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_hpgps.c; then echo $(srcdir)/refclock_hpgps.c; else echo refclock_hpgps.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_hpgps_.c || rm -f refclock_hpgps_.c
 refclock_irig_.c: refclock_irig.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_irig.c; then echo $(srcdir)/refclock_irig.c; else echo refclock_irig.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_irig_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_irig.c; then echo $(srcdir)/refclock_irig.c; else echo refclock_irig.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_irig_.c || rm -f refclock_irig_.c
+refclock_jjy_.c: refclock_jjy.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_jjy.c; then echo $(srcdir)/refclock_jjy.c; else echo refclock_jjy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_jjy_.c || rm -f refclock_jjy_.c
 refclock_jupiter_.c: refclock_jupiter.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_jupiter.c; then echo $(srcdir)/refclock_jupiter.c; else echo refclock_jupiter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_jupiter_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_jupiter.c; then echo $(srcdir)/refclock_jupiter.c; else echo refclock_jupiter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_jupiter_.c || rm -f refclock_jupiter_.c
 refclock_leitch_.c: refclock_leitch.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_leitch.c; then echo $(srcdir)/refclock_leitch.c; else echo refclock_leitch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_leitch_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_leitch.c; then echo $(srcdir)/refclock_leitch.c; else echo refclock_leitch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_leitch_.c || rm -f refclock_leitch_.c
 refclock_local_.c: refclock_local.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_local.c; then echo $(srcdir)/refclock_local.c; else echo refclock_local.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_local_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_local.c; then echo $(srcdir)/refclock_local.c; else echo refclock_local.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_local_.c || rm -f refclock_local_.c
 refclock_msfees_.c: refclock_msfees.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_msfees.c; then echo $(srcdir)/refclock_msfees.c; else echo refclock_msfees.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_msfees_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_msfees.c; then echo $(srcdir)/refclock_msfees.c; else echo refclock_msfees.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_msfees_.c || rm -f refclock_msfees_.c
 refclock_mx4200_.c: refclock_mx4200.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_mx4200.c; then echo $(srcdir)/refclock_mx4200.c; else echo refclock_mx4200.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_mx4200_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_mx4200.c; then echo $(srcdir)/refclock_mx4200.c; else echo refclock_mx4200.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_mx4200_.c || rm -f refclock_mx4200_.c
 refclock_nmea_.c: refclock_nmea.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_nmea.c; then echo $(srcdir)/refclock_nmea.c; else echo refclock_nmea.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_nmea_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_nmea.c; then echo $(srcdir)/refclock_nmea.c; else echo refclock_nmea.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_nmea_.c || rm -f refclock_nmea_.c
 refclock_oncore_.c: refclock_oncore.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_oncore.c; then echo $(srcdir)/refclock_oncore.c; else echo refclock_oncore.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_oncore_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_oncore.c; then echo $(srcdir)/refclock_oncore.c; else echo refclock_oncore.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_oncore_.c || rm -f refclock_oncore_.c
 refclock_palisade_.c: refclock_palisade.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_palisade.c; then echo $(srcdir)/refclock_palisade.c; else echo refclock_palisade.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_palisade_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_palisade.c; then echo $(srcdir)/refclock_palisade.c; else echo refclock_palisade.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_palisade_.c || rm -f refclock_palisade_.c
 refclock_parse_.c: refclock_parse.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_parse.c; then echo $(srcdir)/refclock_parse.c; else echo refclock_parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_parse_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_parse.c; then echo $(srcdir)/refclock_parse.c; else echo refclock_parse.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_parse_.c || rm -f refclock_parse_.c
 refclock_pcf_.c: refclock_pcf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_pcf.c; then echo $(srcdir)/refclock_pcf.c; else echo refclock_pcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_pcf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_pcf.c; then echo $(srcdir)/refclock_pcf.c; else echo refclock_pcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_pcf_.c || rm -f refclock_pcf_.c
 refclock_pst_.c: refclock_pst.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_pst.c; then echo $(srcdir)/refclock_pst.c; else echo refclock_pst.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_pst_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_pst.c; then echo $(srcdir)/refclock_pst.c; else echo refclock_pst.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_pst_.c || rm -f refclock_pst_.c
 refclock_ptbacts_.c: refclock_ptbacts.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_ptbacts.c; then echo $(srcdir)/refclock_ptbacts.c; else echo refclock_ptbacts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_ptbacts_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_ptbacts.c; then echo $(srcdir)/refclock_ptbacts.c; else echo refclock_ptbacts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_ptbacts_.c || rm -f refclock_ptbacts_.c
 refclock_shm_.c: refclock_shm.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_shm.c; then echo $(srcdir)/refclock_shm.c; else echo refclock_shm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_shm_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_shm.c; then echo $(srcdir)/refclock_shm.c; else echo refclock_shm.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_shm_.c || rm -f refclock_shm_.c
 refclock_tpro_.c: refclock_tpro.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_tpro.c; then echo $(srcdir)/refclock_tpro.c; else echo refclock_tpro.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_tpro_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_tpro.c; then echo $(srcdir)/refclock_tpro.c; else echo refclock_tpro.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_tpro_.c || rm -f refclock_tpro_.c
 refclock_trak_.c: refclock_trak.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_trak.c; then echo $(srcdir)/refclock_trak.c; else echo refclock_trak.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_trak_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_trak.c; then echo $(srcdir)/refclock_trak.c; else echo refclock_trak.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_trak_.c || rm -f refclock_trak_.c
 refclock_true_.c: refclock_true.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_true.c; then echo $(srcdir)/refclock_true.c; else echo refclock_true.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_true_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_true.c; then echo $(srcdir)/refclock_true.c; else echo refclock_true.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_true_.c || rm -f refclock_true_.c
+refclock_tt560_.c: refclock_tt560.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_tt560.c; then echo $(srcdir)/refclock_tt560.c; else echo refclock_tt560.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_tt560_.c || rm -f refclock_tt560_.c
 refclock_ulink_.c: refclock_ulink.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_ulink.c; then echo $(srcdir)/refclock_ulink.c; else echo refclock_ulink.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_ulink_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_ulink.c; then echo $(srcdir)/refclock_ulink.c; else echo refclock_ulink.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_ulink_.c || rm -f refclock_ulink_.c
 refclock_usno_.c: refclock_usno.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_usno.c; then echo $(srcdir)/refclock_usno.c; else echo refclock_usno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_usno_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_usno.c; then echo $(srcdir)/refclock_usno.c; else echo refclock_usno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_usno_.c || rm -f refclock_usno_.c
 refclock_wwv_.c: refclock_wwv.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_wwv.c; then echo $(srcdir)/refclock_wwv.c; else echo refclock_wwv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_wwv_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_wwv.c; then echo $(srcdir)/refclock_wwv.c; else echo refclock_wwv.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_wwv_.c || rm -f refclock_wwv_.c
 refclock_wwvb_.c: refclock_wwvb.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_wwvb.c; then echo $(srcdir)/refclock_wwvb.c; else echo refclock_wwvb.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_wwvb_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_wwvb.c; then echo $(srcdir)/refclock_wwvb.c; else echo refclock_wwvb.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_wwvb_.c || rm -f refclock_wwvb_.c
+refclock_zyfer_.c: refclock_zyfer.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_zyfer.c; then echo $(srcdir)/refclock_zyfer.c; else echo refclock_zyfer.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_zyfer_.c || rm -f refclock_zyfer_.c
 check_y2k_.$(OBJEXT) cmd_args_.$(OBJEXT) map_vme_.$(OBJEXT) \
 ntp_config_.$(OBJEXT) ntp_control_.$(OBJEXT) ntp_crypto_.$(OBJEXT) \
 ntp_filegen_.$(OBJEXT) ntp_intres_.$(OBJEXT) ntp_io_.$(OBJEXT) \
 ntp_loopfilter_.$(OBJEXT) ntp_monitor_.$(OBJEXT) ntp_peer_.$(OBJEXT) \
 ntp_proto_.$(OBJEXT) ntp_refclock_.$(OBJEXT) ntp_request_.$(OBJEXT) \
-ntp_resolver_.$(OBJEXT) ntp_restrict_.$(OBJEXT) ntp_timer_.$(OBJEXT) \
-ntp_util_.$(OBJEXT) ntpd_.$(OBJEXT) refclock_acts_.$(OBJEXT) \
-refclock_arbiter_.$(OBJEXT) refclock_arc_.$(OBJEXT) \
-refclock_as2201_.$(OBJEXT) refclock_atom_.$(OBJEXT) \
-refclock_bancomm_.$(OBJEXT) refclock_chronolog_.$(OBJEXT) \
-refclock_chu_.$(OBJEXT) refclock_conf_.$(OBJEXT) \
-refclock_datum_.$(OBJEXT) refclock_dumbclock_.$(OBJEXT) \
-refclock_fg_.$(OBJEXT) refclock_gpsvme_.$(OBJEXT) \
-refclock_heath_.$(OBJEXT) refclock_hopfpci_.$(OBJEXT) \
-refclock_hopfser_.$(OBJEXT) refclock_hpgps_.$(OBJEXT) \
-refclock_irig_.$(OBJEXT) refclock_jupiter_.$(OBJEXT) \
+ntp_restrict_.$(OBJEXT) ntp_timer_.$(OBJEXT) ntp_util_.$(OBJEXT) \
+ntpd_.$(OBJEXT) refclock_acts_.$(OBJEXT) refclock_arbiter_.$(OBJEXT) \
+refclock_arc_.$(OBJEXT) refclock_as2201_.$(OBJEXT) \
+refclock_atom_.$(OBJEXT) refclock_bancomm_.$(OBJEXT) \
+refclock_chronolog_.$(OBJEXT) refclock_chu_.$(OBJEXT) \
+refclock_conf_.$(OBJEXT) refclock_datum_.$(OBJEXT) \
+refclock_dumbclock_.$(OBJEXT) refclock_fg_.$(OBJEXT) \
+refclock_gpsvme_.$(OBJEXT) refclock_heath_.$(OBJEXT) \
+refclock_hopfpci_.$(OBJEXT) refclock_hopfser_.$(OBJEXT) \
+refclock_hpgps_.$(OBJEXT) refclock_irig_.$(OBJEXT) \
+refclock_jjy_.$(OBJEXT) refclock_jupiter_.$(OBJEXT) \
 refclock_leitch_.$(OBJEXT) refclock_local_.$(OBJEXT) \
 refclock_msfees_.$(OBJEXT) refclock_mx4200_.$(OBJEXT) \
 refclock_nmea_.$(OBJEXT) refclock_oncore_.$(OBJEXT) \
@@ -440,9 +539,11 @@ refclock_palisade_.$(OBJEXT) refclock_parse_.$(OBJEXT) \
 refclock_pcf_.$(OBJEXT) refclock_pst_.$(OBJEXT) \
 refclock_ptbacts_.$(OBJEXT) refclock_shm_.$(OBJEXT) \
 refclock_tpro_.$(OBJEXT) refclock_trak_.$(OBJEXT) \
-refclock_true_.$(OBJEXT) refclock_ulink_.$(OBJEXT) \
-refclock_usno_.$(OBJEXT) refclock_wwv_.$(OBJEXT) \
-refclock_wwvb_.$(OBJEXT) : $(ANSI2KNR)
+refclock_true_.$(OBJEXT) refclock_tt560_.$(OBJEXT) \
+refclock_ulink_.$(OBJEXT) refclock_usno_.$(OBJEXT) \
+refclock_wwv_.$(OBJEXT) refclock_wwvb_.$(OBJEXT) \
+refclock_zyfer_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -455,7 +556,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -471,87 +572,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/check_y2k$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/cmd_args$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/map_vme$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_config$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_control$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_crypto$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_filegen$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_intres$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_io$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_loopfilter$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_monitor$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_peer$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_proto$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_refclock$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_request$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_resolver$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_restrict$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_timer$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp_util$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntpd$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_acts$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_arbiter$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_arc$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_as2201$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_atom$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_bancomm$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_chronolog$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_chu$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_conf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_datum$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_dumbclock$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_fg$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_gpsvme$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_heath$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_hopfpci$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_hopfser$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_hpgps$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_irig$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_jupiter$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_leitch$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_local$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_msfees$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_mx4200$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_nmea$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_oncore$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_palisade$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_parse$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_pcf$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_pst$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_ptbacts$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_shm$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_tpro$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_trak$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_true$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_ulink$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_usno$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_wwv$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/refclock_wwvb$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -560,7 +584,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -588,24 +616,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
@@ -616,11 +641,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -628,7 +653,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -642,18 +667,19 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am check-local clean clean-binPROGRAMS \
-	clean-checkPROGRAMS clean-generic distclean distclean-compile \
-	distclean-depend distclean-generic distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am check-local clean \
+	clean-binPROGRAMS clean-checkPROGRAMS clean-generic distclean \
+	distclean-compile distclean-depend distclean-generic \
+	distclean-tags distdir dvi dvi-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 check-local: @MAKE_CHECK_Y2K@
@@ -668,9 +694,8 @@ $(PROGRAMS): $(LDADD)
 	cd ../libparse && $(MAKE)
 
 version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpd
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
 	$(COMPILE) -c version.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/ntpd/jupiter.h b/contrib/ntp/ntpd/jupiter.h
index 84b9a59..ed80b0c 100644
--- a/contrib/ntp/ntpd/jupiter.h
+++ b/contrib/ntp/ntpd/jupiter.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /cvs/ntp/ntpd/jupiter.h,v 1.1.1.1 1999/05/26 00:48:19 stenn Exp $ (LBL) */
+/* @(#) $Header$ (LBL) */
 
 /*
  * Rockwell Jupiter GPS receiver definitions
diff --git a/contrib/ntp/ntpd/ntp_config.c b/contrib/ntp/ntpd/ntp_config.c
index 208b257..660d2c5 100644
--- a/contrib/ntp/ntpd/ntp_config.c
+++ b/contrib/ntp/ntpd/ntp_config.c
@@ -24,7 +24,9 @@
 
 #include 
 #include 
+#ifdef HAVE_SYS_PARAM_H
 #include 
+#endif
 #include 
 #ifndef SIGCHLD
 # define SIGCHLD SIGCLD
@@ -79,8 +81,8 @@ extern int priority_done;
  * setvar [ ]
  * logfile logfile
  * logconfig [+|-|=][{sync|sys|peer|clock}{{,all}{info|statistics|events|status}}]...
- * enable auth|bclient|pll|kernel|monitor|stats
- * disable auth|bclient|pll|kernel|monitor|stats
+ * enable auth|bclient|pll|kernel|monitor|stats|calibrate
+ * disable auth|bclient|pll|kernel|monitor|stats|calibrate
  * phone ...
  * pps device [assert|clear] [hardpps]
  * priority high|normal
@@ -240,12 +242,12 @@ static	struct keyword fgen_types[] = {
 static struct keyword flags_keywords[] = {
 	{ "auth",		PROTO_AUTHENTICATE },
 	{ "bclient",		PROTO_BROADCLIENT },
+	{ "calibrate",		PROTO_CAL },
 	{ "kernel",		PROTO_KERNEL },
 	{ "monitor",		PROTO_MONITOR },
 	{ "ntp",		PROTO_NTP },
-	{ "stats",		PROTO_FILEGEN },
 	{ "pps",		PROTO_PPS },
-	{ "calibrate",		PROTO_CAL },
+	{ "stats",		PROTO_FILEGEN },
 	{ "",			CONFIG_UNKNOWN }
 };
 
@@ -2101,11 +2103,11 @@ save_resolve(
 	}
 #endif
 
-	(void)fprintf(res_fp, "%s %d %d %d %d %d %d %d %s\n", name,
+	(void)fprintf(res_fp, "%s %d %d %d %d %d %d %u %s\n", name,
 	    mode, version, minpoll, maxpoll, flags, ttl, keyid, keystr);
 #ifdef DEBUG
 	if (debug > 1)
-		printf("config: %s %d %d %d %d %x %d %08x %s\n", name, mode,
+		printf("config: %s %d %d %d %d %x %d %u %s\n", name, mode,
 		    version, minpoll, maxpoll, flags, ttl, keyid, keystr);
 #endif
 
diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c
index 570e2f9..11686be 100644
--- a/contrib/ntp/ntpd/ntp_control.c
+++ b/contrib/ntp/ntpd/ntp_control.c
@@ -395,6 +395,9 @@ static u_char clocktypes[] = {
 	CTL_SST_TS_LF,		/* REFCLK_FG (37) */
 	CTL_SST_TS_UHF, 	/* REFCLK_HOPF_SERIAL (38) */
 	CTL_SST_TS_UHF,		/* REFCLK_HOPF_PCI (39) */
+	CTL_SST_TS_LF,		/* REFCLK_JJY (40) */
+	CTL_SST_TS_UHF,		/* REFCLK_TT560 (41) */
+	CTL_SST_TS_UHF,		/* REFCLK_ZYFER (42) */
 };
 
 
diff --git a/contrib/ntp/ntpd/ntp_crypto.c b/contrib/ntp/ntpd/ntp_crypto.c
index d8516b5..19f902a 100644
--- a/contrib/ntp/ntpd/ntp_crypto.c
+++ b/contrib/ntp/ntpd/ntp_crypto.c
@@ -950,9 +950,7 @@ crypto_recv(
 #if NTP_API > 3
 			ntv.modes = MOD_TAI;
 			ntv.constant = sys_tai;
-			if (ntp_adjtime(&ntv) == TIME_ERROR)
-				msyslog(LOG_ERR,
-				    "kernel TAI update failed");
+			(void)ntp_adjtime(&ntv);
 #endif /* NTP_API */
 #endif /* KERNEL_PLL */
 
diff --git a/contrib/ntp/ntpd/ntp_intres.c b/contrib/ntp/ntpd/ntp_intres.c
index 9653fdd..b6cd45b 100644
--- a/contrib/ntp/ntpd/ntp_intres.c
+++ b/contrib/ntp/ntpd/ntp_intres.c
@@ -20,6 +20,7 @@
 # include 
 #endif
 
+#include "ntp_machine.h"
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_request.h"
@@ -515,7 +516,7 @@ findhostaddr(
 			msyslog(LOG_INFO, "findhostaddr: address resolved.");
 #endif
 		s = strlen(hp->h_name) + 1;
-		cp = emalloc(s);
+		cp = (char *)emalloc(s);
 		strcpy(cp, hp->h_name);
 		entry->ce_name = cp;
 	}
diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c
index 23c0cb7..ef0c146 100644
--- a/contrib/ntp/ntpd/ntp_io.c
+++ b/contrib/ntp/ntpd/ntp_io.c
@@ -26,9 +26,13 @@
 #ifdef HAVE_NETINET_IN_SYSTM_H
 # include 
 #else /* Some old linux systems at least have in_system.h instead. */
-# include 
+# ifdef HAVE_NETINET_IN_SYSTEM_H
+#  include 
+# endif
 #endif /* HAVE_NETINET_IN_SYSTM_H */
-#include 
+#ifdef HAVE_NETINET_IP_H
+# include 
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include 
 #endif
@@ -37,6 +41,8 @@
 #endif
 #include 
 
+extern int listen_to_virtual_ips;
+
 #if _BSDI_VERSION >= 199510
 # include 
 #endif
@@ -271,9 +277,15 @@ create_sockets(
 		if ((ifap->ifa_flags & IFF_UP) == 0)
 		    continue;
 
+		if (debug)
+			printf("after getifaddrs(), considering %s (%s)\n",
+			       ifap->ifa_name,
+			       inet_ntoa(((struct sockaddr_in *)ifap->ifa_addr)->sin_addr));
+
 		if (ifap->ifa_flags & IFF_LOOPBACK) {
 			sin = (struct sockaddr_in *)ifap->ifa_addr;
-			if (ntohl(sin->sin_addr.s_addr) != 0x7f000001)
+			if (ntohl(sin->sin_addr.s_addr) != 0x7f000001 &&
+			    !listen_to_virtual_ips)
 				continue;
 		}
 		inter_list[i].flags = 0;
@@ -314,10 +326,10 @@ create_sockets(
 		 * one physical interface. -wsr
 		 */
 		for (j=0; j < i; j++)
-		    if (inter_list[j].sin.sin_addr.s_addr &
-			inter_list[j].mask.sin_addr.s_addr ==
-			inter_list[i].sin.sin_addr.s_addr &
-			inter_list[i].mask.sin_addr.s_addr)
+		    if ((inter_list[j].sin.sin_addr.s_addr &
+			 inter_list[j].mask.sin_addr.s_addr) ==
+			(inter_list[i].sin.sin_addr.s_addr &
+			 inter_list[i].mask.sin_addr.s_addr))
 		    {
 			    if (inter_list[j].flags & INT_LOOPBACK)
 				inter_list[j] = inter_list[i];
@@ -391,8 +403,6 @@ create_sockets(
 	for(n = ifc.ifc_len, ifr = ifc.ifc_req; n > 0;
 	    ifr = (struct ifreq *)((char *)ifr + size))
 	{
-		extern int listen_to_virtual_ips;
-
 		size = sizeof(*ifr);
 
 # ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
@@ -465,7 +475,7 @@ create_sockets(
 			(ifreq.ifr_flags & IFF_LOOPBACK)
 #  else /* not IFF_LOCAL_LOOPBACK and not IFF_LOOPBACK */
 			/* test against 127.0.0.1 (yuck!!) */
-			(inter_list[i].sin.sin_addr.s_addr == inet_addr("127.0.0.1"))
+			((*(struct sockaddr_in *)&ifr->ifr_addr).sin_addr.s_addr == inet_addr("127.0.0.1"))
 #  endif /* not IFF_LOCAL_LOOPBACK and not IFF_LOOPBACK */
 			)
 		{
@@ -1231,7 +1241,7 @@ fdbits(
 /*
  * input_handler - receive packets asynchronously
  */
-extern void
+void
 input_handler(
 	l_fp *cts
 	)
@@ -1585,7 +1595,7 @@ findbcastinter(
 	struct sockaddr_in *addr
 	)
 {
-#if defined(SIOCGIFCONF) || defined(SYS_WINNT)
+#if !defined(MPE) && (defined(SIOCGIFCONF) || defined(SYS_WINNT))
 	register int i;
 	register u_int32 xaddr;
 
diff --git a/contrib/ntp/ntpd/ntp_loopfilter.c b/contrib/ntp/ntpd/ntp_loopfilter.c
index c8a86cf..21085aa 100644
--- a/contrib/ntp/ntpd/ntp_loopfilter.c
+++ b/contrib/ntp/ntpd/ntp_loopfilter.c
@@ -32,20 +32,19 @@
  * included to protect against timewarps, timespikes and general mayhem.
  * All units are in s and s/s, unless noted otherwise.
  */
-#define CLOCK_MAX	.128	/* default max offset (s) */
+#define CLOCK_MAX	.128	/* default step offset (s) */
 #define CLOCK_PANIC	1000.	/* default panic offset (s) */
-#define CLOCK_MAXSTAB	2e-6	/* max frequency stability (s/s) */
-#define CLOCK_MAXERR	1e-2	/* max phase jitter (s) */
 #define	CLOCK_PHI	15e-6	/* max frequency error (s/s) */
 #define SHIFT_PLL	4	/* PLL loop gain (shift) */
-#define CLOCK_AVG	4.	/* FLL loop gain */
+#define CLOCK_FLL	8.	/* FLL loop gain */
+#define CLOCK_AVG	4.	/* parameter averaging constant */
 #define CLOCK_MINSEC	256.	/* min FLL update interval (s) */
 #define CLOCK_MINSTEP	900.	/* step-change timeout (s) */
-#define CLOCK_DAY	86400.	/* one day of seconds */
+#define CLOCK_DAY	86400.	/* one day of seconds (s) */
 #define CLOCK_LIMIT	30	/* poll-adjust threshold */
 #define CLOCK_PGATE	4.	/* poll-adjust gate */
-#define CLOCK_ALLAN	1024.	/* min Allan intercept (s) */
-#define CLOCK_ADF	1e11	/* Allan deviation factor */
+#define CLOCK_ALLAN	10	/* min Allan intercept (log2 s) */
+#define PPS_MAXAGE	120	/* kernel pps signal timeout (s) */
 
 /*
  * Clock discipline state machine. This is used to control the
@@ -106,8 +105,6 @@
  * also a signal for the external clock driver to discipline the system
  * clock.
  */
-#define PPS_MAXAGE 120		/* kernel pps signal timeout (s) */
-
 /*
  * Program variables that can be tinkered.
  */
@@ -115,7 +112,18 @@ double	clock_max = CLOCK_MAX;	/* max offset before step (s) */
 double	clock_panic = CLOCK_PANIC; /* max offset before panic (s) */
 double	clock_phi = CLOCK_PHI;	/* dispersion rate (s/s) */
 double	clock_minstep = CLOCK_MINSTEP; /* step timeout (s) */
-double	allan_xpt = CLOCK_ALLAN; /* minimum Allan intercept (s) */
+u_char	allan_xpt = CLOCK_ALLAN; /* minimum Allan intercept (log2 s) */
+
+/*
+ * Hybrid PLL/FLL parameters. These were chosen by experiment using a
+ * MatLab program. The parameters were fudged to match a pure PLL at
+ * poll intervals of 64 s and lower and a pure FLL at poll intervals of
+ * 4096 s and higher. Between these extremes the parameters were chosen
+ * as a geometric series of intervals while holding the overshoot to
+ * less than 5 percent.
+ */
+static double fll[] = {0., 1./64, 1./32, 1./16, 1./8, 1./4, 1.};
+static double pll[] = {1., 1.4,   2.,    2.8,   4.1,  7.,  12.};
 
 /*
  * Program variables
@@ -207,6 +215,7 @@ local_clock(
 	double clock_frequency;	/* clock frequency adjustment (ppm) */
 	double dtemp, etemp;	/* double temps */
 	int retval;		/* return value */
+	int i;
 
 	/*
 	 * If the loop is opened, monitor and record the offsets
@@ -447,7 +456,7 @@ local_clock(
 		 * and ignore it.
 		 */
 		default:
-			allow_panic = TRUE;
+			allow_panic = FALSE;
 			if (fabs(fp_offset - last_offset) >
 			    CLOCK_SGATE * oerror && mu <
 			    ULOGTOD(sys_poll + 1)) {
@@ -466,23 +475,30 @@ local_clock(
 			/*
 			 * Compute the FLL and PLL frequency adjustments
 			 * conditioned on intricate weighting factors.
-			 * For the FLL, the averaging interval is
-			 * clamped to a minimum of 1024 s and the gain
-			 * is decreased from unity for mu above 1024 s
-			 * to zero below 256 s. For the PLL, the
-			 * averaging interval is clamped not to exceed
-			 * the sustem poll interval. No gain factor is
-			 * necessary, since the frequency steering above
-			 * 1024 s is negligible. Particularly for the
+			 * The gain factors depend on the poll interval
+			 * and Allan intercept. For the FLL, the
+			 * averaging interval is clamped to a minimum of
+			 * 1024 s and the gain increased in stages from
+			 * zero for poll intervals below half the Allan
+			 * intercept to unity above twice the Allan
+			 * intercept. For the PLL, the averaging
+			 * interval is clamped not to exceed the poll
+			 * interval. No gain factor is necessary, since
+			 * the frequency steering above the Allan
+			 * intercept is negligible. Particularly for the
 			 * PLL, these measures allow oversampling, but
 			 * not undersampling and insure stability even
 			 * when the rules of fair engagement are broken.
 			 */
-			dtemp = max(mu, allan_xpt);
-			etemp = min(max(0, mu - CLOCK_MINSEC) /
-			    allan_xpt, 1.);
-			flladj = fp_offset * etemp / (dtemp *
-			    CLOCK_AVG);
+			i = sys_poll - allan_xpt + 4;
+			if (i < 0)
+				i = 0;
+			else if (i > 6)
+				i = 6;
+			etemp = fll[i];
+			dtemp = max(mu, ULOGTOD(allan_xpt));
+			flladj = (fp_offset - clock_offset) * etemp /
+			    (dtemp * CLOCK_FLL);
 			dtemp = ULOGTOD(SHIFT_PLL + 2 + sys_poll);
 			etemp = min(mu, ULOGTOD(sys_poll));
 			plladj = fp_offset * etemp / (dtemp * dtemp);
@@ -679,8 +695,8 @@ local_clock(
 	if (debug)
 		printf(
 		    "local_clock: mu %.0f noi %.3f stb %.3f pol %d cnt %d\n",
-		    mu, sys_jitter * 1e6 / mu, clock_stability * 1e6,
-		    sys_poll, tc_counter);
+		    mu, sys_jitter * 1e6, clock_stability * 1e6, sys_poll,
+		    tc_counter);
 #endif /* DEBUG */
 	return (retval);
 }
@@ -695,6 +711,7 @@ adj_host_clock(
 	)
 {
 	double adjustment;
+	int i;
 
 	/*
 	 * Update the dispersion since the last update. In contrast to
@@ -740,7 +757,19 @@ adj_host_clock(
 		    sys_peer->flags & FLAG_PREFER)
 			return;
 	}
-	adjustment = clock_offset / ULOGTOD(SHIFT_PLL + sys_poll);
+
+	/*
+	 * This ugly bit of business is necessary in order to move the
+	 * pole frequency higher in FLL mode. This is necessary for loop
+	 * stability.
+	 */
+	i = sys_poll - allan_xpt + 4;
+	if (i < 0)
+		i = 0;
+	else if (i > 6)
+		i = 6;
+	adjustment = clock_offset / (pll[i] * ULOGTOD(SHIFT_PLL +
+	    sys_poll));
 	clock_offset -= adjustment;
 	adj_systime(adjustment + drift_comp);
 }
@@ -922,7 +951,7 @@ loop_config(
 	case LOOP_ALLAN:		/* minimum Allan intercept */
 		if (freq < CLOCK_ALLAN)
 			freq = CLOCK_ALLAN;
-		allan_xpt = freq;
+		allan_xpt = (u_char)freq;
 		break;
 	
 	case LOOP_HUFFPUFF:		/* huff-n'-puff filter length */
diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c
index 4962057..fc95016 100644
--- a/contrib/ntp/ntpd/ntp_proto.c
+++ b/contrib/ntp/ntpd/ntp_proto.c
@@ -309,11 +309,7 @@ receive(
 #endif
 	if (restrict_mask & RES_IGNORE)
 		return;				/* no anything */
-	if (!(SRCPORT(&rbufp->recv_srcadr) == NTP_PORT ||
-	    SRCPORT(&rbufp->recv_srcadr) >= IPPORT_RESERVED)) {
-		sys_badlength++;
-		return;				/* invalid port */
-	}
+
 	pkt = &rbufp->recv_pkt;
 	if (PKT_VERSION(pkt->li_vn_mode) == NTP_VERSION) {
 		sys_newversionpkt++;		/* new version */
@@ -2506,7 +2502,8 @@ int
 default_get_precision(void)
 {
 	struct timeval tp;
-#if !defined(SYS_WINNT) && !defined(VMS) && !defined(_SEQUENT_)
+#if !defined(SYS_WINNT) && !defined(VMS) && !defined(_SEQUENT_) && \
+    !defined(MPE)
 	struct timezone tzp;
 #elif defined(VMS) || defined(_SEQUENT_)
 	struct timezone {
diff --git a/contrib/ntp/ntpd/ntp_request.c b/contrib/ntp/ntpd/ntp_request.c
index 6f5e153..260b48b 100644
--- a/contrib/ntp/ntpd/ntp_request.c
+++ b/contrib/ntp/ntpd/ntp_request.c
@@ -379,6 +379,7 @@ process_private(
 	)
 {
 	struct req_pkt *inpkt;
+	struct req_pkt_tail *tailinpkt;
 	struct sockaddr_in *srcadr;
 	struct interface *inter;
 	struct req_proc *proc;
@@ -410,7 +411,7 @@ process_private(
 	    || (++ec, INFO_ERR(inpkt->err_nitems) != 0)
 	    || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
 	    || (++ec, rbufp->recv_length > REQ_LEN_MAC)
-	    || (++ec, rbufp->recv_length < REQ_LEN_NOMAC)
+	    || (++ec, rbufp->recv_length < REQ_LEN_HDR)
 		) {
 		msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed", ec);
 		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
@@ -462,18 +463,27 @@ process_private(
 		l_fp ftmp;
 		double dtemp;
 	
+		if (rbufp->recv_length < (REQ_LEN_HDR +
+		    (INFO_ITEMSIZE(inpkt->mbz_itemsize) *
+		    INFO_NITEMS(inpkt->err_nitems))
+		    + sizeof(struct req_pkt_tail))) {
+			req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
+		}
+		tailinpkt = (struct req_pkt_tail *)((char *)&rbufp->recv_pkt +
+		    rbufp->recv_length - sizeof(struct req_pkt_tail));
+
 		/*
 		 * If this guy is restricted from doing this, don't let him
 		 * If wrong key was used, or packet doesn't have mac, return.
 		 */
 		if (!INFO_IS_AUTH(inpkt->auth_seq) || info_auth_keyid == 0
-		    || ntohl(inpkt->keyid) != info_auth_keyid) {
+		    || ntohl(tailinpkt->keyid) != info_auth_keyid) {
 #ifdef DEBUG
 			if (debug > 4)
 			    printf("failed auth %d info_auth_keyid %lu pkt keyid %lu\n",
 				    INFO_IS_AUTH(inpkt->auth_seq),
 				    (u_long)info_auth_keyid,
-				    (u_long)ntohl(inpkt->keyid));
+				    (u_long)ntohl(tailinpkt->keyid));
 #endif
 			req_ack(srcadr, inter, inpkt, INFO_ERR_AUTH);
 			return;
@@ -502,7 +512,7 @@ process_private(
 		 * calculate absolute time difference between xmit time stamp
 		 * and receive time stamp.  If too large, too bad.
 		 */
-		NTOHL_FP(&inpkt->tstamp, &ftmp);
+		NTOHL_FP(&tailinpkt->tstamp, &ftmp);
 		L_SUB(&ftmp, &rbufp->recv_time);
 		LFPTOD(&ftmp, dtemp);
 		if (fabs(dtemp) >= INFO_TS_MAXSKEW) {
@@ -517,7 +527,8 @@ process_private(
 		 * So far so good.  See if decryption works out okay.
 		 */
 		if (!authdecrypt(info_auth_keyid, (u_int32 *)inpkt,
-		    REQ_LEN_NOMAC, (int)(rbufp->recv_length - REQ_LEN_NOMAC))) {
+		    rbufp->recv_length - sizeof(struct req_pkt_tail) +
+		    REQ_LEN_HDR, sizeof(struct req_pkt_tail) - REQ_LEN_HDR)) {
 			req_ack(srcadr, inter, inpkt, INFO_ERR_AUTH);
 			return;
 		}
@@ -526,8 +537,13 @@ process_private(
 	/*
 	 * If we need data, check to see if we have some.  If we
 	 * don't, check to see that there is none (picky, picky).
+	 *
+	 * Handle the exception of REQ_CONFIG. It can have two data sizes.
 	 */
-	if (INFO_ITEMSIZE(inpkt->mbz_itemsize) != proc->sizeofitem) {
+	if (INFO_ITEMSIZE(inpkt->mbz_itemsize) != proc->sizeofitem &&
+	    !(inpkt->implementation == IMPL_XNTPD &&
+	    inpkt->request == REQ_CONFIG &&
+	    INFO_ITEMSIZE(inpkt->mbz_itemsize) == sizeof(struct old_conf_peer))) {
                 msyslog(LOG_ERR, "INFO_ITEMSIZE(inpkt->mbz_itemsize) != proc->sizeofitem: %d != %d",
 			INFO_ITEMSIZE(inpkt->mbz_itemsize), proc->sizeofitem);
 		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
@@ -903,22 +919,24 @@ sys_info(
 	is->poll = sys_poll;
 	
 	is->flags = 0;
-	if (sys_bclient)
-	    is->flags |= INFO_FLAG_BCLIENT;
 	if (sys_authenticate)
-	    is->flags |= INFO_FLAG_AUTHENTICATE;
+		is->flags |= INFO_FLAG_AUTHENTICATE;
+	if (sys_bclient)
+		is->flags |= INFO_FLAG_BCLIENT;
+#ifdef REFCLOCK
+	if (cal_enable)
+		is->flags |= INFO_FLAG_CAL;
+#endif /* REFCLOCK */
 	if (kern_enable)
-	    is->flags |= INFO_FLAG_KERNEL;
-	if (ntp_enable)
-	    is->flags |= INFO_FLAG_NTP;
-	if (pll_control)
-	    is->flags |= INFO_FLAG_PLL_SYNC;
-	if (pps_control)
-	    is->flags |= INFO_FLAG_PPS_SYNC;
+		is->flags |= INFO_FLAG_KERNEL;
 	if (mon_enabled != MON_OFF)
-	    is->flags |= INFO_FLAG_MONITOR;
+		is->flags |= INFO_FLAG_MONITOR;
+	if (ntp_enable)
+		is->flags |= INFO_FLAG_NTP;
+	if (pps_enable)
+		is->flags |= INFO_FLAG_PPS_SYNC;
 	if (stats_control)
-	    is->flags |= INFO_FLAG_FILEGEN;
+		is->flags |= INFO_FLAG_FILEGEN;
 	is->bdelay = HTONS_FP(DTOFP(sys_bdelay));
 	HTONL_UF(sys_authdelay.l_f, &is->authdelay);
 
@@ -1133,8 +1151,9 @@ do_conf(
 	)
 {
 	u_int fl;
-	register struct conf_peer *cp;
-	register int items;
+	struct conf_peer *cp;
+	struct old_conf_peer *ocp;
+	int items;
 	struct sockaddr_in peeraddr;
 
 	/*
@@ -1142,6 +1161,9 @@ do_conf(
 	 * okay.  If not, complain about it.  Note we are
 	 * very picky here.
 	 */
+	ocp = NULL;
+	if (INFO_ITEMSIZE(inpkt->mbz_itemsize) == sizeof(struct old_conf_peer))
+		ocp = (struct old_conf_peer *)inpkt->data;
 	items = INFO_NITEMS(inpkt->err_nitems);
 	cp = (struct conf_peer *)inpkt->data;
 
@@ -1158,7 +1180,11 @@ do_conf(
 		    CONF_FLAG_NOSELECT | CONF_FLAG_BURST | CONF_FLAG_IBURST |
 		    CONF_FLAG_SKEY))
 		    fl = 1;
-		cp++;
+		if (ocp) {
+			ocp++;
+			cp = (struct conf_peer *)ocp;
+		} else
+			cp++;
 	}
 
 	if (fl) {
@@ -1172,6 +1198,8 @@ do_conf(
 	 */
 	items = INFO_NITEMS(inpkt->err_nitems);
 	cp = (struct conf_peer *)inpkt->data;
+	if (ocp)
+		ocp = (struct old_conf_peer *)inpkt->data;
 	memset((char *)&peeraddr, 0, sizeof(struct sockaddr_in));
 	peeraddr.sin_family = AF_INET;
 	peeraddr.sin_port = htons(NTP_PORT);
@@ -1211,11 +1239,15 @@ do_conf(
 		/* XXX W2DO? minpoll/maxpoll arguments ??? */
 		if (peer_config(&peeraddr, any_interface, cp->hmode,
 		    cp->version, cp->minpoll, cp->maxpoll, fl, cp->ttl,
-		    cp->keyid, cp->keystr) == 0) {
+		    cp->keyid, NULL) == 0) {
 			req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
 			return;
 		}
-		cp++;
+		if (ocp) {
+			ocp++;
+			cp = (struct conf_peer *)ocp;
+		} else
+			cp++;
 	}
 
 	req_ack(srcadr, inter, inpkt, INFO_OKAY);
@@ -1433,27 +1465,32 @@ setclr_flags(
 
 	if (flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS |
 		      SYS_FLAG_NTP | SYS_FLAG_KERNEL | SYS_FLAG_MONITOR |
-		      SYS_FLAG_FILEGEN)) {
+		      SYS_FLAG_FILEGEN | SYS_FLAG_AUTH | SYS_FLAG_CAL)) {
 		msyslog(LOG_ERR, "setclr_flags: extra flags: %#x",
 			flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS | 
 				  SYS_FLAG_NTP | SYS_FLAG_KERNEL |
-				  SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN));
+				  SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN |
+				  SYS_FLAG_AUTH | SYS_FLAG_CAL));
 		req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
 		return;
 	}
 
 	if (flags & SYS_FLAG_BCLIENT)
-	    proto_config(PROTO_BROADCLIENT, set, 0.);
+		proto_config(PROTO_BROADCLIENT, set, 0.);
 	if (flags & SYS_FLAG_PPS)
-	    proto_config(PROTO_PPS, set, 0.);
+		proto_config(PROTO_PPS, set, 0.);
 	if (flags & SYS_FLAG_NTP)
-	    proto_config(PROTO_NTP, set, 0.);
+		proto_config(PROTO_NTP, set, 0.);
 	if (flags & SYS_FLAG_KERNEL)
-	    proto_config(PROTO_KERNEL, set, 0.);
+		proto_config(PROTO_KERNEL, set, 0.);
 	if (flags & SYS_FLAG_MONITOR)
-	    proto_config(PROTO_MONITOR, set, 0.);
+		proto_config(PROTO_MONITOR, set, 0.);
 	if (flags & SYS_FLAG_FILEGEN)
-	    proto_config(PROTO_FILEGEN, set, 0.);
+		proto_config(PROTO_FILEGEN, set, 0.);
+	if (flags & SYS_FLAG_AUTH)
+		proto_config(PROTO_AUTHENTICATE, set, 0.);
+	if (flags & SYS_FLAG_CAL)
+		proto_config(PROTO_CAL, set, 0.);
 	req_ack(srcadr, inter, inpkt, INFO_OKAY);
 }
 
diff --git a/contrib/ntp/ntpd/ntp_timer.c b/contrib/ntp/ntpd/ntp_timer.c
index 71a84e2..c2b1d72 100644
--- a/contrib/ntp/ntpd/ntp_timer.c
+++ b/contrib/ntp/ntpd/ntp_timer.c
@@ -11,7 +11,9 @@
 
 #include 
 #include 
-#include 
+#ifdef HAVE_SYS_SIGNAL_H
+# include 
+#endif
 #ifdef HAVE_UNISTD_H
 # include 
 #endif
diff --git a/contrib/ntp/ntpd/ntpd.c b/contrib/ntp/ntpd/ntpd.c
index aab9881..1b80560 100644
--- a/contrib/ntp/ntpd/ntpd.c
+++ b/contrib/ntp/ntpd/ntpd.c
@@ -6,6 +6,7 @@
 # include 
 #endif
 
+#include "ntp_machine.h"
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_stdlib.h"
@@ -19,9 +20,15 @@
 #include 
 #ifndef SYS_WINNT
 # if !defined(VMS)	/*wjm*/
-#  include 
+#  ifdef HAVE_SYS_PARAM_H
+#   include 
+#  endif
 # endif /* VMS */
-# include 
+# ifdef HAVE_SYS_SIGNAL_H
+#  include 
+# else
+#  include 
+# endif
 # ifdef HAVE_SYS_IOCTL_H
 #  include 
 # endif /* HAVE_SYS_IOCTL_H */
@@ -118,7 +125,7 @@ HANDLE ResolverThreadHandle = NULL;
 /* variables used to inform the Service Control Manager of our current state */
 SERVICE_STATUS ssStatus;
 SERVICE_STATUS_HANDLE	sshStatusHandle;
-HANDLE WaitHandles[2] = { NULL, NULL };
+HANDLE WaitHandles[3] = { NULL, NULL, NULL };
 char szMsgPath[255];
 static BOOL WINAPI OnConsoleEvent(DWORD dwCtrlType);
 #endif /* SYS_WINNT */
@@ -354,7 +361,7 @@ ntpdmain(
 	}
 #endif
 
-#ifdef HAVE_GETUID
+#if defined(HAVE_GETUID) && !defined(MPE) /* MPE lacks the concept of root */
 	{
 		uid_t uid;
 
@@ -790,6 +797,7 @@ service_main(
 #if defined(HAVE_IO_COMPLETION_PORT)
 		WaitHandles[0] = CreateEvent(NULL, FALSE, FALSE, NULL); /* exit reques */
 		WaitHandles[1] = get_timer_handle();
+	    WaitHandles[2] = get_io_event();
 
 		for (;;) {
 			DWORD Index = WaitForMultipleObjectsEx(sizeof(WaitHandles)/sizeof(WaitHandles[0]), WaitHandles, FALSE, 1000, MWMO_ALERTABLE);
@@ -801,16 +809,36 @@ service_main(
 				case WAIT_OBJECT_0 + 1 : /* timer */
 					timer();
 				break;
-				case WAIT_OBJECT_0 + 2 : { /* Windows message */
+
+				case WAIT_OBJECT_0 + 2 : /* Io event */
+# ifdef DEBUG
+					if ( debug > 3 )
+					{
+						printf( "IoEvent occurred\n" );
+					}
+# endif
+				break;
+
+# if 1
+				/*
+				 * FIXME: According to the documentation for WaitForMultipleObjectsEx
+				 *        this is not possible. This may be a vestigial from when this was
+				 *        MsgWaitForMultipleObjects, maybe it should be removed?
+				 */
+				case WAIT_OBJECT_0 + 3 : /* windows message */
+				{
 					MSG msg;
-					while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-						if (msg.message == WM_QUIT) {
-							exit(0);
+					while ( PeekMessage( &msg, NULL, 0, 0, PM_REMOVE ) )
+					{
+						if ( msg.message == WM_QUIT )
+						{
+							exit( 0 );
 						}
-						DispatchMessage(&msg);
+						DispatchMessage( &msg );
 					}
 				}
 				break;
+# endif
 
 				case WAIT_IO_COMPLETION : /* loop */
 				case WAIT_TIMEOUT :
diff --git a/contrib/ntp/ntpd/refclock_chu.c b/contrib/ntp/ntpd/refclock_chu.c
index 10fcea5..b239ad6 100644
--- a/contrib/ntp/ntpd/refclock_chu.c
+++ b/contrib/ntp/ntpd/refclock_chu.c
@@ -1315,6 +1315,9 @@ chu_poll(
 	} else if (up->leap & 0x2) {
 		pp->leap = LEAP_ADDSECOND;
 		leapchar = 'L';
+	} else if (up->leap & 0x4) {
+		pp->leap = LEAP_DELSECOND;
+		leapchar = 'l';
 	} else {
 		pp->leap = LEAP_NOWARNING;
 	}
diff --git a/contrib/ntp/ntpd/refclock_conf.c b/contrib/ntp/ntpd/refclock_conf.c
index 0e6c927..478019f 100644
--- a/contrib/ntp/ntpd/refclock_conf.c
+++ b/contrib/ntp/ntpd/refclock_conf.c
@@ -240,6 +240,24 @@ extern	struct refclock	refclock_hopfpci;
 #define	refclock_hopfpci refclock_none
 #endif
 
+#ifdef CLOCK_JJY
+extern	struct refclock	refclock_jjy;
+#else
+#define	refclock_jjy refclock_none
+#endif
+
+#ifdef CLOCK_TT560
+extern	struct refclock	refclock_tt560;
+#else
+#define	refclock_tt560 refclock_none
+#endif
+
+#ifdef CLOCK_ZYFER
+extern	struct refclock	refclock_zyfer;
+#else
+#define	refclock_zyfer refclock_none
+#endif
+
 /*
  * Order is clock_start(), clock_shutdown(), clock_poll(),
  * clock_control(), clock_init(), clock_buginfo, clock_flags;
@@ -259,7 +277,7 @@ struct refclock *refclock_conf[] = {
 	&refclock_mx4200,	/* 9 REFCLK_GPS_MX4200 */
 	&refclock_as2201,	/* 10 REFCLK_GPS_AS2201 */
 	&refclock_arbiter,	/* 11 REFCLK_GPS_ARBITER */
-        &refclock_tpro,		/* 12 REFCLK_IRIG_TPRO */
+	&refclock_tpro,		/* 12 REFCLK_IRIG_TPRO */
 	&refclock_leitch,	/* 13 REFCLK_ATOM_LEITCH */
 	&refclock_msfees,	/* 14 REFCLK_MSF_EES */
 	&refclock_true,		/* 15 alias for REFCLK_TRUETIME */
@@ -276,17 +294,20 @@ struct refclock *refclock_conf[] = {
 	&refclock_hpgps,	/* 26 REFCLK_GPS_HP */
 	&refclock_arc, 		/* 27 REFCLK_ARCRON_MSF */
 	&refclock_shm,		/* 28 REFCLK_SHM */
-	&refclock_palisade,     /* 29 REFCLK_PALISADE */
+	&refclock_palisade,	/* 29 REFCLK_PALISADE */
 	&refclock_oncore,	/* 30 REFCLK_ONCORE */
 	&refclock_jupiter,	/* 31 REFCLK_GPS_JUPITER */
 	&refclock_chronolog,	/* 32 REFCLK_CHRONOLOG */
 	&refclock_dumbclock,	/* 33 REFCLK_DUMBCLOCK */
-	&refclock_ulink,        /* 34 REFCLOCK_ULINK */
-	&refclock_pcf,          /* 35 REFCLOCK_PCF */
+	&refclock_ulink,	/* 34 REFCLOCK_ULINK */
+	&refclock_pcf,		/* 35 REFCLOCK_PCF */
 	&refclock_wwv,		/* 36 REFCLOCK_WWV_AUDIO */
 	&refclock_fg,		/* 37 REFCLOCK_FG */
 	&refclock_hopfser,	/* 38 REFCLK_HOPF_SERIAL */
-	&refclock_hopfpci	/* 39 REFCLK_HOPF_PCI */
+	&refclock_hopfpci,	/* 39 REFCLK_HOPF_PCI */
+	&refclock_jjy,		/* 40 REFCLK_JJY */
+	&refclock_tt560,	/* 41 REFCLK_TT560 */
+	&refclock_zyfer		/* 42 REFCLK_ZYFER */
 };
 
 u_char num_refclock_conf = sizeof(refclock_conf)/sizeof(struct refclock *);
diff --git a/contrib/ntp/ntpd/refclock_jjy.c b/contrib/ntp/ntpd/refclock_jjy.c
new file mode 100644
index 0000000..18de93a
--- /dev/null
+++ b/contrib/ntp/ntpd/refclock_jjy.c
@@ -0,0 +1,712 @@
+/*
+ * refclock_jjy - clock driver for JJY receivers
+ */
+
+/**********************************************************************/
+/*                                                                    */
+/*  Copyright (C) 2001, Takao Abe.  All rights reserved.              */
+/*                                                                    */
+/*  Permission to use, copy, modify, and distribute this software     */
+/*  and its documentation for any purpose is hereby granted           */
+/*  without fee, provided that the following conditions are met:      */
+/*                                                                    */
+/*  One retains the entire copyright notice properly, and both the    */
+/*  copyright notice and this license. in the documentation and/or    */
+/*  other materials provided with the distribution.                   */
+/*                                                                    */
+/*  This software and the name of the author must not be used to      */
+/*  endorse or promote products derived from this software without    */
+/*  prior written permission.                                         */
+/*                                                                    */
+/*  THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT EXPRESSED OR IMPLIED    */
+/*  WARRANTIES OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, THE        */
+/*  IMPLIED WARRANTIES OF MERCHANTABLILITY AND FITNESS FOR A          */
+/*  PARTICULAR PURPOSE.                                               */
+/*  IN NO EVENT SHALL THE AUTHOR TAKAO ABE BE LIABLE FOR ANY DIRECT,  */
+/*  INDIRECT, GENERAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES   */
+/*  ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE        */
+/*  GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS      */
+/*  INTERRUPTION ) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     */
+/*  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ( INCLUDING        */
+/*  NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF    */
+/*  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+/*                                                                    */
+/*  This driver is developed in my private time, and is opened as     */
+/*  voluntary contributions for the NTP.                              */
+/*  The manufacturer of the JJY receiver has not participated in      */
+/*  a development of this driver.                                     */
+/*  The manufacturer does not warrant anything about this driver,     */
+/*  and is not liable for anything about this driver.                 */
+/*                                                                    */
+/**********************************************************************/
+/*                                                                    */
+/*  Author     Takao Abe                                              */
+/*  Email      abetakao@bea.hi-ho.ne.jp                               */
+/*  Homepage   http://www.bea.hi-ho.ne.jp/abetakao/                   */
+/*                                                                    */
+/**********************************************************************/
+/*                                                                    */
+/*  History                                                           */
+/*                                                                    */
+/*  2001/07/15                                                        */
+/*    [New]    Support the Tristate Ltd. JJY receiver                 */
+/*                                                                    */
+/*  2001/08/04                                                        */
+/*    [Change] Log to clockstats even if bad reply                    */
+/*    [Fix]    PRECISION = (-3) (about 100 ms)                        */
+/*    [Add]    Support the C-DEX Co.Ltd. JJY receiver                 */
+/*  2001/12/04                                                        */
+/*    [Fix]    C-DEX JST2000 ( fukusima@goto.info.waseda.ac.jp )      */
+/*                                                                    */
+/**********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#if defined(REFCLOCK) && defined(CLOCK_JJY)
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_tty.h"
+#include "ntp_refclock.h"
+#include "ntp_calendar.h"
+#include "ntp_stdlib.h"
+
+/**********************************************************************/
+/*                                                                    */
+/*  The Tristate Ltd. JJY receiver JJY01                              */
+/*                                                                    */
+/*  Command        Response                 Remarks                   */
+/*  ------------   ----------------------   ---------------------     */
+/*  date   YYYY/MM/DD XXX                             */
+/*  time   HH:MM:SS                                   */
+/*  stim   HH:MM:SS         Reply at just second      */
+/*                                                                    */
+/*  During synchronization after a receiver is turned on,             */
+/*  It replies the past time from 2000/01/01 00:00:00.                */
+/*  The function "refclock_process" checks the time and tells         */
+/*  as an insanity time.                                              */
+/*                                                                    */
+/**********************************************************************/
+/*                                                                    */
+/*  The C-DEX Co. Ltd. JJY receiver JST2000                           */
+/*                                                                    */
+/*  Command        Response                 Remarks                   */
+/*  ------------   ----------------------   ---------------------     */
+/*  1J   JYYMMDD HHMMSSS                          */
+/*                                                                    */
+/**********************************************************************/
+
+/*
+ * Interface definitions
+ */
+#define	DEVICE  	"/dev/jjy%d"    /* device name and unit */
+#define	SPEED232	B9600           /* uart speed (9600 baud) */
+#define	REFID   	"JJY"           /* reference ID */
+#define	DESCRIPTION	"JJY Receiver"
+#define	PRECISION	(-3)           /* precision assumed (about 100 ms) */
+
+/*
+ * JJY unit control structure
+ */
+struct jjyunit {
+	char	unittype ;	/* UNITTYPE_XXXXXXXXXX */
+	short	version ;
+	short	linediscipline ;	/* LDISC_CLK or LDISC_RAW */
+	int 	linecount ;
+	int 	lineerror ;
+	int 	year, month, day, hour, minute, second, msecond ;
+/* LDISC_RAW only */
+#define	MAX_LINECOUNT	8
+#define	MAX_RAWBUF   	64
+	int 	lineexpect ;
+	int 	charexpect [ MAX_LINECOUNT ] ;
+	int 	charcount ;
+	char	rawbuf [ MAX_RAWBUF ] ;
+};
+
+#define	UNITTYPE_TRISTATE_JJY01	1
+#define	UNITTYPE_CDEX_JST2000  	2
+
+/*
+ * Function prototypes
+ */
+static	int 	jjy_start                   P((int, struct peer *));
+static	void	jjy_shutdown                P((int, struct peer *));
+static	void	jjy_poll                    P((int, struct peer *));
+static	void	jjy_poll_tristate_jjy01     P((int, struct peer *));
+static	void	jjy_poll_cdex_jst2000       P((int, struct peer *));
+static	void	jjy_receive                 P((struct recvbuf *));
+static	int 	jjy_receive_tristate_jjy01  P((struct recvbuf *));
+static	int 	jjy_receive_cdex_jst2000    P((struct recvbuf *));
+
+/*
+ * Transfer vector
+ */
+struct	refclock refclock_jjy = {
+	jjy_start,      /* start up driver */
+	jjy_shutdown,   /* shutdown driver */
+	jjy_poll,       /* transmit poll message */
+	noentry,        /* not used */
+	noentry,        /* not used */
+	noentry,        /* not used */
+	NOFLAGS         /* not used */
+};
+
+/*
+ * Start up driver return code
+ */
+#define	RC_START_SUCCESS	1
+#define	RC_START_ERROR  	0
+
+/*
+ * Local constants definition
+ */
+
+#define	MAX_LOGTEXT	64
+
+
+/**************************************************************************************************/
+/*  jjy_start - open the devices and initialize data for processing                               */
+/**************************************************************************************************/
+static int
+jjy_start ( int unit, struct peer *peer )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	int 	fd ;
+	char	*pDeviceName ;
+	short	iDiscipline ;
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf ( "jjy_start (refclock_jjy.c) : %s  mode=%d  ", ntoa(&peer->srcadr), peer->ttlmax ) ;
+		printf ( DEVICE, unit ) ;
+		printf ( "\n" ) ;
+	}
+#endif
+	/*
+	 * Open serial port
+	 */
+	if ( ! ( pDeviceName = (char*) emalloc ( strlen(DEVICE) + 10 ) ) ) {
+		return RC_START_ERROR ;
+	}
+	sprintf ( pDeviceName, DEVICE, unit ) ;
+
+	/*
+	 * peer->ttlmax is a mode number specified by "127.127.40.X mode N" in the ntp.conf
+	 */
+	switch ( peer->ttlmax ) {
+	case 0 :
+	case 1 : iDiscipline = LDISC_CLK ; break ;
+	case 2 : iDiscipline = LDISC_RAW ; break ;
+	default :
+		msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
+		          ntoa(&peer->srcadr), peer->ttlmax ) ;
+		free ( (void*) pDeviceName ) ;
+		return RC_START_ERROR ;
+	}
+
+	if ( ! ( fd = refclock_open ( pDeviceName, SPEED232, iDiscipline ) ) ) {
+		free ( (void*) pDeviceName ) ;
+		return RC_START_ERROR ;
+	}
+	free ( (void*) pDeviceName ) ;
+
+	/*
+	 * Allocate and initialize unit structure
+	 */
+	if ( ! ( up = (struct jjyunit *) emalloc (sizeof(struct jjyunit)) ) ) {
+		close ( fd ) ;
+		return RC_START_ERROR ;
+	}
+
+	memset ( (char*)up, 0, sizeof(struct jjyunit) ) ;
+	up->linediscipline = iDiscipline ;
+
+	/*
+	 * peer->ttlmax is a mode number specified by "127.127.40.X mode N" in the ntp.conf
+	 */
+	switch ( peer->ttlmax ) {
+	case 0 :
+		/*
+		 * The mode 0 is a default clock type at this time.
+		 * But this will be change to auto-detect mode in the future.
+		 */
+	case 1 :
+		up->unittype = UNITTYPE_TRISTATE_JJY01 ;
+		up->version  = 100 ;
+		up->lineexpect = 2 ;
+		up->charexpect[0] = 14 ; /* YYYY/MM/DD WWW */
+		up->charexpect[1] =  8 ; /* HH:MM:SS */
+		break ;
+	case 2 :
+		up->unittype = UNITTYPE_CDEX_JST2000 ;
+		up->lineexpect = 1 ;
+		up->charexpect[0] = 15 ; /* JYYMMDD HHMMSSS */
+		break ;
+	default :
+		msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
+		          ntoa(&peer->srcadr), peer->ttlmax ) ;
+		close ( fd ) ;
+		free ( (void*) up ) ;
+		return RC_START_ERROR ;
+	}
+
+	pp = peer->procptr ;
+	pp->unitptr       = (caddr_t) up ;
+	pp->io.clock_recv = jjy_receive ;
+	pp->io.srcclock   = (caddr_t) peer ;
+	pp->io.datalen    = 0 ;
+	pp->io.fd         = fd ;
+	if ( ! io_addclock(&pp->io) ) {
+		close ( fd ) ;
+		free ( (void*) up ) ;
+		return RC_START_ERROR ;
+	}
+
+	/*
+	 * Initialize miscellaneous variables
+	 */
+	peer->precision = PRECISION ;
+	peer->burst     = 1 ;
+	pp->clockdesc   = DESCRIPTION ;
+	memcpy ( (char*)&pp->refid, REFID, strlen(REFID) ) ;
+
+	return RC_START_SUCCESS ;
+
+}
+
+
+/**************************************************************************************************/
+/*  jjy_shutdown - shutdown the clock                                                             */
+/**************************************************************************************************/
+static void
+jjy_shutdown ( int unit, struct peer *peer )
+{
+
+	struct jjyunit      *up;
+	struct refclockproc *pp;
+
+	pp = peer->procptr ;
+	up = (struct jjyunit *) pp->unitptr ;
+	io_closeclock ( &pp->io ) ;
+	free ( (void*) up ) ;
+
+}
+
+
+/**************************************************************************************************/
+/*  jjy_receive - receive data from the serial interface                                          */
+/**************************************************************************************************/
+static void
+jjy_receive ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	struct peer         *peer;
+
+	l_fp	tRecvTimestamp;		/* arrival timestamp */
+	int 	rc ;
+	char	sLogText [ MAX_LOGTEXT ] ;
+	int 	i, bCntrlChar ;
+
+	/*
+	 * Initialize pointers and read the timecode and timestamp
+	 */
+	peer = (struct peer *) rbufp->recv_srcclock ;
+	pp = peer->procptr ;
+	up = (struct jjyunit *) pp->unitptr ;
+
+	/*
+	 * Get next input line
+	 */
+	pp->lencode  = refclock_gtlin ( rbufp, pp->a_lastcode, BMAX, &tRecvTimestamp ) ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		/*
+		 * The reply with  and  may give a blank line
+		 */
+		if ( pp->lencode == 0  &&  up->charcount == 0 ) return ;
+		/*
+		 * Copy received charaters to temporary buffer 
+		 */
+		for ( i = 0 ; i < pp->lencode && up->charcount < MAX_RAWBUF - 2 ; i ++ , up->charcount ++ ) {
+			up->rawbuf[up->charcount] = pp->a_lastcode[i] ;
+		}
+		while ( up->charcount > 0 && up->rawbuf[0] < ' ' ) {
+			for ( i = 0 ; i < up->charcount - 1 ; i ++ ) up->rawbuf[i] = up->rawbuf[i+1] ;
+			up->charcount -- ;
+		}
+		bCntrlChar = 0 ;
+		for ( i = 0 ; i < up->charcount ; i ++ ) {
+			if ( up->rawbuf[i] < ' ' ) {
+				bCntrlChar = 1 ;
+				break ;
+			}
+		}
+		if ( pp->lencode > 0  &&  up->linecount < up->lineexpect ) {
+			if ( bCntrlChar == 0  &&  up->charcount < up->charexpect[up->linecount] ) return ;
+		}
+		up->rawbuf[up->charcount] = 0 ;
+	} else {
+		/*
+		 * The reply with  gives a blank line
+		 */
+		if ( pp->lencode == 0 ) return ;
+	}
+	/*
+	 * We get down to business
+	 */
+
+	pp->lastrec = tRecvTimestamp ;
+
+	up->linecount ++ ;
+
+	if ( up->lineerror != 0 ) return ;
+
+	switch ( up->unittype ) {
+	
+	case UNITTYPE_TRISTATE_JJY01 :
+		rc = jjy_receive_tristate_jjy01  ( rbufp ) ;
+		break ;
+
+	case UNITTYPE_CDEX_JST2000 :
+		rc = jjy_receive_cdex_jst2000 ( rbufp ) ;
+		break ;
+
+	default :
+		rc = 0 ;
+		break ;
+
+	}
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		if ( up->linecount <= up->lineexpect  &&  up->charcount > up->charexpect[up->linecount-1] ) {
+			for ( i = 0 ; i < up->charcount - up->charexpect[up->linecount-1] ; i ++ ) {
+				up->rawbuf[i] = up->rawbuf[i+up->charexpect[up->linecount-1]] ;
+			}
+			up->charcount -= up->charexpect[up->linecount-1] ;
+		} else {
+			up->charcount = 0 ;
+		}
+	}
+
+	if ( rc == 0 ) return ;
+
+	if ( up->lineerror != 0 ) {
+		refclock_report ( peer, CEVNT_BADREPLY ) ;
+		strcpy  ( sLogText, "BAD REPLY [" ) ;
+		if ( up->linediscipline == LDISC_RAW ) {
+			strncat ( sLogText, up->rawbuf, MAX_LOGTEXT - strlen ( sLogText ) - 1 ) ;
+		} else {
+			strncat ( sLogText, pp->a_lastcode, MAX_LOGTEXT - strlen ( sLogText ) - 1 ) ;
+		}
+		sLogText[MAX_LOGTEXT-1] = 0 ;
+		if ( strlen ( sLogText ) < MAX_LOGTEXT - 2 ) strcat ( sLogText, "]" ) ;
+		record_clock_stats ( &peer->srcadr, sLogText ) ;
+		return ;
+	}
+
+	pp->year   = up->year ;
+	pp->day    = ymd2yd ( up->year, up->month, up->day ) ;
+	pp->hour   = up->hour ;
+	pp->minute = up->minute ;
+	pp->second = up->second ;
+	pp->msec   = up->msecond ;
+	pp->usec   = 0;
+
+	/* 
+	 * JST to UTC 
+	 */
+	pp->hour -= 9 ;
+	if ( pp->hour < 0 ) {
+		pp->hour += 24 ;
+		pp->day -- ;
+		if ( pp->day < 1 ) {
+			pp->year -- ;
+			pp->day  = ymd2yd ( pp->year, 12, 31 ) ;
+		}
+	}
+#ifdef DEBUG
+	if ( debug ) {
+		printf ( "jjy_receive (refclock_jjy.c) : %04d/%02d/%02d %02d:%02d:%02d JST   ", 
+		          up->year, up->month, up->day, up->hour, up->minute, up->second ) ;
+		printf ( "( %04d/%03d %02d:%02d:%02d UTC )\n",
+		          pp->year, pp->day, pp->hour, pp->minute, pp->second ) ;
+	}
+#endif
+
+	/*
+	 * Process the new sample in the median filter and determine the
+	 * timecode timestamp.
+	 */
+	if ( ! refclock_process ( pp ) ) {
+		refclock_report(peer, CEVNT_BADTIME);
+		sprintf ( sLogText, "BAD TIME %04d/%02d/%02d %02d:%02d:%02d JST",
+		          up->year, up->month, up->day, up->hour, up->minute, up->second ) ;
+		record_clock_stats ( &peer->srcadr, sLogText ) ;
+		return ;
+	}
+
+	sprintf ( sLogText, "%04d/%02d/%02d %02d:%02d:%02d JST",
+	          up->year, up->month, up->day, up->hour, up->minute, up->second ) ;
+	record_clock_stats ( &peer->srcadr, sLogText ) ;
+
+	refclock_receive(peer);
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_tristate_jjy01 ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	struct peer         *peer;
+
+	char	*pBuf ;
+	int 	iLen ;
+	int 	rc ;
+
+	/*
+	 * Initialize pointers and read the timecode and timestamp
+	 */
+	peer = (struct peer *) rbufp->recv_srcclock ;
+	pp = peer->procptr ;
+	up = (struct jjyunit *) pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->rawbuf ;
+		iLen = up->charcount ;
+	} else {
+	    pBuf = pp->a_lastcode ;
+	    iLen = pp->lencode ;
+	}
+
+	switch ( up->linecount ) {
+
+	case 1 : /* YYYY/MM/DD */
+
+		if ( iLen < 10 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		rc = sscanf ( pBuf, "%4d/%2d/%2d", &up->year, &up->month, &up->day ) ;
+		if ( rc != 3 || up->year < 2000 || up->month < 1 || up->month > 12 || up->day < 1 || up->day > 31 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		return 0 ;
+
+	case 2 : /* HH:MM:SS */
+
+		if ( iLen < 8 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		rc = sscanf ( pBuf, "%2d:%2d:%2d", &up->hour, &up->minute, &up->second ) ;
+		if ( rc != 3 || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		up->msecond = 0 ;
+		if ( up->hour == 0 && up->minute == 0 && up->second <= 2 ) {
+			/*
+			 * The command "date" and "time" ( or "stim" ) were sent to the JJY receiver continuously.
+			 * But the JJY receiver replies a date and time separately.
+			 * Just after midnight transtions, we ignore this time.
+			 */
+			return 0 ;
+		}
+		break ;
+
+	default : /*  Unexpected reply */
+
+		up->lineerror = 1 ;
+		break ;
+
+	}
+
+	return 1 ;
+
+}
+
+/**************************************************************************************************/
+
+static int
+jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp )
+{
+
+	struct jjyunit      *up ;
+	struct refclockproc *pp ;
+	struct peer         *peer;
+
+	char	*pBuf ;
+	int 	iLen ;
+	int 	rc ;
+
+	/*
+	 * Initialize pointers and read the timecode and timestamp
+	 */
+	peer = (struct peer *) rbufp->recv_srcclock ;
+	pp = peer->procptr ;
+	up = (struct jjyunit *) pp->unitptr ;
+
+	if ( up->linediscipline == LDISC_RAW ) {
+		pBuf = up->rawbuf ;
+		iLen = up->charcount ;
+	} else {
+	    pBuf = pp->a_lastcode ;
+	    iLen = pp->lencode ;
+	}
+
+	switch ( up->linecount ) {
+
+	case 1 : /* JYYMMDD HHMMSSS */
+
+		if ( iLen < 15 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d",
+		              &up->year, &up->month, &up->day, &up->hour, &up->minute, &up->second, &up->msecond ) ;
+		if ( rc != 7 || up->month < 1 || up->month > 12 || up->day < 1 || up->day > 31
+		  || up->hour > 23 || up->minute > 59 || up->second > 60 ) {
+			up->lineerror = 1 ;
+			break ;
+		}
+		up->year    += 2000 ;
+		up->msecond *= 100 ;
+		break ;
+
+	default : /*  Unexpected reply */
+
+		up->lineerror = 1 ;
+		break ;
+
+	}
+
+	return 1 ;
+
+}
+
+/**************************************************************************************************/
+/*  jjy_poll - called by the transmit procedure                                                   */
+/**************************************************************************************************/
+static void
+jjy_poll ( int unit, struct peer *peer )
+{
+
+	struct jjyunit      *up;
+	struct refclockproc *pp;
+
+	pp = peer->procptr;
+	up = (struct jjyunit *) pp->unitptr ;
+
+	if ( pp->polls > 0  &&  up->linecount == 0 ) {
+		/*
+		 * No reply for last command
+		 */
+		refclock_report ( peer, CEVNT_TIMEOUT ) ;
+	}
+
+#ifdef DEBUG
+	if ( debug ) {
+		printf ( "jjy_poll (refclock_jjy.c) : %ld\n", pp->polls ) ;
+	}
+#endif
+
+	pp->polls ++ ;
+
+	up->linecount = 0 ;
+	up->lineerror = 0 ;
+	up->charcount = 0 ;
+
+	switch ( up->unittype ) {
+	
+	case UNITTYPE_TRISTATE_JJY01 :
+		jjy_poll_tristate_jjy01  ( unit, peer ) ;
+		break ;
+
+	case UNITTYPE_CDEX_JST2000 :
+		jjy_poll_cdex_jst2000 ( unit, peer ) ;
+		break ;
+
+	default :
+		break ;
+
+	}
+
+}
+
+/**************************************************************************************************/
+
+static void
+jjy_poll_tristate_jjy01  ( int unit, struct peer *peer )
+{
+
+	struct jjyunit      *up;
+	struct refclockproc *pp;
+
+	pp = peer->procptr;
+	up = (struct jjyunit *) pp->unitptr ;
+
+	/*
+	 * Send "date" command
+	 */
+
+	if ( write ( pp->io.fd, "date\r\n",6 ) != 6  ) {
+		refclock_report ( peer, CEVNT_FAULT ) ;
+	}
+
+	/*
+	 * Send "stim" or "time" command
+	 */
+
+	if ( up->version >= 100 ) {
+		if ( write ( pp->io.fd, "stim\r\n",6 ) != 6  ) {
+			refclock_report ( peer, CEVNT_FAULT ) ;
+		}
+	} else {
+		if ( write ( pp->io.fd, "time\r\n",6 ) != 6  ) {
+			refclock_report ( peer, CEVNT_FAULT ) ;
+		}
+	}
+
+}
+
+/**************************************************************************************************/
+
+static void
+jjy_poll_cdex_jst2000 ( int unit, struct peer *peer )
+{
+
+	struct refclockproc *pp;
+
+	pp = peer->procptr;
+
+	/*
+	 * Send "1J" command
+	 */
+
+	if ( write ( pp->io.fd, "\x051J\x03", 4 ) != 4  ) {
+		refclock_report ( peer, CEVNT_FAULT ) ;
+	}
+
+}
+
+#else
+int refclock_jjy_bs ;
+#endif /* REFCLOCK */
diff --git a/contrib/ntp/ntpd/refclock_local.c b/contrib/ntp/ntpd/refclock_local.c
index a3e5773..345a7a2 100644
--- a/contrib/ntp/ntpd/refclock_local.c
+++ b/contrib/ntp/ntpd/refclock_local.c
@@ -255,4 +255,6 @@ local_poll(
 	refclock_receive(peer);
 	pp->fudgetime1 = 0;
 }
+#else
+int refclock_local_bs;
 #endif /* REFCLOCK */
diff --git a/contrib/ntp/ntpd/refclock_oncore.c b/contrib/ntp/ntpd/refclock_oncore.c
index dbb9f5d..43a38fb 100644
--- a/contrib/ntp/ntpd/refclock_oncore.c
+++ b/contrib/ntp/ntpd/refclock_oncore.c
@@ -652,7 +652,7 @@ oncore_start(
 		exit(1);
 	}
 
-	if (pps_device) {
+	if (pps_device && pps_device[0]) {
 		if (stat(pps_device, &stat1)) {
 			perror("ONCORE: stat pps_device");
 			return(0);
diff --git a/contrib/ntp/ntpd/refclock_palisade.c b/contrib/ntp/ntpd/refclock_palisade.c
index d8ce411..4b36b78 100644
--- a/contrib/ntp/ntpd/refclock_palisade.c
+++ b/contrib/ntp/ntpd/refclock_palisade.c
@@ -878,4 +878,6 @@ getint (
 return (short) (bp[1] + (bp[0] << 8));
 }
 
+#else
+int refclock_palisade_bs;
 #endif /* REFCLOCK */
diff --git a/contrib/ntp/ntpd/refclock_true.c b/contrib/ntp/ntpd/refclock_true.c
index dcc362d..986031d 100644
--- a/contrib/ntp/ntpd/refclock_true.c
+++ b/contrib/ntp/ntpd/refclock_true.c
@@ -410,7 +410,7 @@ true_receive(
 			}
 		}
 		else {
-			refclock_report(peer, CEVNT_BADREPLY);
+			/*refclock_report(peer, CEVNT_BADREPLY);*/
 			label = "UNKNOWN";
 		}
 		true_debug(peer, "GOES: station %s\n", label);
diff --git a/contrib/ntp/ntpd/refclock_tt560.c b/contrib/ntp/ntpd/refclock_tt560.c
new file mode 100644
index 0000000..f3d7bc1
--- /dev/null
+++ b/contrib/ntp/ntpd/refclock_tt560.c
@@ -0,0 +1,274 @@
+/*
+ * refclock_tt560 - clock driver for the TrueTime 560 IRIG-B decoder
+ */
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#if defined(REFCLOCK) && defined(CLOCK_TT560)
+
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_refclock.h"
+#include "ntp_unixtime.h"
+#include "sys/tt560_api.h"
+#include "ntp_stdlib.h"
+
+#include 
+#include 
+
+/*
+ * This driver supports the TrueTime 560 IRIG-B decoder for the PCI bus.
+ */ 
+
+/*
+ * TT560 interface definitions
+ */
+#define	DEVICE		 "/dev/tt560%d" /* device name and unit */
+#define	PRECISION	(-20)	/* precision assumed (1 us) */
+#define	REFID		"IRIG"	/* reference ID */
+#define	DESCRIPTION	"TrueTime 560 IRIG-B PCI Decoder"
+
+/*
+ * Unit control structure
+ */
+struct tt560unit {
+	tt_mem_space_t	 *tt_mem;	/* mapped address of PCI board */
+	time_freeze_reg_t tt560rawt;	/* data returned from PCI board */
+};
+
+typedef union byteswap_u
+{
+    unsigned int long_word;
+    unsigned char byte[4];
+} byteswap_t;
+
+/*
+ * Function prototypes
+ */
+static	int	tt560_start	P((int, struct peer *));
+static	void	tt560_shutdown	P((int, struct peer *));
+static	void	tt560_poll	P((int unit, struct peer *));
+
+/*
+ * Transfer vector
+ */
+struct	refclock refclock_tt560 = {
+	tt560_start,		/* clock_start    */
+	tt560_shutdown,		/* clock_shutdown */
+	tt560_poll,		/* clock_poll     */
+	noentry,		/* clock_control (not used) */
+	noentry,		/* clock_init    (not used) */
+	noentry,		/* clock_buginfo (not used) */
+	NOFLAGS			/* clock_flags   (not used) */
+};
+
+
+/*
+ * tt560_start - open the TT560 device and initialize data for processing
+ */
+static int
+tt560_start(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct tt560unit *up;
+	struct refclockproc *pp;
+	char device[20];
+	int     fd;
+        caddr_t membase;
+
+	/*
+	 * Open TT560 device
+	 */
+	(void)sprintf(device, DEVICE, unit);
+	fd = open(device, O_RDWR);
+	if (fd == -1) {
+		msyslog(LOG_ERR, "tt560_start: open of %s: %m", device);
+		return (0);
+	}
+
+	/*
+	 * Map the device registers into user space.
+	 */
+	membase = mmap ((caddr_t) 0, TTIME_MEMORY_SIZE,
+			PROT_READ | PROT_WRITE,
+			MAP_SHARED, fd, (off_t)0);
+
+	if (membase == (caddr_t) -1) {
+		msyslog(LOG_ERR, "tt560_start: mapping of %s: %m", device);
+		(void) close(fd);
+		return (0);
+	}
+
+	/*
+	 * Allocate and initialize unit structure
+	 */
+	if (!(up = (struct tt560unit *) emalloc(sizeof(struct tt560unit)))) {
+		(void) close(fd);
+		return (0);
+	}
+	memset((char *)up, 0, sizeof(struct tt560unit));
+	up->tt_mem = (tt_mem_space_t *)membase;
+	pp = peer->procptr;
+	pp->io.clock_recv = noentry;
+	pp->io.srcclock = (caddr_t)peer;
+	pp->io.datalen = 0;
+	pp->io.fd = fd;
+	pp->unitptr = (caddr_t)up;
+
+	/*
+	 * Initialize miscellaneous peer variables
+	 */
+	peer->precision = PRECISION;
+	peer->burst = NSTAGE;
+	pp->clockdesc = DESCRIPTION;
+	memcpy((char *)&pp->refid, REFID, 4);
+	return (1);
+}
+
+
+/*
+ * tt560_shutdown - shut down the clock
+ */
+static void
+tt560_shutdown(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct tt560unit *up;
+	struct refclockproc *pp;
+
+	pp = peer->procptr;
+	up = (struct tt560unit *)pp->unitptr;
+	io_closeclock(&pp->io);
+	free(up);
+}
+
+
+/*
+ * tt560_poll - called by the transmit procedure
+ */
+static void
+tt560_poll(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct tt560unit *up;
+	struct refclockproc       *pp;
+	time_freeze_reg_t         *tp;
+	tt_mem_space_t            *mp;
+
+	int i;
+	unsigned int *p_time_t, *tt_mem_t;
+
+	/*
+	 * This is the main routine. It snatches the time from the TT560
+	 * board and tacks on a local timestamp.
+	 */
+	pp = peer->procptr;
+	up = (struct tt560unit *)pp->unitptr;
+	mp = up->tt_mem;
+	tp = &up->tt560rawt;
+
+	p_time_t = (unsigned int *)tp;
+	tt_mem_t = (unsigned int *)&mp->time_freeze_reg;
+
+	*tt_mem_t = 0;		/* update the time freeze register */
+				/* and copy time stamp to memory */
+	for (i=0; i < TIME_FREEZE_REG_LEN; i++) {
+	    *p_time_t = byte_swap(*tt_mem_t);
+	     p_time_t++;
+	     tt_mem_t++;
+	}
+
+	get_systime(&pp->lastrec);
+	pp->polls++;
+
+	/*
+	 * We get down to business, check the timecode format and decode
+	 * its contents. If the timecode has invalid length or is not in
+	 * proper format, we declare bad format and exit. Note: we
+	 * can't use the sec/usec conversion produced by the driver,
+	 * since the year may be suspect. All format error checking is
+	 * done by the sprintf() and sscanf() routines.
+	 */
+	sprintf(pp->a_lastcode,
+	    "%1x%1x%1x %1x%1x:%1x%1x:%1x%1x.%1x%1x%1x%1x%1x%1x %1x",
+	    tp->hun_day,  tp->tens_day,  tp->unit_day,
+	                  tp->tens_hour, tp->unit_hour,
+	                  tp->tens_min,  tp->unit_min,
+	                  tp->tens_sec,  tp->unit_sec,
+	    tp->hun_ms,   tp->tens_ms,   tp->unit_ms,
+	    tp->hun_us,   tp->tens_us,   tp->unit_us,
+	    tp->status);
+	    pp->lencode = strlen(pp->a_lastcode);
+#ifdef DEBUG
+	if (debug)
+		printf("tt560: time %s timecode %d %s\n",
+		   ulfptoa(&pp->lastrec, 6), pp->lencode,
+		   pp->a_lastcode);
+#endif
+	if (sscanf(pp->a_lastcode, "%3d %2d:%2d:%2d.%6ld", 
+                  &pp->day, &pp->hour, &pp->minute, &pp->second, &pp->usec)
+	    != 5) {
+		refclock_report(peer, CEVNT_BADTIME);
+		return;
+	}
+	if ((tp->status & 0x6) != 0x6)
+		pp->leap = LEAP_NOTINSYNC;
+	else
+		pp->leap = LEAP_NOWARNING;
+	if (!refclock_process(pp)) {
+		refclock_report(peer, CEVNT_BADTIME);
+		return;
+	}
+	if (peer->burst > 0)
+		return;
+	if (pp->coderecv == pp->codeproc) {
+		refclock_report(peer, CEVNT_TIMEOUT);
+		return;
+	}
+	record_clock_stats(&peer->srcadr, pp->a_lastcode);
+	refclock_receive(peer);
+	peer->burst = NSTAGE;
+}
+
+/******************************************************************
+ *
+ *  byte_swap
+ *
+ *  Inputs: 32 bit integer
+ *
+ *  Output: byte swapped 32 bit integer.
+ *
+ *  This routine is used to compensate for the byte alignment
+ *  differences between big-endian and little-endian integers.
+ *
+ ******************************************************************/
+static unsigned int
+byte_swap(unsigned int input_num)
+{
+    byteswap_t    byte_swap;
+    unsigned char temp;
+
+    byte_swap.long_word = input_num;
+
+    temp              = byte_swap.byte[3];
+    byte_swap.byte[3] = byte_swap.byte[0];
+    byte_swap.byte[0] = temp;
+
+    temp              = byte_swap.byte[2];
+    byte_swap.byte[2] = byte_swap.byte[1];
+    byte_swap.byte[1] = temp;
+
+    return (byte_swap.long_word);
+}
+
+#else
+int refclock_tt560_bs;
+#endif /* REFCLOCK */
diff --git a/contrib/ntp/ntpd/refclock_zyfer.c b/contrib/ntp/ntpd/refclock_zyfer.c
new file mode 100644
index 0000000..b622931
--- /dev/null
+++ b/contrib/ntp/ntpd/refclock_zyfer.c
@@ -0,0 +1,346 @@
+/*
+ * refclock_zyfer - clock driver for the Zyfer GPSTarplus Clock
+ *
+ * Harlan Stenn, Jan 2002
+ */
+
+#ifdef HAVE_CONFIG_H
+#include 
+#endif
+
+#if defined(REFCLOCK) && defined(CLOCK_ZYFER)
+
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_refclock.h"
+#include "ntp_stdlib.h"
+#include "ntp_unixtime.h"
+
+#include 
+#include 
+
+#ifdef HAVE_SYS_TERMIOS_H
+# include 
+#endif
+#ifdef HAVE_SYS_PPSCLOCK_H
+# include 
+#endif
+
+/*
+ * This driver provides support for the TOD serial port of a Zyfer GPStarplus.
+ * This clock also provides PPS as well as IRIG outputs.
+ * Precision is limited by the serial driver, etc.
+ *
+ * If I was really brave I'd hack/generalize the serial driver to deal
+ * with arbitrary on-time characters.  This clock *begins* the stream with
+ * `!`, the on-time character, and the string is *not* EOL-terminated.
+ *
+ * Configure the beast for 9600, 8N1.  While I see leap-second stuff
+ * in the documentation, the published specs on the TOD format only show
+ * the seconds going to '59'.  I see no leap warning in the TOD format.
+ *
+ * The clock sends the following message once per second:
+ *
+ *	!TIME,2002,017,07,59,32,2,4,1
+ *	      YYYY DDD HH MM SS m T O
+ *
+ *	!		On-time character
+ *	YYYY		Year
+ *	DDD	001-366	Day of Year
+ *	HH	00-23	Hour
+ *	MM	00-59	Minute
+ *	SS	00-59	Second (probably 00-60)
+ *	m	1-5	Time Mode:
+ *			1 = GPS time
+ *			2 = UTC time
+ *			3 = LGPS time (Local GPS)
+ *			4 = LUTC time (Local UTC)
+ *			5 = Manual time
+ *	T	4-9	Time Figure Of Merit:
+ *			4         x <= 1us
+ *			5   1us < x <= 10 us
+ *			6  10us < x <= 100us
+ *			7 100us < x <= 1ms
+ *			8   1ms < x <= 10ms
+ *			9  10ms < x
+ *	O	0-4	Operation Mode:
+ *			0 Warm-up
+ *			1 Time Locked
+ *			2 Coasting
+ *			3 Recovering
+ *			4 Manual
+ *
+ */
+
+/*
+ * Interface definitions
+ */
+#define	DEVICE		"/dev/zyfer%d" /* device name and unit */
+#define	SPEED232	B9600	/* uart speed (9600 baud) */
+#define	PRECISION	(-20)	/* precision assumed (about 1 us) */
+#define	REFID		"GPS\0"	/* reference ID */
+#define	DESCRIPTION	"Zyfer GPStarplus" /* WRU */
+
+#define	LENZYFER	29	/* timecode length */
+
+/*
+ * Unit control structure
+ */
+struct zyferunit {
+	u_char	Rcvbuf[LENZYFER + 1];
+	u_char	polled;		/* poll message flag */
+	int	pollcnt;
+	l_fp    tstamp;         /* timestamp of last poll */
+	int	Rcvptr;
+};
+
+/*
+ * Function prototypes
+ */
+static	int	zyfer_start	P((int, struct peer *));
+static	void	zyfer_shutdown	P((int, struct peer *));
+static	void	zyfer_receive	P((struct recvbuf *));
+static	void	zyfer_poll	P((int, struct peer *));
+
+/*
+ * Transfer vector
+ */
+struct	refclock refclock_zyfer = {
+	zyfer_start,		/* start up driver */
+	zyfer_shutdown,		/* shut down driver */
+	zyfer_poll,		/* transmit poll message */
+	noentry,		/* not used (old zyfer_control) */
+	noentry,		/* initialize driver (not used) */
+	noentry,		/* not used (old zyfer_buginfo) */
+	NOFLAGS			/* not used */
+};
+
+
+/*
+ * zyfer_start - open the devices and initialize data for processing
+ */
+static int
+zyfer_start(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct zyferunit *up;
+	struct refclockproc *pp;
+	int fd;
+	char device[20];
+
+	/*
+	 * Open serial port.
+	 * Something like LDISC_ACTS that looked for ! would be nice...
+	 */
+	(void)sprintf(device, DEVICE, unit);
+	if ( !(fd = refclock_open(device, SPEED232, LDISC_RAW)) )
+	    return (0);
+
+	msyslog(LOG_NOTICE, "zyfer(%d) fd: %d dev <%s>", unit, fd, device);
+
+	/*
+	 * Allocate and initialize unit structure
+	 */
+	if (!(up = (struct zyferunit *)
+	      emalloc(sizeof(struct zyferunit)))) {
+		(void) close(fd);
+		return (0);
+	}
+	memset((char *)up, 0, sizeof(struct zyferunit));
+	pp = peer->procptr;
+	pp->io.clock_recv = zyfer_receive;
+	pp->io.srcclock = (caddr_t)peer;
+	pp->io.datalen = 0;
+	pp->io.fd = fd;
+	if (!io_addclock(&pp->io)) {
+		(void) close(fd);
+		free(up);
+		return (0);
+	}
+	pp->unitptr = (caddr_t)up;
+
+	/*
+	 * Initialize miscellaneous variables
+	 */
+	peer->precision = PRECISION;
+	pp->clockdesc = DESCRIPTION;
+	memcpy((char *)&pp->refid, REFID, 4);
+	up->pollcnt = 2;
+	up->polled = 0;		/* May not be needed... */
+
+	return (1);
+}
+
+
+/*
+ * zyfer_shutdown - shut down the clock
+ */
+static void
+zyfer_shutdown(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct zyferunit *up;
+	struct refclockproc *pp;
+
+	pp = peer->procptr;
+	up = (struct zyferunit *)pp->unitptr;
+	io_closeclock(&pp->io);
+	free(up);
+}
+
+
+/*
+ * zyfer_receive - receive data from the serial interface
+ */
+static void
+zyfer_receive(
+	struct recvbuf *rbufp
+	)
+{
+	register struct zyferunit *up;
+	struct refclockproc *pp;
+	struct peer *peer;
+	int tmode;		/* Time mode */
+	int tfom;		/* Time Figure Of Merit */
+	int omode;		/* Operation mode */
+	u_char *p;
+#ifdef PPS
+	struct ppsclockev ppsev;
+	int request;
+#ifdef HAVE_CIOGETEV
+        request = CIOGETEV;
+#endif
+#ifdef HAVE_TIOCGPPSEV
+        request = TIOCGPPSEV;
+#endif
+#endif /* PPS */
+
+	peer = (struct peer *)rbufp->recv_srcclock;
+	pp = peer->procptr;
+	up = (struct zyferunit *)pp->unitptr;
+	p = (u_char *) &rbufp->recv_space;
+	/*
+	 * If lencode is 0:
+	 * - if *rbufp->recv_space is !
+	 * - - call refclock_gtlin to get things going
+	 * - else flush
+	 * else stuff it on the end of lastcode
+	 * If we don't have LENZYFER bytes
+	 * - wait for more data
+	 * Crack the beast, and if it's OK, process it.
+	 *
+	 * We use refclock_getlin() because we might use LDISC_CLK.
+	 *
+	 * Under FreeBSD, we get the ! followed by two 14-byte packets.
+	 */
+
+	if (pp->lencode >= LENZYFER)
+		pp->lencode = 0;
+
+	if (!pp->lencode) {
+		if (*p == '!')
+			pp->lencode = refclock_gtlin(rbufp, pp->a_lastcode,
+						     BMAX, &pp->lastrec);
+		else
+			return;
+	} else {
+		memcpy(pp->a_lastcode + pp->lencode, p, rbufp->recv_length);
+		pp->lencode += rbufp->recv_length;
+		pp->a_lastcode[pp->lencode] = '\0';
+	}
+
+	if (pp->lencode < LENZYFER)
+		return;
+
+	record_clock_stats(&peer->srcadr, pp->a_lastcode);
+
+	/*
+	 * We get down to business, check the timecode format and decode
+	 * its contents. If the timecode has invalid length or is not in
+	 * proper format, we declare bad format and exit.
+	 */
+
+	if (pp->lencode != LENZYFER) {
+		refclock_report(peer, CEVNT_BADTIME);
+		return;
+	}
+
+	/*
+	 * Timecode sample: "!TIME,2002,017,07,59,32,2,4,1"
+	 */
+	if (sscanf(pp->a_lastcode, "!TIME,%4d,%3d,%2d,%2d,%2d,%d,%d,%d",
+		   &pp->year, &pp->day, &pp->hour, &pp->minute, &pp->second,
+		   &tmode, &tfom, &omode) != 8) {
+		refclock_report(peer, CEVNT_BADREPLY);
+		return;
+	}
+
+	if (tmode != 2) {
+		refclock_report(peer, CEVNT_BADTIME);
+		return;
+	}
+
+	/* Should we make sure tfom is 4? */
+
+	if (omode != 1) {
+		pp->leap = LEAP_NOTINSYNC;
+		return;
+	}
+#ifdef PPS
+	if(ioctl(fdpps,request,(caddr_t) &ppsev) >=0) {
+		ppsev.tv.tv_sec += (u_int32) JAN_1970;
+		TVTOTS(&ppsev.tv,&up->tstamp);
+	}
+	/* record the last ppsclock event time stamp */
+	pp->lastrec = up->tstamp;
+#endif /* PPS */
+	if (!refclock_process(pp)) {
+		refclock_report(peer, CEVNT_BADTIME);
+		return;
+        }
+
+	/*
+	 * Good place for record_clock_stats()
+	 */
+	up->pollcnt = 2;
+
+	if (up->polled) {
+		up->polled = 0;
+		refclock_receive(peer);
+	}
+}
+
+
+/*
+ * zyfer_poll - called by the transmit procedure
+ */
+static void
+zyfer_poll(
+	int unit,
+	struct peer *peer
+	)
+{
+	register struct zyferunit *up;
+	struct refclockproc *pp;
+
+	/*
+	 * We don't really do anything here, except arm the receiving
+	 * side to capture a sample and check for timeouts.
+	 */
+	pp = peer->procptr;
+	up = (struct zyferunit *)pp->unitptr;
+	if (!up->pollcnt)
+		refclock_report(peer, CEVNT_TIMEOUT);
+	else
+		up->pollcnt--;
+	pp->polls++;
+	up->polled = 1;
+}
+
+#else
+int refclock_zyfer_bs;
+#endif /* REFCLOCK */
diff --git a/contrib/ntp/ntpdate/Makefile.am b/contrib/ntp/ntpdate/Makefile.am
index ea55108..f4152b0 100644
--- a/contrib/ntp/ntpdate/Makefile.am
+++ b/contrib/ntp/ntpdate/Makefile.am
@@ -16,5 +16,5 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpdate
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
 	$(COMPILE) -c version.c
diff --git a/contrib/ntp/ntpdate/Makefile.in b/contrib/ntp/ntpdate/Makefile.in
index f66e351..f215cde 100644
--- a/contrib/ntp/ntpdate/Makefile.in
+++ b/contrib/ntp/ntpdate/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpdate ntptimeset
 ntptimeset_SOURCES = ntptimeset.c ntptime_config.c
@@ -127,8 +121,6 @@ DISTCLEANFILES = .version version.c stamp-v
 noinst_HEADERS = ntpdate.h
 #EXTRA_DIST = ntpdate.mak
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = ntpdate
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -136,46 +128,45 @@ CONFIG_CLEAN_FILES =
 bin_PROGRAMS = ntpdate$(EXEEXT) ntptimeset$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 ntpdate_SOURCES = ntpdate.c
 ntpdate_OBJECTS = ntpdate$U.$(OBJEXT)
 ntpdate_LDADD = $(LDADD)
 ntpdate_DEPENDENCIES = version.o ../libntp/libntp.a
-ntpdate_LDFLAGS = 
+ntpdate_LDFLAGS =
 am_ntptimeset_OBJECTS = ntptimeset$U.$(OBJEXT) \
-ntptime_config$U.$(OBJEXT)
+	ntptime_config$U.$(OBJEXT)
 ntptimeset_OBJECTS = $(am_ntptimeset_OBJECTS)
 ntptimeset_LDADD = $(LDADD)
 ntptimeset_DEPENDENCIES = version.o ../libntp/libntp.a
-ntptimeset_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ntptimeset_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntpdate$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntptime_config$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntptimeset$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = ntpdate.c $(ntptimeset_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/ntpdate$U.Po $(DEPDIR)/ntptime_config$U.Po \
-@AMDEP@ $(DEPDIR)/ntptimeset$U.Po
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 SOURCES = ntpdate.c $(ntptimeset_SOURCES)
-OBJECTS = ntpdate$U.$(OBJEXT) $(am_ntptimeset_OBJECTS)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ntpdate/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -183,8 +174,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -200,37 +193,54 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ntpdate$(EXEEXT): $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES) 
+	@rm -f ntpdate$(EXEEXT)
+	$(LINK) $(ntpdate_LDFLAGS) $(ntpdate_OBJECTS) $(ntpdate_LDADD) $(LIBS)
+ntptimeset$(EXEEXT): $(ntptimeset_OBJECTS) $(ntptimeset_DEPENDENCIES) 
+	@rm -f ntptimeset$(EXEEXT)
+	$(LINK) $(ntptimeset_LDFLAGS) $(ntptimeset_OBJECTS) $(ntptimeset_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-ntpdate: $(ntpdate_OBJECTS) $(ntpdate_DEPENDENCIES)
-	@rm -f ntpdate
-	$(LINK) $(ntpdate_LDFLAGS) $(ntpdate_OBJECTS) $(ntpdate_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdate$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntptime_config$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntptimeset$U.Po@am__quote@
 
-ntptimeset: $(ntptimeset_OBJECTS) $(ntptimeset_DEPENDENCIES)
-	@rm -f ntptimeset
-	$(LINK) $(ntptimeset_LDFLAGS) $(ntptimeset_OBJECTS) $(ntptimeset_LDADD) $(LIBS)
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 ntpdate_.c: ntpdate.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdate.c; then echo $(srcdir)/ntpdate.c; else echo ntpdate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdate_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdate.c; then echo $(srcdir)/ntpdate.c; else echo ntpdate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdate_.c || rm -f ntpdate_.c
 ntptime_config_.c: ntptime_config.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptime_config.c; then echo $(srcdir)/ntptime_config.c; else echo ntptime_config.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptime_config_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptime_config.c; then echo $(srcdir)/ntptime_config.c; else echo ntptime_config.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptime_config_.c || rm -f ntptime_config_.c
 ntptimeset_.c: ntptimeset.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptimeset.c; then echo $(srcdir)/ntptimeset.c; else echo ntptimeset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptimeset_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptimeset.c; then echo $(srcdir)/ntptimeset.c; else echo ntptimeset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptimeset_.c || rm -f ntptimeset_.c
 ntpdate_.$(OBJEXT) ntptime_config_.$(OBJEXT) ntptimeset_.$(OBJEXT) : \
 $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -243,7 +253,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -259,32 +269,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/ntpdate$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntptime_config$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntptimeset$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -293,7 +281,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -319,24 +311,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -346,11 +335,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -358,7 +347,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -372,17 +361,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
-	uninstall uninstall-am uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 $(PROGRAMS): $(LDADD)
@@ -391,9 +381,8 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpdate
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
 	$(COMPILE) -c version.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/ntpdate/ntpdate.c b/contrib/ntp/ntpdate/ntpdate.c
index b01d539..db82375 100644
--- a/contrib/ntp/ntpdate/ntpdate.c
+++ b/contrib/ntp/ntpdate/ntpdate.c
@@ -10,6 +10,7 @@
 #include 
 #endif
 
+#include "ntp_machine.h"
 #include "ntp_fp.h"
 #include "ntp.h"
 #include "ntp_io.h"
@@ -32,7 +33,11 @@
 #endif
 #ifndef SYS_WINNT
 # include 
-# include 
+# ifdef HAVE_SYS_SIGNAL_H
+#  include 
+# else
+#  include 
+# endif
 # ifdef HAVE_SYS_IOCTL_H
 #  include 
 # endif
@@ -423,7 +428,7 @@ ntpdatemain (
 	
 	if (errflg) {
 		(void) fprintf(stderr,
-				   "usage: %s [-bBdqsv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
+				   "usage: %s [-bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
 				   progname);
 		exit(2);
 	}
@@ -735,7 +740,7 @@ receive(
 	register struct pkt *rpkt;
 	register struct server *server;
 	register s_fp di;
-	l_fp t10, t23;
+	l_fp t10, t23, tmp;
 	l_fp org;
 	l_fp rec;
 	l_fp ci;
@@ -857,9 +862,15 @@ receive(
 	L_SUB(&t23, &org);		/* pkt->org == t3 */
 
 	/* now have (t2 - t3) and (t0 - t1).	Calculate (ci) and (di) */
+	/*
+	 * Calculate (ci) = ((t1 - t0) / 2) + ((t2 - t3) / 2)
+	 * For large offsets this may prevent an overflow on '+'
+	 */
 	ci = t10;
-	L_ADD(&ci, &t23);
 	L_RSHIFT(&ci);
+	tmp = t23;
+	L_RSHIFT(&tmp);
+	L_ADD(&ci, &tmp);
 
 	/*
 	 * Calculate di in t23 in full precision, then truncate
@@ -1015,23 +1026,44 @@ clock_select(void)
 	 */
 	nlist = 0;	/* none yet */
 	for (server = sys_servers; server != NULL; server = server->next_server) {
-		if (server->delay == 0)
-			continue;	/* no data */
-		if (server->stratum > NTP_INFIN)
-			continue;	/* stratum no good */
+		if (server->delay == 0) {
+			if (debug)
+				printf("%s: Server dropped: no data\n", ntoa(&server->srcadr));
+			continue;   /* no data */
+		}
+		if (server->stratum > NTP_INFIN) {
+			if (debug)
+				printf("%s: Server dropped: strata too high\n", ntoa(&server->srcadr));
+			continue;   /* stratum no good */
+		}
 		if (server->delay > NTP_MAXWGT) {
-			continue;	/* too far away */
+			if (debug)
+				printf("%s: Server dropped: server too far away\n", 
+				       ntoa(&server->srcadr));
+			continue;   /* too far away */
+		}
+		if (server->leap == LEAP_NOTINSYNC) {
+			if (debug)
+				printf("%s: Server dropped: Leap not in sync\n", ntoa(&server->srcadr));
+			continue;   /* he's in trouble */
 		}
-		if (server->leap == LEAP_NOTINSYNC)
-			continue;	/* he's in trouble */
 		if (!L_ISHIS(&server->org, &server->reftime)) {
-			continue;	/* very broken host */
+			if (debug)
+				printf("%s: Server dropped: server is very broken\n", 
+				       ntoa(&server->srcadr));
+			continue;   /* very broken host */
 		}
 		if ((server->org.l_ui - server->reftime.l_ui)
-			>= NTP_MAXAGE) {
+		    >= NTP_MAXAGE) {
+			if (debug)
+				printf("%s: Server dropped: Server has gone too long without sync\n", 
+				       ntoa(&server->srcadr));
 			continue;	/* too long without sync */
 		}
 		if (server->trust != 0) {
+			if (debug)
+				printf("%s: Server dropped: Server is untrusted\n",
+				       ntoa(&server->srcadr));
 			continue;
 		}
 
diff --git a/contrib/ntp/ntpdate/ntptimeset.c b/contrib/ntp/ntpdate/ntptimeset.c
index 95b70b6..6d9332f 100644
--- a/contrib/ntp/ntpdate/ntptimeset.c
+++ b/contrib/ntp/ntpdate/ntptimeset.c
@@ -121,6 +121,7 @@
 # include 
 #endif
 
+#include "ntp_machine.h"
 #include "ntp_fp.h"
 #include "ntp.h"
 #include "ntp_io.h"
@@ -141,7 +142,11 @@
 #include 
 #ifndef SYS_WINNT
 # include 
-# include 
+# ifdef HAVE_SYS_SIGNAL_H
+#  include 
+# else
+#  include 
+# endif
 # include 
 #endif /* SYS_WINNT */
 
diff --git a/contrib/ntp/ntpdc/Makefile.am b/contrib/ntp/ntpdc/Makefile.am
index 19e9cfa..ba0626f 100644
--- a/contrib/ntp/ntpdc/Makefile.am
+++ b/contrib/ntp/ntpdc/Makefile.am
@@ -17,5 +17,5 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpdc
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
 	$(COMPILE) -c version.c
diff --git a/contrib/ntp/ntpdc/Makefile.in b/contrib/ntp/ntpdc/Makefile.in
index ce9683a..4c722e3 100644
--- a/contrib/ntp/ntpdc/Makefile.in
+++ b/contrib/ntp/ntpdc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpdc
 INCLUDES = -I$(top_srcdir)/include
@@ -128,8 +122,6 @@ noinst_HEADERS = ntpdc.h
 ETAGS_ARGS = Makefile.am
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c
-EXEEXT =
-OBJEXT = o
 subdir = ntpdc
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -137,39 +129,37 @@ CONFIG_CLEAN_FILES =
 bin_PROGRAMS = ntpdc$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 am_ntpdc_OBJECTS = ntpdc$U.$(OBJEXT) ntpdc_ops$U.$(OBJEXT)
 ntpdc_OBJECTS = $(am_ntpdc_OBJECTS)
 ntpdc_LDADD = $(LDADD)
 ntpdc_DEPENDENCIES = version.o ../libntp/libntp.a
-ntpdc_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ntpdc_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntpdc$U.Po $(DEPDIR)/ntpdc_ops$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(ntpdc_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/ntpdc$U.Po $(DEPDIR)/ntpdc_ops$U.Po
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 SOURCES = $(ntpdc_SOURCES)
-OBJECTS = $(am_ntpdc_OBJECTS)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ntpdc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -177,8 +167,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -194,30 +186,47 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ntpdc$(EXEEXT): $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) 
+	@rm -f ntpdc$(EXEEXT)
+	$(LINK) $(ntpdc_LDFLAGS) $(ntpdc_OBJECTS) $(ntpdc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-ntpdc: $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES)
-	@rm -f ntpdc
-	$(LINK) $(ntpdc_LDFLAGS) $(ntpdc_OBJECTS) $(ntpdc_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc_ops$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 ntpdc_.c: ntpdc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_.c || rm -f ntpdc_.c
 ntpdc_ops_.c: ntpdc_ops.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_ops_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_ops_.c || rm -f ntpdc_ops_.c
 ntpdc_.$(OBJEXT) ntpdc_ops_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -230,7 +239,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -246,31 +255,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/ntpdc$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntpdc_ops$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -279,7 +267,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -305,24 +297,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -332,11 +321,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -344,7 +333,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -358,17 +347,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
-	uninstall uninstall-am uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 $(PROGRAMS): $(LDADD)
@@ -377,9 +367,8 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpdc
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
 	$(COMPILE) -c version.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/ntpdc/ntpdc.c b/contrib/ntp/ntpdc/ntpdc.c
index 09ba633..6086dae 100644
--- a/contrib/ntp/ntpdc/ntpdc.c
+++ b/contrib/ntp/ntpdc/ntpdc.c
@@ -192,6 +192,11 @@ static	char *pktdata;
 static	int pktdatasize;
 
 /*
+ * These are used to help the magic with old and new versions of ntpd.
+ */
+static int req_pkt_size = REQ_LEN_NOMAC;
+
+/*
  * For commands typed on the command line (with the -c option)
  */
 static	int numcmds = 0;
@@ -474,6 +479,7 @@ openhost(
 	    error("connect", "", "");
 	
 	havehost = 1;
+	req_pkt_size = REQ_LEN_NOMAC;
 	return 1;
 }
 
@@ -770,11 +776,15 @@ sendrequest(
 
 	if (!auth) {
 		qpkt.auth_seq = AUTH_SEQ(0, 0);
-		return sendpkt((char *)&qpkt, REQ_LEN_NOMAC);
+		return sendpkt((char *)&qpkt, req_pkt_size);
 	} else {
 		l_fp ts;
 		int maclen = 0;
 		const char *pass = "\0";
+		struct req_pkt_tail *qpktail;
+
+		qpktail = (struct req_pkt_tail *)((char *)&qpkt + req_pkt_size
+		    + MAX_MAC_LEN - sizeof(struct req_pkt_tail));
 
 		if (info_auth_keyid == 0) {
 			maclen = getkeyid("Keyid: ");
@@ -797,17 +807,17 @@ sendrequest(
 		authusekey(info_auth_keyid, info_auth_keytype, (const u_char *)pass);
 		authtrust(info_auth_keyid, 1);
 		qpkt.auth_seq = AUTH_SEQ(1, 0);
-		qpkt.keyid = htonl(info_auth_keyid);
+		qpktail->keyid = htonl(info_auth_keyid);
 		get_systime(&ts);
 		L_ADD(&ts, &delay_time);
-		HTONL_FP(&ts, &qpkt.tstamp);
+		HTONL_FP(&ts, &qpktail->tstamp);
 		maclen = authencrypt(info_auth_keyid, (u_int32 *)&qpkt,
-		    REQ_LEN_NOMAC);
+		    req_pkt_size);
 		if (maclen == 0) {  
 			(void) fprintf(stderr, "Key not found\n");
 			return (1);
 		}
-		return sendpkt((char *)&qpkt, (int)(REQ_LEN_NOMAC + maclen));
+		return sendpkt((char *)&qpkt, (int)(req_pkt_size + maclen));
 	}
 	/*NOTREACHED*/
 }
@@ -846,6 +856,7 @@ doquery(
 	/*
 	 * Poll the socket and clear out any pending data
 	 */
+again:
 	do {
 		tvzero.tv_sec = tvzero.tv_usec = 0;
 		FD_ZERO(&fds);
@@ -873,6 +884,26 @@ doquery(
 	 */
 	res = getresponse(implcode, reqcode, ritems, rsize, rdata);
 
+	/*
+	 * Try to be compatible with older implementations of ntpd.
+	 */
+	if (res == INFO_ERR_FMT && req_pkt_size != 48) {
+		int oldsize;
+
+		oldsize = req_pkt_size;
+
+		switch(req_pkt_size) {
+		case REQ_LEN_NOMAC:
+			req_pkt_size = 48;
+			break;
+		}
+
+		fprintf(stderr,
+		    "***Warning changing the request packet size from %d to %d\n",
+		    oldsize, req_pkt_size);
+		goto again;
+	}
+
  	/* log error message if not told to be quiet */
  	if ((res > 0) && (((1 << res) & quiet_mask) == 0)) {
 		switch(res) {
diff --git a/contrib/ntp/ntpdc/ntpdc_ops.c b/contrib/ntp/ntpdc/ntpdc_ops.c
index 0661d53..b163401 100644
--- a/contrib/ntp/ntpdc/ntpdc_ops.c
+++ b/contrib/ntp/ntpdc/ntpdc_ops.c
@@ -786,7 +786,7 @@ sysinfo(
 
 	(void) fprintf(fp, "system flags:         ");
 	if ((is->flags & (INFO_FLAG_BCLIENT | INFO_FLAG_AUTHENABLE |
-	    INFO_FLAG_NTP | INFO_FLAG_KERNEL| INFO_FLAG_PLL_SYNC |
+	    INFO_FLAG_NTP | INFO_FLAG_KERNEL| INFO_FLAG_CAL |
 	    INFO_FLAG_PPS_SYNC | INFO_FLAG_MONITOR | INFO_FLAG_FILEGEN)) == 0) {
 		(void) fprintf(fp, "none\n");
 	} else {
@@ -802,10 +802,10 @@ sysinfo(
 		    (void) fprintf(fp, "kernel ");
 		if (is->flags & INFO_FLAG_FILEGEN)
 		    (void) fprintf(fp, "stats ");
-		if (is->flags & INFO_FLAG_PLL_SYNC)
-		    (void) fprintf(fp, "kernel_sync ");
+		if (is->flags & INFO_FLAG_CAL)
+		    (void) fprintf(fp, "calibrate ");
 		if (is->flags & INFO_FLAG_PPS_SYNC)
-		    (void) fprintf(fp, "pps_sync ");
+		    (void) fprintf(fp, "pps ");
 		(void) fprintf(fp, "\n");
 	}
 	(void) fprintf(fp, "jitter:               %s s\n",
@@ -1174,6 +1174,13 @@ doconfig(
 		      sizeof(struct conf_peer), (char *)&cpeer, &items,
 		      &itemsize, &dummy, 0);
 	
+	if (res == INFO_ERR_FMT) {
+		(void) fprintf(fp,
+		    "***Retrying command with old conf_peer size\n");
+		res = doquery(IMPL_XNTPD, REQ_CONFIG, 1, 1,
+			      sizeof(struct old_conf_peer), (char *)&cpeer,
+			      &items, &itemsize, &dummy, 0);
+	}
 	if (res == 0)
 	    (void) fprintf(fp, "done!\n");
 	return;
@@ -1256,21 +1263,25 @@ doset(
 	sys.flags = 0;
 	res = 0;
 	for (items = 0; items < pcmd->nargs; items++) {
-		if (STREQ(pcmd->argval[items].string, "pps"))
-		    sys.flags |= SYS_FLAG_PPS;
+		if (STREQ(pcmd->argval[items].string, "auth"))
+			sys.flags |= SYS_FLAG_AUTH;
 		else if (STREQ(pcmd->argval[items].string, "bclient"))
-		    sys.flags |= SYS_FLAG_BCLIENT;
+			sys.flags |= SYS_FLAG_BCLIENT;
+		else if (STREQ(pcmd->argval[items].string, "calibrate"))
+			sys.flags |= SYS_FLAG_CAL;
+		else if (STREQ(pcmd->argval[items].string, "kernel"))
+			sys.flags |= SYS_FLAG_KERNEL;
 		else if (STREQ(pcmd->argval[items].string, "monitor"))
-		    sys.flags |= SYS_FLAG_MONITOR;
+			sys.flags |= SYS_FLAG_MONITOR;
 		else if (STREQ(pcmd->argval[items].string, "ntp"))
-		    sys.flags |= SYS_FLAG_NTP;
-		else if (STREQ(pcmd->argval[items].string, "kernel"))
-		    sys.flags |= SYS_FLAG_KERNEL;
+			sys.flags |= SYS_FLAG_NTP;
+		else if (STREQ(pcmd->argval[items].string, "pps"))
+			sys.flags |= SYS_FLAG_PPS;
 		else if (STREQ(pcmd->argval[items].string, "stats"))
-		    sys.flags |= SYS_FLAG_FILEGEN;
+			sys.flags |= SYS_FLAG_FILEGEN;
 		else {
 			(void) fprintf(fp, "Unknown flag %s\n",
-				       pcmd->argval[items].string);
+			    pcmd->argval[items].string);
 			res = 1;
 		}
 	}
diff --git a/contrib/ntp/ntpq/Makefile.am b/contrib/ntp/ntpq/Makefile.am
index 90f4c39..918df9c 100644
--- a/contrib/ntp/ntpq/Makefile.am
+++ b/contrib/ntp/ntpq/Makefile.am
@@ -17,5 +17,5 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpq
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
 	$(COMPILE) -c version.c
diff --git a/contrib/ntp/ntpq/Makefile.in b/contrib/ntp/ntpq/Makefile.in
index 2de95b7..8391249 100644
--- a/contrib/ntp/ntpq/Makefile.in
+++ b/contrib/ntp/ntpq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpq
 INCLUDES = -I$(top_srcdir)/include
@@ -128,8 +122,6 @@ noinst_HEADERS = ntpq.h
 ETAGS_ARGS = Makefile.am
 
 ntpq_SOURCES = ntpq.c ntpq_ops.c
-EXEEXT =
-OBJEXT = o
 subdir = ntpq
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -137,39 +129,37 @@ CONFIG_CLEAN_FILES =
 bin_PROGRAMS = ntpq$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 am_ntpq_OBJECTS = ntpq$U.$(OBJEXT) ntpq_ops$U.$(OBJEXT)
 ntpq_OBJECTS = $(am_ntpq_OBJECTS)
 ntpq_LDADD = $(LDADD)
 ntpq_DEPENDENCIES = version.o ../libntp/libntp.a
-ntpq_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ntpq_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntpq$U.Po $(DEPDIR)/ntpq_ops$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(ntpq_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/ntpq$U.Po $(DEPDIR)/ntpq_ops$U.Po
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 SOURCES = $(ntpq_SOURCES)
-OBJECTS = $(am_ntpq_OBJECTS)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ntpq/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -177,8 +167,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -194,30 +186,47 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ntpq$(EXEEXT): $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES) 
+	@rm -f ntpq$(EXEEXT)
+	$(LINK) $(ntpq_LDFLAGS) $(ntpq_OBJECTS) $(ntpq_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-ntpq: $(ntpq_OBJECTS) $(ntpq_DEPENDENCIES)
-	@rm -f ntpq
-	$(LINK) $(ntpq_LDFLAGS) $(ntpq_OBJECTS) $(ntpq_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpq$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpq_ops$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 ntpq_.c: ntpq.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpq.c; then echo $(srcdir)/ntpq.c; else echo ntpq.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpq_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpq.c; then echo $(srcdir)/ntpq.c; else echo ntpq.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpq_.c || rm -f ntpq_.c
 ntpq_ops_.c: ntpq_ops.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpq_ops.c; then echo $(srcdir)/ntpq_ops.c; else echo ntpq_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpq_ops_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpq_ops.c; then echo $(srcdir)/ntpq_ops.c; else echo ntpq_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpq_ops_.c || rm -f ntpq_ops_.c
 ntpq_.$(OBJEXT) ntpq_ops_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -230,7 +239,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -246,31 +255,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/ntpq$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntpq_ops$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -279,7 +267,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -305,24 +297,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -332,11 +321,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -344,7 +333,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -358,17 +347,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
-	uninstall uninstall-am uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 $(PROGRAMS): $(LDADD)
@@ -377,9 +367,8 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
-	$(top_builddir)/scripts/mkver ntpq
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
 	$(COMPILE) -c version.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/ntpq/ntpq.c b/contrib/ntp/ntpq/ntpq.c
index f529d61..34404b2 100644
--- a/contrib/ntp/ntpq/ntpq.c
+++ b/contrib/ntp/ntpq/ntpq.c
@@ -21,6 +21,11 @@
 #define closesocket close
 #endif /* SYS_WINNT */
 
+#ifdef HAVE_LIBREADLINE
+# include 
+# include 
+#endif /* HAVE_LIBREADLINE */
+
 #ifdef SYS_VXWORKS
 /* vxWorks needs mode flag -casey*/
 #define open(name, flags)   open(name, flags, 0777)
@@ -1259,22 +1264,33 @@ doquery(
 static void
 getcmds(void)
 {
-	char line[MAXLINE];
-
-	for (;;) {
-		if (interactive) {
-#ifdef VMS	/* work around a problem with mixing stdout & stderr */
-			fputs("",stdout);
+#ifdef HAVE_LIBREADLINE
+        char *line;
+
+        for (;;) {
+                if ((line = readline(interactive?prompt:"")) == NULL) return;
+                if (*line) add_history(line);
+                docmd(line);
+                free(line);
+        }
+#else /* not HAVE_LIBREADLINE */
+        char line[MAXLINE];
+
+        for (;;) {
+                if (interactive) {
+#ifdef VMS      /* work around a problem with mixing stdout & stderr */
+                        fputs("",stdout);
 #endif
-			(void) fputs(prompt, stderr);
-			(void) fflush(stderr);
-		}
+                        (void) fputs(prompt, stderr);
+                        (void) fflush(stderr);
+                }
 
-		if (fgets(line, sizeof line, stdin) == NULL)
-		    return;
+                if (fgets(line, sizeof line, stdin) == NULL)
+                    return;
 
-		docmd(line);
-	}
+                docmd(line);
+        }
+#endif /* not HAVE_LIBREADLINE */
 }
 
 
diff --git a/contrib/ntp/ntptrace/Makefile.am b/contrib/ntp/ntptrace/Makefile.am
index f7106ec..fed8321 100644
--- a/contrib/ntp/ntptrace/Makefile.am
+++ b/contrib/ntp/ntptrace/Makefile.am
@@ -15,5 +15,5 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile
-	$(top_builddir)/scripts/mkver ntptrace
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntptrace
 	$(COMPILE) -c version.c
diff --git a/contrib/ntp/ntptrace/Makefile.in b/contrib/ntp/ntptrace/Makefile.in
index f014e02..06c1deb 100644
--- a/contrib/ntp/ntptrace/Makefile.in
+++ b/contrib/ntp/ntptrace/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntptrace
 INCLUDES = -I$(top_srcdir)/include
@@ -126,8 +120,6 @@ DISTCLEANFILES = .version version.c
 noinst_HEADERS = ntptrace.h
 #EXTRA_DIST = ntptrace.mak README TAGS save
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = ntptrace
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -135,39 +127,37 @@ CONFIG_CLEAN_FILES =
 bin_PROGRAMS = ntptrace$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 ntptrace_SOURCES = ntptrace.c
 ntptrace_OBJECTS = ntptrace$U.$(OBJEXT)
 ntptrace_LDADD = $(LDADD)
 ntptrace_DEPENDENCIES = version.o ../libntp/libntp.a
-ntptrace_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ntptrace_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntptrace$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = ntptrace.c
 HEADERS = $(noinst_HEADERS)
 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/ntptrace$U.Po
 DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-
 SOURCES = ntptrace.c
-OBJECTS = ntptrace$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  ntptrace/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -175,8 +165,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -192,28 +184,44 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ntptrace$(EXEEXT): $(ntptrace_OBJECTS) $(ntptrace_DEPENDENCIES) 
+	@rm -f ntptrace$(EXEEXT)
+	$(LINK) $(ntptrace_LDFLAGS) $(ntptrace_OBJECTS) $(ntptrace_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-ntptrace: $(ntptrace_OBJECTS) $(ntptrace_DEPENDENCIES)
-	@rm -f ntptrace
-	$(LINK) $(ntptrace_LDFLAGS) $(ntptrace_OBJECTS) $(ntptrace_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntptrace$U.Po@am__quote@
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 ntptrace_.c: ntptrace.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptrace.c; then echo $(srcdir)/ntptrace.c; else echo ntptrace.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptrace_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptrace.c; then echo $(srcdir)/ntptrace.c; else echo ntptrace.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptrace_.c || rm -f ntptrace_.c
 ntptrace_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -226,7 +234,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -242,30 +250,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/ntptrace$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -274,7 +262,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -300,24 +292,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -327,11 +316,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -339,7 +328,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -353,17 +342,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	distclean distclean-compile distclean-depend distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-kr tags \
-	uninstall uninstall-am uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 $(PROGRAMS): $(LDADD)
@@ -372,9 +362,8 @@ $(PROGRAMS): $(LDADD)
 	cd ../libntp && $(MAKE)
 
 version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile
-	$(top_builddir)/scripts/mkver ntptrace
+	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntptrace
 	$(COMPILE) -c version.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/ntptrace/ntptrace.c b/contrib/ntp/ntptrace/ntptrace.c
index f7106ba..8115c50 100644
--- a/contrib/ntp/ntptrace/ntptrace.c
+++ b/contrib/ntp/ntptrace/ntptrace.c
@@ -28,11 +28,17 @@
 #include 
 #include 
 #include 
-#include 
+#ifdef HAVE_SYS_SIGNAL_H
+# include 
+#else
+# include 
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 # include 
 #endif
-#include 
+#ifdef HAVE_SYS_RESOURCE_H
+# include 
+#endif
 
 /*
  * only 16 stratums, so this is more than enough.
diff --git a/contrib/ntp/parseutil/Makefile.in b/contrib/ntp/parseutil/Makefile.in
index 61309e6..bc0f039 100644
--- a/contrib/ntp/parseutil/Makefile.in
+++ b/contrib/ntp/parseutil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,24 +104,19 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_PROGRAMS = @TESTDCF@ @DCFD@
 EXTRA_PROGRAMS = testdcf dcfd
 INCLUDES = -I$(top_srcdir)/include
 ETAGS_ARGS = Makefile.am
 DISTCLEANFILES = $(EXTRA_PROGRAMS)
-EXEEXT =
-OBJEXT = o
 subdir = parseutil
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -133,76 +125,90 @@ EXTRA_PROGRAMS = testdcf$(EXEEXT) dcfd$(EXEEXT)
 noinst_PROGRAMS = @TESTDCF@ @DCFD@
 PROGRAMS = $(noinst_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = ../util/ansi2knr
 dcfd_SOURCES = dcfd.c
 dcfd_OBJECTS = dcfd$U.$(OBJEXT)
 dcfd_LDADD = $(LDADD)
-dcfd_DEPENDENCIES = 
-dcfd_LDFLAGS = 
+dcfd_DEPENDENCIES =
+dcfd_LDFLAGS =
 testdcf_SOURCES = testdcf.c
 testdcf_OBJECTS = testdcf$U.$(OBJEXT)
 testdcf_LDADD = $(LDADD)
-testdcf_DEPENDENCIES = 
-testdcf_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+testdcf_DEPENDENCIES =
+testdcf_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcfd$U.Po $(DEPDIR)/testdcf$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = dcfd.c testdcf.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/dcfd$U.Po $(DEPDIR)/testdcf$U.Po
 DIST_COMMON = README Makefile.am Makefile.in
-
 SOURCES = dcfd.c testdcf.c
-OBJECTS = dcfd$U.$(OBJEXT) testdcf$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  parseutil/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+dcfd$(EXEEXT): $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) 
+	@rm -f dcfd$(EXEEXT)
+	$(LINK) $(dcfd_LDFLAGS) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS)
+testdcf$(EXEEXT): $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) 
+	@rm -f testdcf$(EXEEXT)
+	$(LINK) $(testdcf_LDFLAGS) $(testdcf_OBJECTS) $(testdcf_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
-../util/ansi2knr: ../util/ansi2knr.$(OBJEXT)
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
-
-../util/ansi2knr.$(OBJEXT):
-	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.$(OBJEXT)
 
+ANSI2KNR = ../util/ansi2knr
+../util/ansi2knr:
+	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-dcfd: $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES)
-	@rm -f dcfd
-	$(LINK) $(dcfd_LDFLAGS) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcfd$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcf$U.Po@am__quote@
 
-testdcf: $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES)
-	@rm -f testdcf
-	$(LINK) $(testdcf_LDFLAGS) $(testdcf_OBJECTS) $(testdcf_LDADD) $(LIBS)
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 dcfd_.c: dcfd.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dcfd.c; then echo $(srcdir)/dcfd.c; else echo dcfd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dcfd_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dcfd.c; then echo $(srcdir)/dcfd.c; else echo dcfd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dcfd_.c || rm -f dcfd_.c
 testdcf_.c: testdcf.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/testdcf.c; then echo $(srcdir)/testdcf.c; else echo testdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > testdcf_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/testdcf.c; then echo $(srcdir)/testdcf.c; else echo testdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > testdcf_.c || rm -f testdcf_.c
 dcfd_.$(OBJEXT) testdcf_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -215,7 +221,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -231,31 +237,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/dcfd$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/testdcf$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -264,7 +249,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -290,24 +279,21 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
@@ -317,11 +303,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -329,7 +315,7 @@ install-data-am:
 
 install-exec-am:
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -343,21 +329,23 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-.PHONY: all all-am check check-am check-local clean clean-generic \
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am check-local clean clean-generic \
 	clean-noinstPROGRAMS distclean distclean-compile \
 	distclean-depend distclean-generic distclean-tags distdir dvi \
 	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr tags uninstall uninstall-am
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-info-am
 
 #EXTRA_DIST= TAGS
 
 check-local: dcfd
 	./dcfd -Y
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/scripts/Makefile.in b/contrib/ntp/scripts/Makefile.in
index b857234..110c090 100644
--- a/contrib/ntp/scripts/Makefile.in
+++ b/contrib/ntp/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +49,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +73,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +89,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,42 +102,36 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-
 bin_SCRIPTS = ntp-wait
 noinst_SCRIPTS = calc_tickadj checktime freq_adj mkver ntpsweep ntpver plot_summary summary
 EXTRA_DIST = fixautomakedepsmagic hpadjtime.sh monitoring ntp-close \
 	ntp-groper ntp-restart ntp-status rc1 rc2 stats support
 
-EXEEXT =
-OBJEXT = o
 subdir = scripts
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = calc_tickadj checktime freq_adj mkver ntp-wait \
-ntpsweep ntpver plot_summary summary
+	ntpsweep ntpver plot_summary summary
 SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
 
 DIST_SOURCES =
 DIST_COMMON = README Makefile.am Makefile.in calc_tickadj.in \
-checktime.in freq_adj.in mkver.in ntp-wait.in ntpsweep.in ntpver.in \
-plot_summary.in summary.in
-
+	checktime.in freq_adj.in mkver.in ntp-wait.in ntpsweep.in \
+	ntpver.in plot_summary.in summary.in
 all: all-am
 
 .SUFFIXES:
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  scripts/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -185,6 +174,7 @@ uninstall-binSCRIPTS:
 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
 	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
+uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -196,7 +186,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -222,23 +216,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -247,11 +238,11 @@ distclean: distclean-am
 
 distclean-am: clean-am distclean-generic
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -259,7 +250,7 @@ install-data-am:
 
 install-exec-am: install-binSCRIPTS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -273,16 +264,16 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-uninstall-am: uninstall-binSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am info info-am install \
 	install-am install-binSCRIPTS install-data install-data-am \
-	install-exec install-exec-am install-info install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-binSCRIPTS
-
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/contrib/ntp/scripts/mkver.in b/contrib/ntp/scripts/mkver.in
index c6dc8da..dbe9c2a 100644
--- a/contrib/ntp/scripts/mkver.in
+++ b/contrib/ntp/scripts/mkver.in
@@ -5,6 +5,11 @@ ConfStr="$PROG"
 
 ConfStr="$ConfStr @VERSION@"
 
+case "$CSET" in
+ '') ;;
+ *) ConfStr="$ConfStr@$CSET" ;;
+esac
+
 case "@LIBRSAREF@" in
  '')
     case "@AUTOKEY@" in
diff --git a/contrib/ntp/scripts/ntpsweep.in b/contrib/ntp/scripts/ntpsweep.in
index eb41563..156fb45 100644
--- a/contrib/ntp/scripts/ntpsweep.in
+++ b/contrib/ntp/scripts/ntpsweep.in
@@ -1,6 +1,6 @@
 #! @PATH_PERL@ -w
 #
-# $Id: ntpsweep.in,v 1.1 2000/02/10 08:13:40 stenn Exp $
+# $Id$
 #
 # DISCLAIMER
 # 
diff --git a/contrib/ntp/scripts/plot_summary.in b/contrib/ntp/scripts/plot_summary.in
index 03d8203..3b46a04 100644
--- a/contrib/ntp/scripts/plot_summary.in
+++ b/contrib/ntp/scripts/plot_summary.in
@@ -1,5 +1,5 @@
 #! @PATH_PERL@ -w
-# $Id: plot_summary.in,v 1.1 2000/02/10 08:13:40 stenn Exp $
+# $Id$
 #
 # Use Gnuplot to display data in summary files produced by summary.pl.
 # This script requires GNUPLOT 3.7!
diff --git a/contrib/ntp/scripts/summary.in b/contrib/ntp/scripts/summary.in
index ac259d4..515dfc6 100644
--- a/contrib/ntp/scripts/summary.in
+++ b/contrib/ntp/scripts/summary.in
@@ -1,5 +1,5 @@
 #! @PATH_PERL@ -w
-# $Id: summary.in,v 1.1 2000/02/10 08:13:40 stenn Exp $
+# $Id$
 # Perl version of (summary.sh, loop.awk, peer.awk):
 # Create summaries from xntpd's loop and peer statistics.
 #
diff --git a/contrib/ntp/util/Makefile.in b/contrib/ntp/util/Makefile.in
index c10e3a0..f05b7a5 100644
--- a/contrib/ntp/util/Makefile.in
+++ b/contrib/ntp/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4e from Makefile.am.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,6 +11,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
+
+#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,11 +35,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -49,23 +51,18 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-
 build_alias = @build_alias@
 build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
-
-@SET_MAKE@
-AMDEP = @AMDEP@
 AMTAR = @AMTAR@
 AUTOKEY = @AUTOKEY@
 AWK = @AWK@
@@ -78,13 +75,12 @@ DCFD = @DCFD@
 DEPDIR = @DEPDIR@
 EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
+EXEEXT = @EXEEXT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_STRIP_PROGRAM_ENV = @INSTALL_STRIP_PROGRAM_ENV@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
@@ -95,6 +91,7 @@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIB = @OPENSSL_LIB@
@@ -107,16 +104,13 @@ RSADIR = @RSADIR@
 RSAOBJS = @RSAOBJS@
 RSAREF = @RSAREF@
 RSASRCS = @RSASRCS@
-STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
-_am_include = @_am_include@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
 
-#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
-
-
 AUTOMAKE_OPTIONS = ansi2knr
 bin_PROGRAMS = @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ ntp-genkeys
 EXTRA_PROGRAMS = byteorder hist jitter kern longsize ntptime \
@@ -132,110 +126,107 @@ LDADD = ../libntp/libntp.a
 #EXTRA_DIST = README TAGS
 EXTRA_DIST = 
 ETAGS_ARGS = Makefile.am
-EXEEXT =
-OBJEXT = o
 subdir = util
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 EXTRA_PROGRAMS = byteorder$(EXEEXT) hist$(EXEEXT) jitter$(EXEEXT) \
-kern$(EXEEXT) longsize$(EXEEXT) ntptime$(EXEEXT) precision$(EXEEXT) \
-sht$(EXEEXT) testrs6000$(EXEEXT) tickadj$(EXEEXT) timetrim$(EXEEXT)
+	kern$(EXEEXT) longsize$(EXEEXT) ntptime$(EXEEXT) \
+	precision$(EXEEXT) sht$(EXEEXT) testrs6000$(EXEEXT) \
+	tickadj$(EXEEXT) timetrim$(EXEEXT)
 bin_PROGRAMS = @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
-ntp-genkeys$(EXEEXT)
+	ntp-genkeys$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-ANSI2KNR = @ANSI2KNR@
 byteorder_SOURCES = byteorder.c
 byteorder_OBJECTS = byteorder$U.$(OBJEXT)
 byteorder_LDADD = $(LDADD)
 byteorder_DEPENDENCIES = ../libntp/libntp.a
-byteorder_LDFLAGS = 
+byteorder_LDFLAGS =
 hist_SOURCES = hist.c
 hist_OBJECTS = hist$U.$(OBJEXT)
 hist_LDADD = $(LDADD)
 hist_DEPENDENCIES = ../libntp/libntp.a
-hist_LDFLAGS = 
+hist_LDFLAGS =
 jitter_SOURCES = jitter.c
 jitter_OBJECTS = jitter$U.$(OBJEXT)
 jitter_LDADD = $(LDADD)
 jitter_DEPENDENCIES = ../libntp/libntp.a
-jitter_LDFLAGS = 
+jitter_LDFLAGS =
 kern_SOURCES = kern.c
 kern_OBJECTS = kern$U.$(OBJEXT)
 kern_LDADD = $(LDADD)
 kern_DEPENDENCIES = ../libntp/libntp.a
-kern_LDFLAGS = 
+kern_LDFLAGS =
 longsize_SOURCES = longsize.c
 longsize_OBJECTS = longsize$U.$(OBJEXT)
 longsize_LDADD = $(LDADD)
 longsize_DEPENDENCIES = ../libntp/libntp.a
-longsize_LDFLAGS = 
+longsize_LDFLAGS =
 ntp_genkeys_SOURCES = ntp-genkeys.c
 ntp_genkeys_OBJECTS = ntp-genkeys$U.$(OBJEXT)
-ntp_genkeys_LDFLAGS = 
+ntp_genkeys_LDFLAGS =
 ntptime_SOURCES = ntptime.c
 ntptime_OBJECTS = ntptime$U.$(OBJEXT)
 ntptime_LDADD = $(LDADD)
 ntptime_DEPENDENCIES = ../libntp/libntp.a
-ntptime_LDFLAGS = 
+ntptime_LDFLAGS =
 precision_SOURCES = precision.c
 precision_OBJECTS = precision$U.$(OBJEXT)
 precision_LDADD = $(LDADD)
 precision_DEPENDENCIES = ../libntp/libntp.a
-precision_LDFLAGS = 
+precision_LDFLAGS =
 sht_SOURCES = sht.c
 sht_OBJECTS = sht$U.$(OBJEXT)
 sht_LDADD = $(LDADD)
 sht_DEPENDENCIES = ../libntp/libntp.a
-sht_LDFLAGS = 
+sht_LDFLAGS =
 testrs6000_SOURCES = testrs6000.c
 testrs6000_OBJECTS = testrs6000$U.$(OBJEXT)
 testrs6000_LDADD = $(LDADD)
 testrs6000_DEPENDENCIES = ../libntp/libntp.a
-testrs6000_LDFLAGS = 
+testrs6000_LDFLAGS =
 tickadj_SOURCES = tickadj.c
 tickadj_OBJECTS = tickadj$U.$(OBJEXT)
 tickadj_LDADD = $(LDADD)
 tickadj_DEPENDENCIES = ../libntp/libntp.a
-tickadj_LDFLAGS = 
+tickadj_LDFLAGS =
 timetrim_SOURCES = timetrim.c
 timetrim_OBJECTS = timetrim$U.$(OBJEXT)
 timetrim_LDADD = $(LDADD)
 timetrim_DEPENDENCIES = ../libntp/libntp.a
-timetrim_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+timetrim_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/byteorder$U.Po $(DEPDIR)/hist$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/jitter$U.Po $(DEPDIR)/kern$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/longsize$U.Po $(DEPDIR)/ntp-genkeys$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ntptime$U.Po $(DEPDIR)/precision$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/sht$U.Po $(DEPDIR)/testrs6000$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/tickadj$U.Po $(DEPDIR)/timetrim$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = byteorder.c hist.c jitter.c kern.c longsize.c \
-ntp-genkeys.c ntptime.c precision.c sht.c testrs6000.c tickadj.c \
-timetrim.c
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP@DEP_FILES = $(DEPDIR)/byteorder$U.Po $(DEPDIR)/hist$U.Po \
-@AMDEP@ $(DEPDIR)/jitter$U.Po $(DEPDIR)/kern$U.Po \
-@AMDEP@ $(DEPDIR)/longsize$U.Po $(DEPDIR)/ntp-genkeys$U.Po \
-@AMDEP@ $(DEPDIR)/ntptime$U.Po $(DEPDIR)/precision$U.Po \
-@AMDEP@ $(DEPDIR)/sht$U.Po $(DEPDIR)/testrs6000$U.Po \
-@AMDEP@ $(DEPDIR)/tickadj$U.Po $(DEPDIR)/timetrim$U.Po
+	ntp-genkeys.c ntptime.c precision.c sht.c testrs6000.c \
+	tickadj.c timetrim.c
 DIST_COMMON = README Makefile.am Makefile.in ansi2knr.1 ansi2knr.c
-
 SOURCES = byteorder.c hist.c jitter.c kern.c longsize.c ntp-genkeys.c ntptime.c precision.c sht.c testrs6000.c tickadj.c timetrim.c
-OBJECTS = byteorder$U.$(OBJEXT) hist$U.$(OBJEXT) jitter$U.$(OBJEXT) kern$U.$(OBJEXT) longsize$U.$(OBJEXT) ntp-genkeys$U.$(OBJEXT) ntptime$U.$(OBJEXT) precision$U.$(OBJEXT) sht$U.$(OBJEXT) testrs6000$U.$(OBJEXT) tickadj$U.$(OBJEXT) timetrim$U.$(OBJEXT)
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
-$(srcdir)/Makefile.in: Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  util/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
@@ -243,8 +234,10 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
@@ -260,6 +253,42 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+byteorder$(EXEEXT): $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES) 
+	@rm -f byteorder$(EXEEXT)
+	$(LINK) $(byteorder_LDFLAGS) $(byteorder_OBJECTS) $(byteorder_LDADD) $(LIBS)
+hist$(EXEEXT): $(hist_OBJECTS) $(hist_DEPENDENCIES) 
+	@rm -f hist$(EXEEXT)
+	$(LINK) $(hist_LDFLAGS) $(hist_OBJECTS) $(hist_LDADD) $(LIBS)
+jitter$(EXEEXT): $(jitter_OBJECTS) $(jitter_DEPENDENCIES) 
+	@rm -f jitter$(EXEEXT)
+	$(LINK) $(jitter_LDFLAGS) $(jitter_OBJECTS) $(jitter_LDADD) $(LIBS)
+kern$(EXEEXT): $(kern_OBJECTS) $(kern_DEPENDENCIES) 
+	@rm -f kern$(EXEEXT)
+	$(LINK) $(kern_LDFLAGS) $(kern_OBJECTS) $(kern_LDADD) $(LIBS)
+longsize$(EXEEXT): $(longsize_OBJECTS) $(longsize_DEPENDENCIES) 
+	@rm -f longsize$(EXEEXT)
+	$(LINK) $(longsize_LDFLAGS) $(longsize_OBJECTS) $(longsize_LDADD) $(LIBS)
+ntp-genkeys$(EXEEXT): $(ntp_genkeys_OBJECTS) $(ntp_genkeys_DEPENDENCIES) 
+	@rm -f ntp-genkeys$(EXEEXT)
+	$(LINK) $(ntp_genkeys_LDFLAGS) $(ntp_genkeys_OBJECTS) $(ntp_genkeys_LDADD) $(LIBS)
+ntptime$(EXEEXT): $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES) 
+	@rm -f ntptime$(EXEEXT)
+	$(LINK) $(ntptime_LDFLAGS) $(ntptime_OBJECTS) $(ntptime_LDADD) $(LIBS)
+precision$(EXEEXT): $(precision_OBJECTS) $(precision_DEPENDENCIES) 
+	@rm -f precision$(EXEEXT)
+	$(LINK) $(precision_LDFLAGS) $(precision_OBJECTS) $(precision_LDADD) $(LIBS)
+sht$(EXEEXT): $(sht_OBJECTS) $(sht_DEPENDENCIES) 
+	@rm -f sht$(EXEEXT)
+	$(LINK) $(sht_LDFLAGS) $(sht_OBJECTS) $(sht_LDADD) $(LIBS)
+testrs6000$(EXEEXT): $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES) 
+	@rm -f testrs6000$(EXEEXT)
+	$(LINK) $(testrs6000_LDFLAGS) $(testrs6000_OBJECTS) $(testrs6000_LDADD) $(LIBS)
+tickadj$(EXEEXT): $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES) 
+	@rm -f tickadj$(EXEEXT)
+	$(LINK) $(tickadj_LDFLAGS) $(tickadj_OBJECTS) $(tickadj_LDADD) $(LIBS)
+timetrim$(EXEEXT): $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES) 
+	@rm -f timetrim$(EXEEXT)
+	$(LINK) $(timetrim_LDFLAGS) $(timetrim_OBJECTS) $(timetrim_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -267,91 +296,74 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-clean-krextra:
-	-rm -f ansi2knr
+ANSI2KNR = @ANSI2KNR@
 ansi2knr: ansi2knr.$(OBJEXT)
 	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
 ansi2knr.$(OBJEXT): $(CONFIG_HEADER)
 
+clean-krextra:
+	-rm -f ansi2knr
 
 mostlyclean-kr:
 	-rm -f *_.c
 
-byteorder: $(byteorder_OBJECTS) $(byteorder_DEPENDENCIES)
-	@rm -f byteorder
-	$(LINK) $(byteorder_LDFLAGS) $(byteorder_OBJECTS) $(byteorder_LDADD) $(LIBS)
-
-hist: $(hist_OBJECTS) $(hist_DEPENDENCIES)
-	@rm -f hist
-	$(LINK) $(hist_LDFLAGS) $(hist_OBJECTS) $(hist_LDADD) $(LIBS)
-
-jitter: $(jitter_OBJECTS) $(jitter_DEPENDENCIES)
-	@rm -f jitter
-	$(LINK) $(jitter_LDFLAGS) $(jitter_OBJECTS) $(jitter_LDADD) $(LIBS)
-
-kern: $(kern_OBJECTS) $(kern_DEPENDENCIES)
-	@rm -f kern
-	$(LINK) $(kern_LDFLAGS) $(kern_OBJECTS) $(kern_LDADD) $(LIBS)
-
-longsize: $(longsize_OBJECTS) $(longsize_DEPENDENCIES)
-	@rm -f longsize
-	$(LINK) $(longsize_LDFLAGS) $(longsize_OBJECTS) $(longsize_LDADD) $(LIBS)
-
-ntp-genkeys: $(ntp_genkeys_OBJECTS) $(ntp_genkeys_DEPENDENCIES)
-	@rm -f ntp-genkeys
-	$(LINK) $(ntp_genkeys_LDFLAGS) $(ntp_genkeys_OBJECTS) $(ntp_genkeys_LDADD) $(LIBS)
-
-ntptime: $(ntptime_OBJECTS) $(ntptime_DEPENDENCIES)
-	@rm -f ntptime
-	$(LINK) $(ntptime_LDFLAGS) $(ntptime_OBJECTS) $(ntptime_LDADD) $(LIBS)
-
-precision: $(precision_OBJECTS) $(precision_DEPENDENCIES)
-	@rm -f precision
-	$(LINK) $(precision_LDFLAGS) $(precision_OBJECTS) $(precision_LDADD) $(LIBS)
-
-sht: $(sht_OBJECTS) $(sht_DEPENDENCIES)
-	@rm -f sht
-	$(LINK) $(sht_LDFLAGS) $(sht_OBJECTS) $(sht_LDADD) $(LIBS)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/byteorder$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hist$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/jitter$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kern$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/longsize$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntp-genkeys$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntptime$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/precision$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sht$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testrs6000$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tickadj$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/timetrim$U.Po@am__quote@
 
-testrs6000: $(testrs6000_OBJECTS) $(testrs6000_DEPENDENCIES)
-	@rm -f testrs6000
-	$(LINK) $(testrs6000_LDFLAGS) $(testrs6000_OBJECTS) $(testrs6000_LDADD) $(LIBS)
+distclean-depend:
+	-rm -rf $(DEPDIR)
 
-tickadj: $(tickadj_OBJECTS) $(tickadj_DEPENDENCIES)
-	@rm -f tickadj
-	$(LINK) $(tickadj_LDFLAGS) $(tickadj_OBJECTS) $(tickadj_LDADD) $(LIBS)
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
 
-timetrim: $(timetrim_OBJECTS) $(timetrim_DEPENDENCIES)
-	@rm -f timetrim
-	$(LINK) $(timetrim_LDFLAGS) $(timetrim_OBJECTS) $(timetrim_LDADD) $(LIBS)
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 byteorder_.c: byteorder.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/byteorder.c; then echo $(srcdir)/byteorder.c; else echo byteorder.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > byteorder_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/byteorder.c; then echo $(srcdir)/byteorder.c; else echo byteorder.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > byteorder_.c || rm -f byteorder_.c
 hist_.c: hist.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hist.c; then echo $(srcdir)/hist.c; else echo hist.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hist_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hist.c; then echo $(srcdir)/hist.c; else echo hist.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hist_.c || rm -f hist_.c
 jitter_.c: jitter.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jitter.c; then echo $(srcdir)/jitter.c; else echo jitter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > jitter_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jitter.c; then echo $(srcdir)/jitter.c; else echo jitter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > jitter_.c || rm -f jitter_.c
 kern_.c: kern.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kern.c; then echo $(srcdir)/kern.c; else echo kern.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kern_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/kern.c; then echo $(srcdir)/kern.c; else echo kern.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > kern_.c || rm -f kern_.c
 longsize_.c: longsize.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/longsize.c; then echo $(srcdir)/longsize.c; else echo longsize.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > longsize_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/longsize.c; then echo $(srcdir)/longsize.c; else echo longsize.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > longsize_.c || rm -f longsize_.c
 ntp-genkeys_.c: ntp-genkeys.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp-genkeys.c; then echo $(srcdir)/ntp-genkeys.c; else echo ntp-genkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp-genkeys_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp-genkeys.c; then echo $(srcdir)/ntp-genkeys.c; else echo ntp-genkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntp-genkeys_.c || rm -f ntp-genkeys_.c
 ntptime_.c: ntptime.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptime.c; then echo $(srcdir)/ntptime.c; else echo ntptime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptime_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntptime.c; then echo $(srcdir)/ntptime.c; else echo ntptime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntptime_.c || rm -f ntptime_.c
 precision_.c: precision.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/precision.c; then echo $(srcdir)/precision.c; else echo precision.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > precision_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/precision.c; then echo $(srcdir)/precision.c; else echo precision.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > precision_.c || rm -f precision_.c
 sht_.c: sht.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sht.c; then echo $(srcdir)/sht.c; else echo sht.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sht_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/sht.c; then echo $(srcdir)/sht.c; else echo sht.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > sht_.c || rm -f sht_.c
 testrs6000_.c: testrs6000.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/testrs6000.c; then echo $(srcdir)/testrs6000.c; else echo testrs6000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > testrs6000_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/testrs6000.c; then echo $(srcdir)/testrs6000.c; else echo testrs6000.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > testrs6000_.c || rm -f testrs6000_.c
 tickadj_.c: tickadj.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tickadj.c; then echo $(srcdir)/tickadj.c; else echo tickadj.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tickadj_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/tickadj.c; then echo $(srcdir)/tickadj.c; else echo tickadj.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > tickadj_.c || rm -f tickadj_.c
 timetrim_.c: timetrim.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/timetrim.c; then echo $(srcdir)/timetrim.c; else echo timetrim.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > timetrim_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/timetrim.c; then echo $(srcdir)/timetrim.c; else echo timetrim.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > timetrim_.c || rm -f timetrim_.c
 byteorder_.$(OBJEXT) hist_.$(OBJEXT) jitter_.$(OBJEXT) kern_.$(OBJEXT) \
 longsize_.$(OBJEXT) ntp-genkeys_.$(OBJEXT) ntptime_.$(OBJEXT) \
 precision_.$(OBJEXT) sht_.$(OBJEXT) testrs6000_.$(OBJEXT) \
 tickadj_.$(OBJEXT) timetrim_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 
 tags: TAGS
 
@@ -364,7 +376,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique $(LISP)
 
-TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
@@ -380,41 +392,10 @@ TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 GTAGS:
 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
-	  && gtags -i $$here
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-@AMDEP@@_am_include@ $(DEPDIR)/byteorder$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/hist$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/jitter$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/kern$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/longsize$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntp-genkeys$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/ntptime$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/precision$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/sht$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/testrs6000$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/tickadj$U.Po
-@AMDEP@@_am_include@ $(DEPDIR)/timetrim$U.Po
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
-
-@AMDEP@CCDEPMODE = @CCDEPMODE@
-
-.c.o:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c -o $@ `cygpath -w $<`
-
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -423,7 +404,11 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
 	    cp -pR $$d/$$file $(distdir) \
 	    || exit 1; \
@@ -449,23 +434,20 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
-
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-krextra mostlyclean-am
@@ -475,11 +457,11 @@ distclean: distclean-am
 distclean-am: clean-am distclean-compile distclean-depend \
 	distclean-generic distclean-tags
 
-dvi:
+dvi: dvi-am
 
 dvi-am:
 
-info:
+info: info-am
 
 info-am:
 
@@ -487,7 +469,7 @@ install-data-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-info:
+install-info: install-info-am
 
 install-man:
 
@@ -501,18 +483,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: all all-am check check-am clean clean-binPROGRAMS clean-generic \
-	clean-krextra distclean distclean-compile distclean-depend \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-krextra distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 
 ../libntp/libntp.a:
@@ -520,7 +502,6 @@ uninstall-am: uninstall-binPROGRAMS
 
 kern.o: kern.c
 	$(COMPILE) -DHAVE_TIMEX_H -c kern.c
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/contrib/ntp/util/ansi2knr.c b/contrib/ntp/util/ansi2knr.c
index bc36ce4..1689528 100644
--- a/contrib/ntp/util/ansi2knr.c
+++ b/contrib/ntp/util/ansi2knr.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved. */
 
-/*$Id: ansi2knr.c,v 1.2 1999/08/18 23:33:56 stenn Exp $*/
+/*$Id$*/
 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
 
 /*
diff --git a/contrib/ntp/util/ntp-genkeys.c b/contrib/ntp/util/ntp-genkeys.c
index fd85121..5b70f72 100644
--- a/contrib/ntp/util/ntp-genkeys.c
+++ b/contrib/ntp/util/ntp-genkeys.c
@@ -10,6 +10,7 @@
 #include 
 #endif
 
+#include "ntp_machine.h"
 #include "ntpd.h"
 #include "ntp_stdlib.h"
 #include "ntp_string.h"
@@ -18,6 +19,10 @@
 #include "ntp_config.h"
 #include "ntp_cmdargs.h"
 
+#ifndef GETTIMEOFDAY
+# define GETTIMEOFDAY gettimeofday
+#endif
+
 #include 
 #include 
 #include 		/* PATH_MAX */
@@ -27,6 +32,8 @@
 # include "ntp_crypto.h"
 #endif
 
+#include "l_stdlib.h"
+
 #ifndef PATH_MAX
 # ifdef _POSIX_PATH_MAX
 #  define PATH_MAX _POSIX_PATH_MAX
@@ -164,7 +171,6 @@ char *f3_dhparms;
 u_long	sys_automax;		/* maximum session key lifetime */
 int	sys_bclient;		/* we set our time to broadcasts */
 int	sys_manycastserver;	/* 1 => respond to manycast client pkts */
-u_long	client_limit_period;
 char *	req_file;		/* name of the file with configuration info */
 keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */
 struct interface *any_interface;	/* default interface */
@@ -752,7 +758,7 @@ main(
 	char pathbuf[PATH_MAX];
 
 	gethostname(hostname, sizeof(hostname));
-	gettimeofday(&tv, 0);
+	GETTIMEOFDAY(&tv, 0);
 	ntptime = tv.tv_sec + JAN_1970;
 
 	/* Initialize config_file */
@@ -886,13 +892,13 @@ main(
 		printf("Generating MD5 key file...\n");
 		str = newfile(f1_keys, f2_keys, sec_mask, f3_keys);
 		if (!memorex) {
-			srandom((u_int)tv.tv_usec);
+			SRANDOM((u_int)tv.tv_usec);
 			fprintf(str, "# MD5 key file %s\n# %s", f2_keys,
 				ctime((const time_t *) &tv.tv_sec));
 			for (i = 1; i <= 16; i++) {
 				for (j = 0; j < 16; j++) {
 					while (1) {
-						temp = random() & 0xff;
+						temp = RANDOM & 0xff;
 						/*
 						** Harlan says Karnaugh maps
 						** are not his friend, and
@@ -929,7 +935,7 @@ main(
 			R_RandomInit(&randomstr);
 			R_GetRandomBytesNeeded(&len, &randomstr);
 			for (i = 0; i < len; i++) {
-				temp = random();
+				temp = RANDOM;
 				R_RandomUpdate(&randomstr, (u_char *)&temp, 1);
 			}
 			rval = R_GeneratePEMKeys(&rsaref_public,
@@ -998,7 +1004,7 @@ main(
 			R_RandomInit(&randomstr);
 			R_GetRandomBytesNeeded(&len, &randomstr);
 			for (i = 0; i < len; i++) {
-				temp = random();
+				temp = RANDOM;
 				R_RandomUpdate(&randomstr, (u_char *)&temp, 1);
 			}
 
diff --git a/contrib/ntp/version b/contrib/ntp/version
new file mode 100644
index 0000000..0dfe3d7
--- /dev/null
+++ b/contrib/ntp/version
@@ -0,0 +1 @@
+1.791
-- 
cgit v1.1