From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 14 Mar 2006 05:49:45 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_3~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faf4a95f26b786ccb5b7074ccbd3246b84926f14;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 44165979CGeKV2DTFtYgKlb4yg8TlA
---

faf4a95f26b786ccb5b7074ccbd3246b84926f14
diff --cc Makefile.am
index f205417aa,f6435f462..cfea064a5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,12 -1,8 +1,12 @@@
 -#AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
 +#auTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ no-dependencies
- AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.5
+ AUTOMAKE_OPTIONS = util/ansi2knr foreign 1.8
 -ACLOCAL_AMFLAGS= -I m4
 +ACLOCAL_AMFLAGS= -I m4 -I sntp/libopts/m4
  
 -SUBDIRS = \
 +SUBDIRS=
 +if NEED_LIBOPTS
 +SUBDIRS+= sntp/libopts
 +endif
 +SUBDIRS+= \
  	scripts \
  	include \
  	ElectricFence	\