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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-unity

bk: 55f7d631XeCa2NLT23CJUAvLb9Ppfg

diff --cc ChangeLog
index 7f3b7ce07b0c80582f5bab0a59fcd85fbefdc19b,dda48bb44c6c38e1788609507daf32535bef2ad4..dd2203a551f687f16dd4d5f6dda3a9ae61e990da
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -106,8 -108,8 +108,10 @@@ fixed formatting. Tomasz Flendric
    Reduced the number of warnings by half. Damir Tomić.
  * Updated generate_test_runner.rb and updated the sntp/unity/auto directory
    with the latest Unity updates from Mark. Damir Tomić.
 +* Retire google test - phase I.  Harlan Stenn.
 +* Unity test cleanup: move declaration of 'initializing'.  Harlan Stenn.
+ * Update the NEWS file.  Harlan Stenn.
+ * Autoconf cleanup.  Harlan Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc configure.ac
Simple merge

diff --cc sntp/Makefile.am
Simple merge

diff --cc sntp/tests/Makefile.am
Simple merge

diff --cc tests/libntp/Makefile.am
Simple merge

diff --cc tests/ntpd/Makefile.am
index 1618bcd3310f9a065cc857e04670861442199bd8,2668da1dba2807fb5d0b97ffc065e59bef31398f..6d85502a236d500465c17d31b312513c11a54214
--- 1/tests/ntpd/Makefile.am
--- 2/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -9,17 -9,23 +9,27 @@@ std_unity_list =                                              
  run_unity =   cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
  
  check_PROGRAMS =              \
 +      test-ntp_signd          \
        test-leapsec            \
 -      test-ntp_prio_q         \
 -      test-ntp_restrict       \
        test-rc_cmdlength       \
 +      test-ntp_restrict       \
        test-ntp_scanner        \
 +      test-ntp_prio_q         \
 +      $(NULL)
 +
 +EXTRA_PROGRAMS =              \
        $(NULL)
  
+ EXTRA_PROGRAMS =              \
+       test-ntp_signd          \ #doesn't work, can't link it because you can't link static function
+       $(NULL)
+ 
+ if GTEST_AVAILABLE
+ check_PROGRAMS += tests
+ else
+ EXTRA_PROGRAMS += tests
+ endif
+ 
  LDADD =                                       \
        $(top_builddir)/ntpd/libntpd.a  \
        $(top_builddir)/libntp/libntp.a \