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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1725

bk: 4ce83b1eVjOm6EWjC9ygpTvSdY_g8A

diff --cc Makefile.am
index 387a39afd81a8e5913213fda8fbc0e58ee2c80f8,83827db2747db743b389d54ded7ee520224c9cd8..1b703215a17d66963b185ebee6db44e9c9f3d1ba
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -25,9 -20,7 +20,8 @@@ SUBDIRS +=            
        adjtimed        \
        clockstuff      \
        kernel          \
-       sntp            \
        util            \
 +      tests           \
        $(NULL)
  
  DIST_SUBDIRS =                \
@@@ -45,9 -39,7 +40,8 @@@
        adjtimed        \
        clockstuff      \
        kernel          \
-       sntp            \
        util            \
 +      tests           \
        $(NULL)
  
  DISTCHECK_CONFIGURE_FLAGS = -C

diff --cc configure.ac
index 4287a0cea77dbbbb17424c6bb6da539cdabdf225,27f59b9a6d454900a739117a0ca44a3f96f13e6b..b70edf0283bbff0ded31c96f04c2fdcd3735634a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -125,10 -125,9 +125,10 @@@ case "${enable_libopts_install+set}" i
   set) ;;
   *) enable_libopts_install=no ;;
  esac
- LIBOPTS_CHECK([sntp/libopts])
+ LIBOPTS_CHECK([sntp/libopts], [skip-makefile])
  
  AC_FUNC_FORK
 +AC_FUNC_ALLOCA
  
  AC_CACHE_CHECK(
      [if $CC can handle @%:@warning],

diff --cc sntp/Makefile.am
index af0f8867e7008033710642f300eccecfa57aa0be,14005f5fa6bb760ce47572a28d8660b8d0ce08ba..125d56891e8b4adba27cfdbbd49042ba3086e15c
--- 1/sntp/Makefile.am
--- 2/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@@ -23,16 -23,11 +23,15 @@@ endi
  
  CLEANFILES = check-COPYRIGHT-submake
  
- SUBDIRS=
+ SUBDIRS =
  if NEED_LIBOPTS
- SUBDIRS+= libopts
+ SUBDIRS += libopts
  endif
- SUBDIRS+= .
  
- SUBDIRS+= tests
 +if GTEST_AVAILABLE
++SUBDIRS += tests
 +endif
 +
  sntp_SOURCES =                \
        crypto.c        \
        crypto.h        \