Merge bk://bk.ntp.org/ntp-dev

into  psp-deb1.ntp.org:/home/kindernay/ntp-dev-final

bk: 52983246migNfLqpVUy-ZTU40VfJbg

diff --cc ChangeLog
index 4e27e6d40a24fbf477e6fb6699d54c1d811cfe04,d35d801ee0d6be9889509321d5c279481d14907e..45e1ad0db6cf8a63a9d22eaa676b6d86290d4fb6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,4 +1,31 @@@
+ * Incorporate Oliver Kindernay's GSoC 2013 scripts/ cleanup.
 +(4.2.7p399) 2013/11/28 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] More leapsecond file notification cleanup.
 +* [Bug 2506] make sure routing updates are always tracked
 +* [Bug 2514] secs/* #define usage cleanup.
 +(4.2.7p398) 2013/11/25 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] More leapsecond file notification cleanup.
 +* Improve sntp KoD data file fopen() error message.
 +(4.2.7p397) 2013/11/20 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] More leapsecond file notification cleanup.
 +(4.2.7p396) 2013/11/19 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2326] Improve stale leapsecond notifications.
 +(4.2.7p395) 2013/11/12 Released by Harlan Stenn <stenn@ntp.org>
 +* Upgrade to autogen-5.18.3pre5 and libopts-40.1.15.
 +(4.2.7p394) 2013/11/05 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1050] Change ONCORE log message for leap second announcement
 +  to avoid misunderstandings.
 +* [Bug 2499] Win32 user-space/loopback ppsapi provider drops samples.
 +* [Bug 2256] Improve configure's function searches in libraries.
 +(4.2.7p393) 2013/10/16 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2272] Use C99 integer types. ntp_calendar.h and ntp_types.h .
 +(4.2.7p392) 2013/10/15 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2375] Improve AIX compatibility.
 +* [Bug 2490] Fixed non-const initializer coming from [Bug 2250] fix.
 +(4.2.7p391) 2013/10/12 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2250] Rework of leap second handling machine.
 +* [Bug 2419] [rc-nmea] Improve clockstats reporting when receiver sends
 +  data without valid GPS fix.
  (4.2.7p390) 2013/09/26 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2482] Cleanup of droproot and jail support for Solaris.
  (4.2.7p389) 2013/09/24 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
index 8add1c7602830542d2d5374313833e3730859cfc,ee5d0f1d8112a03bd3e0e6eb2b892bde61436298..dec54e786bfc2e8fc747b9d4f5913a843edd95c7
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4256,11 -4250,27 +4258,28 @@@ AC_CONFIG_FILES([scripts/ntptrace/Makef
  AC_CONFIG_FILES([scripts/ntpver],     [chmod +x scripts/ntpver])
  AC_CONFIG_FILES([scripts/plot_summary],       [chmod +x scripts/plot_summary])
  AC_CONFIG_FILES([scripts/summary],    [chmod +x scripts/summary])
+ AC_CONFIG_FILES([scripts/build/Makefile])
  AC_CONFIG_FILES([tests/Makefile])
  AC_CONFIG_FILES([tests/libntp/Makefile])
 +AC_CONFIG_FILES([tests/ntpd/Makefile])
  AC_CONFIG_FILES([util/Makefile])
  
+ perllibdir="${datadir}/ntp/lib"
+ AC_DEFINE_DIR([PERLLIBDIR], [perllibdir], [data dir])
+ 
+ calc_tickadj_opts="scripts/calc_tickadj/calc_tickadj-opts"
+ AC_SUBST_FILE([calc_tickadj_opts])
+ ntp_wait_opts="scripts/ntp-wait/ntp-wait-opts"
+ AC_SUBST_FILE([ntp_wait_opts])
+ ntpsweep_opts="scripts/ntpsweep/ntpsweep-opts"
+ AC_SUBST_FILE([ntpsweep_opts])
+ ntptrace_opts="scripts/ntptrace/ntptrace-opts"
+ AC_SUBST_FILE([ntptrace_opts])
+ summary_opts="scripts/summary-opts"
+ AC_SUBST_FILE([summary_opts])
+ plot_summary_opts="scripts/plot_summary-opts"
+ AC_SUBST_FILE([plot_summary_opts])
+ 
  AC_CONFIG_SUBDIRS([sntp])
  
  AC_OUTPUT

diff --cc ntpd/Makefile.am
Simple merge

diff --cc scripts/ntp-wait/invoke-ntp-wait.texi
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.1ntp-waitman
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.html
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.man.in
Simple merge

diff --cc scripts/ntp-wait/ntp-wait.mdoc.in
Simple merge