Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-1158

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-1153-1157-1158

bk: 49e49493YrNpgoFqrDfp5yXDQtGS7g

diff --cc configure.ac
index ea3eea3c229bcef6eafb362401a12c4ed86bc20a,975ad35eba46a658d653213a8cc9e5e1e9a8f0c4..db5b744562b68ed506ae5a3ba1e4abb328726824
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4488,7 -4456,11 +4488,12 @@@ AC_CONFIG_FILES(scripts/plot_summary, [
  AC_CONFIG_FILES(scripts/summary,      [chmod +x scripts/summary])
  AC_CONFIG_FILES(util/Makefile)
  
- AC_CONFIG_SUBDIRS(gsoc_sntp)
- AC_CONFIG_SUBDIRS(sntp)
 -dnl it is not safe to share configuration
 -dnl cache with sntp as it uses different
 -dnl headers in a different order and 
 -dnl tests for different libraries.
++dnl  it is not safe to share configuration
++dnl  cache with sntp or gsoc_sntp as they use
++dnl  different headers in a different order
++dnl  and tests for different libraries.
+ dnl 
+ dnl AC_CONFIG_SUBDIRS(sntp)
++dnl AC_CONFIG_SUBDIRS(gsoc_sntp)
  
  AC_OUTPUT