From: Dave Hart <hart@ntp.org>
Date: Sat, 20 Nov 2010 21:18:22 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d6f113a5b2998408cf0045f1a65b76cbdc8edfc;p=thirdparty%2Fntp.git

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

bk: 4ce83b1eVjOm6EWjC9ygpTvSdY_g8A
---

8d6f113a5b2998408cf0045f1a65b76cbdc8edfc
diff --cc Makefile.am
index 387a39afd8,83827db274..1b703215a1
--- a/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 4287a0cea7,27f59b9a6d..b70edf0283
--- a/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 af0f8867e7,14005f5fa6..125d56891e
--- a/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+= .
  
 +if GTEST_AVAILABLE
- SUBDIRS+= tests
++SUBDIRS += tests
 +endif
 +
  sntp_SOURCES =		\
  	crypto.c	\
  	crypto.h	\