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

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

bk: 44165979CGeKV2DTFtYgKlb4yg8TlA

diff --cc Makefile.am
index f205417aa7b04560fa9cbf01924d0385e69530a2,f6435f462f1efb14c0d9603515b4a87e11a3975c..cfea064a58a68597758da5b06bafd9b01a8f0c36
--- 1/Makefile.am
--- 2/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   \