Merge cleanup

bk: 4b4c551cer1GLt-MormsYtd5L4jQcQ

diff --cc ChangeLog
index 5ff9b862e9d68eb89e08599762168ebebccc7b90,69bf8f9c64720334bc038cfe30c0aedd44ffe130..e71799a7bd20a165682f39edd5336d8d1e828127
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,29 +1,31 @@@
- * [Bug 1421] add util/tg2, a clone of tg that works on Linux, NetBSD, and FreeBSD
+ (4.2.7p8) 2010/01/12 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 702] ntpd service logic should use libopts to examine cmdline.
+ * Include (4.2.6p1-RC3) - [Bug 1451] sntp leaks KoD entry updating.
+ * Include (4.2.6p1-RC3) - [Bug 1453] Use $CC in config.cache filename.
+ (4.2.7p7) 2009/12/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize.
+ * [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu.
+ (4.2.7p6) 2009/12/28 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1443] Remove unnecessary dependencies on ntp_io.h
+ * [Bug 1442] Move Windows functions into libntp files
+ * Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
+ * Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
+ * Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
+ * Include (4.2.6p1-RC3) - [Bug 1445] IRIX does not have -lcap or support
+   linux capabilities.
+ (4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.6p1-RC2)
+ (4.2.7p4) 2009/12/24 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
+ * [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
+ (4.2.7p3) 2009/12/22 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1426] scripts/VersionName needs . on the search path.
+ * [Bug 1427] quote missing in ./build - shows up on NetBSD.
+ * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
+ (4.2.7p2) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1419] ntpdate, ntpdc, sntp, ntpd ignore configure --bindir.
++* [Bug 1421] add util/tg2, a clone of tg that works on Linux, NetBSD, and
++  FreeBSD
  (4.2.7p1) 2009/12/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1348] ntpd Windows port should wait for sendto() completion.
  * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.

diff --cc configure.ac
Simple merge

diff --cc util/Makefile.am
index fd132053341d90aa329e6947848c097447ba7d48,3be9cd4ec62af1964e7f52824d0aa5d6b80d2024..144a0a69eb7fa951b1d5852a2198b0531b1bd41a
--- 1/util/Makefile.am
--- 2/util/Makefile.am
+++ b/util/Makefile.am
@@@ -2,10 -2,16 +2,16 @@@ NULL
  #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
  AUTOMAKE_OPTIONS=     
  
+ if NTP_BINSUBDIR_IS_BIN
  bin_PROGRAMS= @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
                ntp-keygen
+ else
+ sbin_PROGRAMS=        @MAKE_NTPTIME@ @MAKE_TICKADJ@ @MAKE_TIMETRIM@ \
+               ntp-keygen
+ endif
+ 
  EXTRA_PROGRAMS=       audio-pcm byteorder hist jitter kern longsize \
 -      ntptime pps-api precision sht testrs6000 tg tickadj timetrim
 +      ntptime pps-api precision sht testrs6000 tg tg2 tickadj timetrim
  
  AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/nothreads/include \