From: Harlan Stenn Date: Thu, 4 May 2000 05:54:33 +0000 (-0000) Subject: Many files: X-Git-Tag: NTP_4_0_99_J~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560131c1090eddff35615232c53ebe95e689188b;p=thirdparty%2Fntp.git Many files: * ntpd/ntp_proto.c (transmit): Fix up the UNREACH code. (receive): Lose some debug code. (clock_update): expire_all() if LEAP_NOTINSYNC crypto_xmit() a CRYPTO_AUTO if !FLAG_AUTOKEY instead of recauto.tstamp crypto_xmit() a CRYPTO_PRIV (not CRYPTO_AUTO) based on pcookie.tstamp crypto_xmit() a CRYPTO_AUTO (not CRYPTO_PRIV) based on FLAG_MCAST2 and !FLAG_AUTOKEY * ntpd/ntp_crypto.c (crypto_recv): Clean up debug output. Don't AUTOKEY if FLAG_MCAST2 From: Dave Mills * flock-build: Also make obe withouyt md5 (no AUTOKEY) * build (BDIR): Handle -noautokey build directory suffix * configure.in: Prepare for AUTOKEY in mkver.in * scripts/mkver.in (ConfStr): Indicate in the version string if we're not using AUTOKEY. bk: 3911109947nLhWJgEBiNVf96tvn_wA --- diff --git a/ChangeLog b/ChangeLog index 5ff4467d3..5b6a59e60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2000-05-04 Harlan Stenn + + * ntpd/ntp_proto.c (transmit): Fix up the UNREACH code. + (receive): Lose some debug code. + (clock_update): expire_all() if LEAP_NOTINSYNC + crypto_xmit() a CRYPTO_AUTO if !FLAG_AUTOKEY instead of recauto.tstamp + crypto_xmit() a CRYPTO_PRIV (not CRYPTO_AUTO) based on pcookie.tstamp + crypto_xmit() a CRYPTO_AUTO (not CRYPTO_PRIV) based on FLAG_MCAST2 + and !FLAG_AUTOKEY + * ntpd/ntp_crypto.c (crypto_recv): Clean up debug output. + Don't AUTOKEY if FLAG_MCAST2 + From: Dave Mills + + * flock-build: Also make obe withouyt md5 (no AUTOKEY) + * build (BDIR): Handle -noautokey build directory suffix + * configure.in: Prepare for AUTOKEY in mkver.in + * scripts/mkver.in (ConfStr): Indicate in the version string if + we're not using AUTOKEY. + 2000-05-03 Harlan Stenn * scripts/ntp-wait.in: Fun things with backspaces diff --git a/Makefile.in b/Makefile.in index 815677052..6cf48189c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -65,6 +65,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/adjtimed/Makefile.in b/adjtimed/Makefile.in index 3e42ddcc8..ab31cd0a0 100644 --- a/adjtimed/Makefile.in +++ b/adjtimed/Makefile.in @@ -1,16 +1,13 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. + +#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +28,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +43,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -72,7 +66,6 @@ CHUTEST = @CHUTEST@ CLKTEST = @CLKTEST@ CPP = @CPP@ CXX = @CXX@ -CXXCPP = @CXXCPP@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ LDFLAGS = @LDFLAGS@ @@ -89,6 +82,7 @@ MAKE_NTPTIME = @MAKE_NTPTIME@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ MAKE_TICKADJ = @MAKE_TICKADJ@ +MD5 = @MD5@ PACKAGE = @PACKAGE@ PATH_PERL = @PATH_PERL@ PATH_SH = @PATH_SH@ @@ -100,9 +94,6 @@ U = @U@ VERSION = @VERSION@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../ansi2knr #no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr bin_PROGRAMS = @MAKE_ADJTIMED@ EXTRA_PROGRAMS = adjtimed @@ -110,7 +101,6 @@ INCLUDES = -I$(top_srcdir)/include LDADD = ../libntp/libntp.a #EXTRA_DIST = TAGS ETAGS_ARGS = Makefile.am -subdir = adjtimed mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -126,28 +116,27 @@ adjtimed_OBJECTS = adjtimed$U.o adjtimed_LDADD = $(LDADD) adjtimed_DEPENDENCIES = ../libntp/libntp.a adjtimed_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = adjtimed.c +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -GZIP_ENV = --best -depcomp = $(SHELL) $(top_srcdir)/depcomp -DEP_FILES = @AMDEP@ $(DEPDIR)/adjtimed$U.Po +TAR = gtar +GZIP = --best +DEP_FILES = .deps/adjtimed.P SOURCES = adjtimed.c OBJECTS = adjtimed$U.o -all: all-redirect +default: all + .SUFFIXES: .SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu adjtimed/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -155,7 +144,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) mostlyclean-binPROGRAMS: clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -163,41 +152,38 @@ maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + $(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done +.c.o: + $(COMPILE) -c $< + mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + rm -f *.tab.c maintainer-clean-compile: ../util/ansi2knr: ../util/ansi2knr.o - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr - -../util/ansi2knr.o: - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o + cd ../util && $(MAKE) ansi2knr mostlyclean-kr: - -rm -f *_.c + rm -f *_.c clean-kr: @@ -209,148 +195,133 @@ adjtimed: $(adjtimed_OBJECTS) $(adjtimed_DEPENDENCIES) @rm -f adjtimed $(LINK) $(adjtimed_LDFLAGS) $(adjtimed_OBJECTS) $(adjtimed_LDADD) $(LIBS) adjtimed_.c: adjtimed.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/adjtimed.c; then echo $(srcdir)/adjtimed.c; else echo adjtimed.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > adjtimed_.c + $(ANSI2KNR) $< adjtimed_.c adjtimed_.o : $(ANSI2KNR) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = adjtimed + distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu adjtimed/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done -@AMDEP@include $(DEPDIR)/adjtimed$U.Po +MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +-include .deps/.P +.deps/.P: $(BUILT_SOURCES) + echo > $@ + +-include $(DEP_FILES) mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf $(DEPDIR) maintainer-clean-depend: + rm -rf .deps + +.deps/%.P: %.c + @echo "Computing dependencies for $<..." + @o='o'; \ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-binPROGRAMS + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) -@AMDEP@CCDEPMODE = @CCDEPMODE@ +install: install-exec install-data all + @: + +uninstall: uninstall-binPROGRAMS + +all: Makefile $(PROGRAMS) -.c.o: -@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ $< - -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-binPROGRAMS -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(bindir) mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -rm -f Makefile.in -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-kr mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-binPROGRAMS clean-compile clean-kr clean-tags \ - clean-depend clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-binPROGRAMS distclean-compile distclean-kr \ - distclean-tags distclean-depend distclean-generic \ - clean-am - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-kr \ - maintainer-clean-tags maintainer-clean-depend \ - maintainer-clean-generic distclean-am + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile mostlyclean-kr \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +clean: clean-binPROGRAMS clean-compile clean-kr clean-tags clean-depend \ + clean-generic mostlyclean + +distclean: distclean-binPROGRAMS distclean-compile distclean-kr \ + distclean-tags distclean-depend distclean-generic clean + rm -f config.status + +maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ + maintainer-clean-kr maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ +.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ +clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ +install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \ maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all install-strip installdirs mostlyclean-generic \ +clean-depend maintainer-clean-depend info dvi installcheck install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff --git a/build b/build index 3dc11e594..673d5f96b 100755 --- a/build +++ b/build @@ -44,11 +44,14 @@ case "$IAM" in ;; esac -RSASUF="" +KEYSUF="" case "$CONFIG_ARGS" in *--without-rsaref*) - [ -d rsaref2 ] && RSASUF="-norsa" + [ -d rsaref2 ] && KEYSUF="-norsa" + ;; + *--disable-md5*) + KEYSUF="-noautokey" ;; esac @@ -60,7 +63,7 @@ case "$CC" in ;; esac -BDIR="$BDIR$RSASUF$CCSUF" +BDIR="$BDIR$KEYSUF$CCSUF" [ -d "$BDIR" ] || mkdir $BDIR [ -f "$BDIR/.buildcvo" ] || echo $CVO > $BDIR/.buildcvo diff --git a/clockstuff/Makefile.in b/clockstuff/Makefile.in index 07ac40bdc..fd3381885 100644 --- a/clockstuff/Makefile.in +++ b/clockstuff/Makefile.in @@ -1,16 +1,13 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. + +#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +28,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +43,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -72,7 +66,6 @@ CHUTEST = @CHUTEST@ CLKTEST = @CLKTEST@ CPP = @CPP@ CXX = @CXX@ -CXXCPP = @CXXCPP@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ LDFLAGS = @LDFLAGS@ @@ -89,6 +82,7 @@ MAKE_NTPTIME = @MAKE_NTPTIME@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ MAKE_TICKADJ = @MAKE_TICKADJ@ +MD5 = @MD5@ PACKAGE = @PACKAGE@ PATH_PERL = @PATH_PERL@ PATH_SH = @PATH_SH@ @@ -100,9 +94,6 @@ U = @U@ VERSION = @VERSION@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@ EXTRA_PROGRAMS = propdelay chutest clktest @@ -113,7 +104,6 @@ propdelay_LDADD = -lm chutest_LDADD = ../libntp/libntp.a clktest_LDADD = ../libntp/libntp.a ETAGS_ARGS = Makefile.am -subdir = clockstuff mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -124,6 +114,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ANSI2KNR = ../util/ansi2knr +propdelay_SOURCES = propdelay.c +propdelay_OBJECTS = propdelay$U.o +propdelay_DEPENDENCIES = +propdelay_LDFLAGS = chutest_SOURCES = chutest.c chutest_OBJECTS = chutest$U.o chutest_DEPENDENCIES = ../libntp/libntp.a @@ -132,33 +126,27 @@ clktest_SOURCES = clktest.c clktest_OBJECTS = clktest$U.o clktest_DEPENDENCIES = ../libntp/libntp.a clktest_LDFLAGS = -propdelay_SOURCES = propdelay.c -propdelay_OBJECTS = propdelay$U.o -propdelay_DEPENDENCIES = -propdelay_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = chutest.c clktest.c propdelay.c +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -GZIP_ENV = --best -depcomp = $(SHELL) $(top_srcdir)/depcomp -DEP_FILES = @AMDEP@ $(DEPDIR)/chutest$U.Po $(DEPDIR)/clktest$U.Po \ -$(DEPDIR)/propdelay$U.Po -SOURCES = chutest.c clktest.c propdelay.c -OBJECTS = chutest$U.o clktest$U.o propdelay$U.o +TAR = gtar +GZIP = --best +DEP_FILES = .deps/chutest.P .deps/clktest.P .deps/propdelay.P +SOURCES = propdelay.c chutest.c clktest.c +OBJECTS = propdelay$U.o chutest$U.o clktest$U.o + +default: all -all: all-redirect .SUFFIXES: .SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu clockstuff/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -166,30 +154,30 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: +.c.o: + $(COMPILE) -c $< + mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + rm -f *.tab.c maintainer-clean-compile: ../util/ansi2knr: ../util/ansi2knr.o - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr - -../util/ansi2knr.o: - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o + cd ../util && $(MAKE) ansi2knr mostlyclean-kr: - -rm -f *_.c + rm -f *_.c clean-kr: @@ -201,153 +189,137 @@ propdelay: $(propdelay_OBJECTS) $(propdelay_DEPENDENCIES) @rm -f propdelay $(LINK) $(propdelay_LDFLAGS) $(propdelay_OBJECTS) $(propdelay_LDADD) $(LIBS) chutest_.c: chutest.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/chutest.c; then echo $(srcdir)/chutest.c; else echo chutest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > chutest_.c + $(ANSI2KNR) $< chutest_.c clktest_.c: clktest.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/clktest.c; then echo $(srcdir)/clktest.c; else echo clktest.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > clktest_.c + $(ANSI2KNR) $< clktest_.c propdelay_.c: propdelay.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/propdelay.c; then echo $(srcdir)/propdelay.c; else echo propdelay.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > propdelay_.c + $(ANSI2KNR) $< propdelay_.c chutest_.o clktest_.o propdelay_.o : $(ANSI2KNR) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = clockstuff + distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu clockstuff/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done -@AMDEP@include $(DEPDIR)/chutest$U.Po -@AMDEP@include $(DEPDIR)/clktest$U.Po -@AMDEP@include $(DEPDIR)/propdelay$U.Po +MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +-include .deps/.P +.deps/.P: $(BUILT_SOURCES) + echo > $@ + +-include $(DEP_FILES) mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf $(DEPDIR) maintainer-clean-depend: + rm -rf .deps -@AMDEP@CCDEPMODE = @CCDEPMODE@ +.deps/%.P: %.c + @echo "Computing dependencies for $<..." + @o='o'; \ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +all: Makefile $(PROGRAMS) -.c.o: -@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ $< - -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -rm -f Makefile.in -mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ mostlyclean-kr mostlyclean-tags mostlyclean-depend \ mostlyclean-generic -mostlyclean: mostlyclean-am +clean: clean-noinstPROGRAMS clean-compile clean-kr clean-tags \ + clean-depend clean-generic mostlyclean -clean-am: clean-noinstPROGRAMS clean-compile clean-kr clean-tags \ - clean-depend clean-generic mostlyclean-am +distclean: distclean-noinstPROGRAMS distclean-compile distclean-kr \ + distclean-tags distclean-depend distclean-generic clean + rm -f config.status -clean: clean-am - -distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-kr \ - distclean-tags distclean-depend distclean-generic \ - clean-am - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ +maintainer-clean: maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-kr \ maintainer-clean-tags maintainer-clean-depend \ - maintainer-clean-generic distclean-am + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +.PHONY: default mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \ maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all install-strip installdirs mostlyclean-generic \ +clean-depend maintainer-clean-depend info dvi installcheck install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff --git a/configure b/configure index 4fbb9870c..bcb11e78c 100755 --- a/configure +++ b/configure @@ -8167,6 +8167,8 @@ case "$ac_cv_var_use_md5" in #define AUTOKEY EOF + + AUTOKEY=1 cat >>confdefs.h <<\EOF #define MD5 1 EOF @@ -8176,10 +8178,10 @@ esac # Check for ioctls TIOCGPPSEV echo $ac_n "checking ioctl TIOCGPPSEV... $ac_c" 1>&6 -echo "configure:8180: checking ioctl TIOCGPPSEV" 1>&5 +echo "configure:8182: checking ioctl TIOCGPPSEV" 1>&5 if test "$ac_cv_header_termios_h" = "yes"; then cat >conftest.$ac_ext < #ifdef TIOCGPPSEV @@ -8211,10 +8213,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls TIOCSPPS echo $ac_n "checking ioctl TIOCSPPS... $ac_c" 1>&6 -echo "configure:8215: checking ioctl TIOCSPPS" 1>&5 +echo "configure:8217: checking ioctl TIOCSPPS" 1>&5 if test "$ac_cv_header_termios_h" = "yes"; then cat >conftest.$ac_ext < #ifdef TIOCSPPS @@ -8246,10 +8248,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls CIOGETEV echo $ac_n "checking ioctl CIOGETEV... $ac_c" 1>&6 -echo "configure:8250: checking ioctl CIOGETEV" 1>&5 +echo "configure:8252: checking ioctl CIOGETEV" 1>&5 if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then cat >conftest.$ac_ext < #ifdef CIOGETEV @@ -8299,18 +8301,18 @@ esac # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG echo $ac_n "checking for linux/serial.h... $ac_c" 1>&6 -echo "configure:8303: checking for linux/serial.h" 1>&5 +echo "configure:8305: checking for linux/serial.h" 1>&5 if test "${ac_cv_header_linux_serial_h+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8327,11 +8329,11 @@ fi echo "$ac_t""$ac_cv_header_linux_serial_h" 1>&6 echo $ac_n "checking ioctl TIOCGSERIAL... $ac_c" 1>&6 -echo "configure:8331: checking ioctl TIOCGSERIAL" 1>&5 +echo "configure:8333: checking ioctl TIOCGSERIAL" 1>&5 case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in yesyes) cat >conftest.$ac_ext < typedef int u_int; @@ -8374,7 +8376,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for SHMEM_STATUS support echo $ac_n "checking SHMEM_STATUS support... $ac_c" 1>&6 -echo "configure:8378: checking SHMEM_STATUS support" 1>&5 +echo "configure:8380: checking SHMEM_STATUS support" 1>&5 case "$ac_cv_header_sys_mman_h" in yes) ntp_ok=yes ;; *) ntp_ok=no ;; @@ -8391,7 +8393,7 @@ ntp_refclock=no # HPUX only, and by explicit request echo $ac_n "checking Datum/Bancomm bc635/VME interface... $ac_c" 1>&6 -echo "configure:8395: checking Datum/Bancomm bc635/VME interface" 1>&5 +echo "configure:8397: checking Datum/Bancomm bc635/VME interface" 1>&5 # Check whether --enable-BANCOMM or --disable-BANCOMM was given. if test "${enable_BANCOMM+set}" = set; then enableval="$enable_BANCOMM" @@ -8415,7 +8417,7 @@ esac #HPUX only, and only by explicit request echo $ac_n "checking TrueTime GPS receiver/VME interface... $ac_c" 1>&6 -echo "configure:8419: checking TrueTime GPS receiver/VME interface" 1>&5 +echo "configure:8421: checking TrueTime GPS receiver/VME interface" 1>&5 # Check whether --enable-GPSVME or --disable-GPSVME was given. if test "${enable_GPSVME+set}" = set; then enableval="$enable_GPSVME" @@ -8438,7 +8440,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking for PCL720 clock support... $ac_c" 1>&6 -echo "configure:8442: checking for PCL720 clock support" 1>&5 +echo "configure:8444: checking for PCL720 clock support" 1>&5 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in yesyesyes) cat >>confdefs.h <<\EOF @@ -8454,7 +8456,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking for SHM clock attached thru shared memory... $ac_c" 1>&6 -echo "configure:8458: checking for SHM clock attached thru shared memory" 1>&5 +echo "configure:8460: checking for SHM clock attached thru shared memory" 1>&5 # Check whether --enable-SHM or --disable-SHM was given. if test "${enable_SHM+set}" = set; then enableval="$enable_SHM" @@ -8473,7 +8475,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for default inclusion of all suitable non-PARSE clocks... $ac_c" 1>&6 -echo "configure:8477: checking for default inclusion of all suitable non-PARSE clocks" 1>&5 +echo "configure:8479: checking for default inclusion of all suitable non-PARSE clocks" 1>&5 # Check whether --enable-all-clocks or --disable-all-clocks was given. if test "${enable_all_clocks+set}" = set; then enableval="$enable_all_clocks" @@ -8485,7 +8487,7 @@ fi echo "$ac_t""$ntp_eac" 1>&6 echo $ac_n "checking if we have support for PARSE clocks... $ac_c" 1>&6 -echo "configure:8489: checking if we have support for PARSE clocks" 1>&5 +echo "configure:8491: checking if we have support for PARSE clocks" 1>&5 case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in *yes*) ntp_canparse=yes @@ -8496,7 +8498,7 @@ esac echo "$ac_t""$ntp_canparse" 1>&6 echo $ac_n "checking if we have support for audio clocks... $ac_c" 1>&6 -echo "configure:8500: checking if we have support for audio clocks" 1>&5 +echo "configure:8502: checking if we have support for audio clocks" 1>&5 case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in *yes*) ntp_canaudio=yes ;; *) ntp_canaudio=no ;; @@ -8504,12 +8506,12 @@ esac echo "$ac_t""$ntp_canaudio" 1>&6 echo $ac_n "checking for struct audio_info.monitor_gain... $ac_c" 1>&6 -echo "configure:8508: checking for struct audio_info.monitor_gain" 1>&5 +echo "configure:8510: checking for struct audio_info.monitor_gain" 1>&5 if test "${ac_cv_member_struct_audio_info_monitor_gain+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8527,7 +8529,7 @@ foo.monitor_gain; return 0; } EOF -if { (eval echo configure:8531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_monitor_gain=yes else @@ -8547,12 +8549,12 @@ EOF fi echo $ac_n "checking for struct audio_info.output_muted... $ac_c" 1>&6 -echo "configure:8551: checking for struct audio_info.output_muted" 1>&5 +echo "configure:8553: checking for struct audio_info.output_muted" 1>&5 if test "${ac_cv_member_struct_audio_info_output_muted+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8570,7 +8572,7 @@ foo.output_muted; return 0; } EOF -if { (eval echo configure:8574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_output_muted=yes else @@ -8590,12 +8592,12 @@ EOF fi echo $ac_n "checking for struct audio_info.blocksize... $ac_c" 1>&6 -echo "configure:8594: checking for struct audio_info.blocksize" 1>&5 +echo "configure:8596: checking for struct audio_info.blocksize" 1>&5 if test "${ac_cv_member_struct_audio_info_blocksize+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8613,7 +8615,7 @@ foo.blocksize; return 0; } EOF -if { (eval echo configure:8617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_blocksize=yes else @@ -8633,12 +8635,12 @@ EOF fi echo $ac_n "checking for struct audio_info.hiwat... $ac_c" 1>&6 -echo "configure:8637: checking for struct audio_info.hiwat" 1>&5 +echo "configure:8639: checking for struct audio_info.hiwat" 1>&5 if test "${ac_cv_member_struct_audio_info_hiwat+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8656,7 +8658,7 @@ foo.hiwat; return 0; } EOF -if { (eval echo configure:8660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_hiwat=yes else @@ -8676,12 +8678,12 @@ EOF fi echo $ac_n "checking for struct audio_info.lowat... $ac_c" 1>&6 -echo "configure:8680: checking for struct audio_info.lowat" 1>&5 +echo "configure:8682: checking for struct audio_info.lowat" 1>&5 if test "${ac_cv_member_struct_audio_info_lowat+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8699,7 +8701,7 @@ foo.lowat; return 0; } EOF -if { (eval echo configure:8703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_lowat=yes else @@ -8719,12 +8721,12 @@ EOF fi echo $ac_n "checking for struct audio_info.mode... $ac_c" 1>&6 -echo "configure:8723: checking for struct audio_info.mode" 1>&5 +echo "configure:8725: checking for struct audio_info.mode" 1>&5 if test "${ac_cv_member_struct_audio_info_mode+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else cat >conftest.$ac_ext < @@ -8742,7 +8744,7 @@ foo.mode; return 0; } EOF -if { (eval echo configure:8746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_struct_audio_info_mode=yes else @@ -8763,14 +8765,14 @@ fi # Requires modem control echo $ac_n "checking ACTS modem service... $ac_c" 1>&6 -echo "configure:8767: checking ACTS modem service" 1>&5 +echo "configure:8769: checking ACTS modem service" 1>&5 # Check whether --enable-ACTS or --disable-ACTS was given. if test "${enable_ACTS+set}" = set; then enableval="$enable_ACTS" ntp_ok=$enableval else cat >conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8803,7 +8805,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arbiter 1088A/B GPS receiver... $ac_c" 1>&6 -echo "configure:8807: checking Arbiter 1088A/B GPS receiver" 1>&5 +echo "configure:8809: checking Arbiter 1088A/B GPS receiver" 1>&5 # Check whether --enable-ARBITER or --disable-ARBITER was given. if test "${enable_ARBITER+set}" = set; then enableval="$enable_ARBITER" @@ -8822,7 +8824,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arcron MSF receiver... $ac_c" 1>&6 -echo "configure:8826: checking Arcron MSF receiver" 1>&5 +echo "configure:8828: checking Arcron MSF receiver" 1>&5 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given. if test "${enable_ARCRON_MSF+set}" = set; then enableval="$enable_ARCRON_MSF" @@ -8841,7 +8843,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Austron 2200A/2201A GPS receiver... $ac_c" 1>&6 -echo "configure:8845: checking Austron 2200A/2201A GPS receiver" 1>&5 +echo "configure:8847: checking Austron 2200A/2201A GPS receiver" 1>&5 # Check whether --enable-AS2201 or --disable-AS2201 was given. if test "${enable_AS2201+set}" = set; then enableval="$enable_AS2201" @@ -8860,7 +8862,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PPS interface... $ac_c" 1>&6 -echo "configure:8864: checking PPS interface" 1>&5 +echo "configure:8866: checking PPS interface" 1>&5 # Check whether --enable-ATOM or --disable-ATOM was given. if test "${enable_ATOM+set}" = set; then enableval="$enable_ATOM" @@ -8879,7 +8881,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking CHU modem/decoder... $ac_c" 1>&6 -echo "configure:8883: checking CHU modem/decoder" 1>&5 +echo "configure:8885: checking CHU modem/decoder" 1>&5 # Check whether --enable-CHU or --disable-CHU was given. if test "${enable_CHU+set}" = set; then enableval="$enable_CHU" @@ -8899,7 +8901,7 @@ echo "$ac_t""$ntp_ok" 1>&6 ac_refclock_chu=$ntp_ok echo $ac_n "checking CHU audio/decoder... $ac_c" 1>&6 -echo "configure:8903: checking CHU audio/decoder" 1>&5 +echo "configure:8905: checking CHU audio/decoder" 1>&5 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given. if test "${enable_AUDIO_CHU+set}" = set; then enableval="$enable_AUDIO_CHU" @@ -8925,7 +8927,7 @@ esac # Not under HP-UX echo $ac_n "checking Datum Programmable Time System... $ac_c" 1>&6 -echo "configure:8929: checking Datum Programmable Time System" 1>&5 +echo "configure:8931: checking Datum Programmable Time System" 1>&5 # Check whether --enable-DATUM or --disable-DATUM was given. if test "${enable_DATUM+set}" = set; then enableval="$enable_DATUM" @@ -8950,7 +8952,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Forum Graphic GPS... $ac_c" 1>&6 -echo "configure:8954: checking Forum Graphic GPS" 1>&5 +echo "configure:8956: checking Forum Graphic GPS" 1>&5 # Check whether --enable-FG or --disable-FG was given. if test "${enable_FG+set}" = set; then enableval="$enable_FG" @@ -8970,14 +8972,14 @@ echo "$ac_t""$ntp_ok" 1>&6 # Requires modem control echo $ac_n "checking Heath GC-1000 WWV/WWVH receiver... $ac_c" 1>&6 -echo "configure:8974: checking Heath GC-1000 WWV/WWVH receiver" 1>&5 +echo "configure:8976: checking Heath GC-1000 WWV/WWVH receiver" 1>&5 # Check whether --enable-HEATH or --disable-HEATH was given. if test "${enable_HEATH+set}" = set; then enableval="$enable_HEATH" ntp_ok=$enableval else cat >conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -9010,7 +9012,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking HP 58503A GPS receiver... $ac_c" 1>&6 -echo "configure:9014: checking HP 58503A GPS receiver" 1>&5 +echo "configure:9016: checking HP 58503A GPS receiver" 1>&5 # Check whether --enable-HPGPS or --disable-HPGPS was given. if test "${enable_HPGPS+set}" = set; then enableval="$enable_HPGPS" @@ -9029,7 +9031,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Sun IRIG audio decoder... $ac_c" 1>&6 -echo "configure:9033: checking Sun IRIG audio decoder" 1>&5 +echo "configure:9035: checking Sun IRIG audio decoder" 1>&5 # Check whether --enable-IRIG or --disable-IRIG was given. if test "${enable_IRIG+set}" = set; then enableval="$enable_IRIG" @@ -9054,7 +9056,7 @@ case "$ntp_ok$ntp_canaudio" in esac echo $ac_n "checking Leitch CSD 5300 Master Clock System Driver... $ac_c" 1>&6 -echo "configure:9058: checking Leitch CSD 5300 Master Clock System Driver" 1>&5 +echo "configure:9060: checking Leitch CSD 5300 Master Clock System Driver" 1>&5 # Check whether --enable-LEITCH or --disable-LEITCH was given. if test "${enable_LEITCH+set}" = set; then enableval="$enable_LEITCH" @@ -9073,7 +9075,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking local clock reference... $ac_c" 1>&6 -echo "configure:9077: checking local clock reference" 1>&5 +echo "configure:9079: checking local clock reference" 1>&5 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given. if test "${enable_LOCAL_CLOCK+set}" = set; then enableval="$enable_LOCAL_CLOCK" @@ -9092,7 +9094,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking EES M201 MSF receiver... $ac_c" 1>&6 -echo "configure:9096: checking EES M201 MSF receiver" 1>&5 +echo "configure:9098: checking EES M201 MSF receiver" 1>&5 # Check whether --enable-MSFEES or --disable-MSFEES was given. if test "${enable_MSFEES+set}" = set; then enableval="$enable_MSFEES" @@ -9112,7 +9114,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Magnavox MX4200 GPS receiver... $ac_c" 1>&6 -echo "configure:9116: checking Magnavox MX4200 GPS receiver" 1>&5 +echo "configure:9118: checking Magnavox MX4200 GPS receiver" 1>&5 # Check whether --enable-MX4200 or --disable-MX4200 was given. if test "${enable_MX4200+set}" = set; then enableval="$enable_MX4200" @@ -9139,7 +9141,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking NMEA GPS receiver... $ac_c" 1>&6 -echo "configure:9143: checking NMEA GPS receiver" 1>&5 +echo "configure:9145: checking NMEA GPS receiver" 1>&5 # Check whether --enable-NMEA or --disable-NMEA was given. if test "${enable_NMEA+set}" = set; then enableval="$enable_NMEA" @@ -9158,7 +9160,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for ONCORE Motorola VP/UT Oncore GPS... $ac_c" 1>&6 -echo "configure:9162: checking for ONCORE Motorola VP/UT Oncore GPS" 1>&5 +echo "configure:9164: checking for ONCORE Motorola VP/UT Oncore GPS" 1>&5 # Check whether --enable-ONCORE or --disable-ONCORE was given. if test "${enable_ONCORE+set}" = set; then enableval="$enable_ONCORE" @@ -9180,7 +9182,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for Palisade clock... $ac_c" 1>&6 -echo "configure:9184: checking for Palisade clock" 1>&5 +echo "configure:9186: checking for Palisade clock" 1>&5 # Check whether --enable-PALISADE or --disable-PALISADE was given. if test "${enable_PALISADE+set}" = set; then enableval="$enable_PALISADE" @@ -9205,7 +9207,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PST/Traconex 1020 WWV/WWVH receiver... $ac_c" 1>&6 -echo "configure:9209: checking PST/Traconex 1020 WWV/WWVH receiver" 1>&5 +echo "configure:9211: checking PST/Traconex 1020 WWV/WWVH receiver" 1>&5 # Check whether --enable-PST or --disable-PST was given. if test "${enable_PST+set}" = set; then enableval="$enable_PST" @@ -9225,7 +9227,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Rockwell Jupiter GPS receiver... $ac_c" 1>&6 -echo "configure:9229: checking Rockwell Jupiter GPS receiver" 1>&5 +echo "configure:9231: checking Rockwell Jupiter GPS receiver" 1>&5 # Check whether --enable-JUPITER or --disable-JUPITER was given. if test "${enable_JUPITER+set}" = set; then enableval="$enable_JUPITER" @@ -9253,14 +9255,14 @@ esac # Requires modem control echo $ac_n "checking PTB modem service... $ac_c" 1>&6 -echo "configure:9257: checking PTB modem service" 1>&5 +echo "configure:9259: checking PTB modem service" 1>&5 # Check whether --enable-PTBACTS or --disable-PTBACTS was given. if test "${enable_PTBACTS+set}" = set; then enableval="$enable_PTBACTS" ntp_ok=$enableval else cat >conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -9293,7 +9295,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface... $ac_c" 1>&6 -echo "configure:9297: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" 1>&5 +echo "configure:9299: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" 1>&5 # Check whether --enable-TPRO or --disable-TPRO was given. if test "${enable_TPRO+set}" = set; then enableval="$enable_TPRO" @@ -9321,7 +9323,7 @@ case "$ntp_ok$ac_cv_header_sys_tpro" in esac echo $ac_n "checking TRAK 8810 GPS receiver... $ac_c" 1>&6 -echo "configure:9325: checking TRAK 8810 GPS receiver" 1>&5 +echo "configure:9327: checking TRAK 8810 GPS receiver" 1>&5 # Check whether --enable-TRAK or --disable-TRAK was given. if test "${enable_TRAK+set}" = set; then enableval="$enable_TRAK" @@ -9340,7 +9342,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Chrono-log K-series WWVB receiver... $ac_c" 1>&6 -echo "configure:9344: checking Chrono-log K-series WWVB receiver" 1>&5 +echo "configure:9346: checking Chrono-log K-series WWVB receiver" 1>&5 # Check whether --enable-CHRONOLOG or --disable-CHRONOLOG was given. if test "${enable_CHRONOLOG+set}" = set; then enableval="$enable_CHRONOLOG" @@ -9359,7 +9361,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Dumb generic hh:mm:ss local clock... $ac_c" 1>&6 -echo "configure:9363: checking Dumb generic hh:mm:ss local clock" 1>&5 +echo "configure:9365: checking Dumb generic hh:mm:ss local clock" 1>&5 # Check whether --enable-DUMBCLOCK or --disable-DUMBCLOCK was given. if test "${enable_DUMBCLOCK+set}" = set; then enableval="$enable_DUMBCLOCK" @@ -9378,7 +9380,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Conrad parallel port radio clock... $ac_c" 1>&6 -echo "configure:9382: checking Conrad parallel port radio clock" 1>&5 +echo "configure:9384: checking Conrad parallel port radio clock" 1>&5 # Check whether --enable-PCF or --disable-PCF was given. if test "${enable_PCF+set}" = set; then enableval="$enable_PCF" @@ -9397,7 +9399,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Spectracom 8170/Netclock/2 WWVB receiver... $ac_c" 1>&6 -echo "configure:9401: checking Spectracom 8170/Netclock/2 WWVB receiver" 1>&5 +echo "configure:9403: checking Spectracom 8170/Netclock/2 WWVB receiver" 1>&5 # Check whether --enable-SPECTRACOM or --disable-SPECTRACOM was given. if test "${enable_SPECTRACOM+set}" = set; then enableval="$enable_SPECTRACOM" @@ -9417,7 +9419,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not on a vax-dec-bsd echo $ac_n "checking Kinemetrics/TrueTime receivers... $ac_c" 1>&6 -echo "configure:9421: checking Kinemetrics/TrueTime receivers" 1>&5 +echo "configure:9423: checking Kinemetrics/TrueTime receivers" 1>&5 # Check whether --enable-TRUETIME or --disable-TRUETIME was given. if test "${enable_TRUETIME+set}" = set; then enableval="$enable_TRUETIME" @@ -9446,7 +9448,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking Ultralink M320 WWVB receiver... $ac_c" 1>&6 -echo "configure:9450: checking Ultralink M320 WWVB receiver" 1>&5 +echo "configure:9452: checking Ultralink M320 WWVB receiver" 1>&5 # Check whether --enable-ULINK or --disable-ULINK was given. if test "${enable_ULINK+set}" = set; then enableval="$enable_ULINK" @@ -9465,7 +9467,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking WWV receiver... $ac_c" 1>&6 -echo "configure:9469: checking WWV receiver" 1>&5 +echo "configure:9471: checking WWV receiver" 1>&5 # Check whether --enable-WWV or --disable-WWV was given. if test "${enable_WWV+set}" = set; then enableval="$enable_WWV" @@ -9491,14 +9493,14 @@ esac # Requires modem control echo $ac_n "checking USNO modem service... $ac_c" 1>&6 -echo "configure:9495: checking USNO modem service" 1>&5 +echo "configure:9497: checking USNO modem service" 1>&5 # Check whether --enable-USNO or --disable-USNO was given. if test "${enable_USNO+set}" = set; then enableval="$enable_USNO" ntp_ok=$enableval else cat >conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -9531,7 +9533,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for default inclusion of all suitable PARSE clocks... $ac_c" 1>&6 -echo "configure:9535: checking for default inclusion of all suitable PARSE clocks" 1>&5 +echo "configure:9537: checking for default inclusion of all suitable PARSE clocks" 1>&5 # Check whether --enable-parse-clocks or --disable-parse-clocks was given. if test "${enable_parse_clocks+set}" = set; then enableval="$enable_parse_clocks" @@ -9561,7 +9563,7 @@ ntp_parseutil=no ntp_rawdcf=no echo $ac_n "checking Diem Computime Radio Clock... $ac_c" 1>&6 -echo "configure:9565: checking Diem Computime Radio Clock" 1>&5 +echo "configure:9567: checking Diem Computime Radio Clock" 1>&5 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given. if test "${enable_COMPUTIME+set}" = set; then enableval="$enable_COMPUTIME" @@ -9586,7 +9588,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking ELV/DCF7000 clock... $ac_c" 1>&6 -echo "configure:9590: checking ELV/DCF7000 clock" 1>&5 +echo "configure:9592: checking ELV/DCF7000 clock" 1>&5 # Check whether --enable-DCF7000 or --disable-DCF7000 was given. if test "${enable_DCF7000+set}" = set; then enableval="$enable_DCF7000" @@ -9611,7 +9613,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking HOPF 6021 clock... $ac_c" 1>&6 -echo "configure:9615: checking HOPF 6021 clock" 1>&5 +echo "configure:9617: checking HOPF 6021 clock" 1>&5 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given. if test "${enable_HOPF6021+set}" = set; then enableval="$enable_HOPF6021" @@ -9636,7 +9638,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Meinberg clocks... $ac_c" 1>&6 -echo "configure:9640: checking Meinberg clocks" 1>&5 +echo "configure:9642: checking Meinberg clocks" 1>&5 # Check whether --enable-MEINBERG or --disable-MEINBERG was given. if test "${enable_MEINBERG+set}" = set; then enableval="$enable_MEINBERG" @@ -9661,7 +9663,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking DCF77 raw time code... $ac_c" 1>&6 -echo "configure:9665: checking DCF77 raw time code" 1>&5 +echo "configure:9667: checking DCF77 raw time code" 1>&5 # Check whether --enable-RAWDCF or --disable-RAWDCF was given. if test "${enable_RAWDCF+set}" = set; then enableval="$enable_RAWDCF" @@ -9690,7 +9692,7 @@ esac case "$ntp_rawdcf" in yes) echo $ac_n "checking if we must enable parity for RAWDCF... $ac_c" 1>&6 -echo "configure:9694: checking if we must enable parity for RAWDCF" 1>&5 +echo "configure:9696: checking if we must enable parity for RAWDCF" 1>&5 if test "${ac_cv_var_rawdcf_parity+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9717,7 +9719,7 @@ EOF esac echo $ac_n "checking RCC 8000 clock... $ac_c" 1>&6 -echo "configure:9721: checking RCC 8000 clock" 1>&5 +echo "configure:9723: checking RCC 8000 clock" 1>&5 # Check whether --enable-RCC8000 or --disable-RCC8000 was given. if test "${enable_RCC8000+set}" = set; then enableval="$enable_RCC8000" @@ -9742,7 +9744,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Schmid DCF77 clock... $ac_c" 1>&6 -echo "configure:9746: checking Schmid DCF77 clock" 1>&5 +echo "configure:9748: checking Schmid DCF77 clock" 1>&5 # Check whether --enable-SCHMID or --disable-SCHMID was given. if test "${enable_SCHMID+set}" = set; then enableval="$enable_SCHMID" @@ -9767,7 +9769,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TAIP protocol... $ac_c" 1>&6 -echo "configure:9771: checking Trimble GPS receiver/TAIP protocol" 1>&5 +echo "configure:9773: checking Trimble GPS receiver/TAIP protocol" 1>&5 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given. if test "${enable_TRIMTAIP+set}" = set; then enableval="$enable_TRIMTAIP" @@ -9792,7 +9794,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TSIP protocol... $ac_c" 1>&6 -echo "configure:9796: checking Trimble GPS receiver/TSIP protocol" 1>&5 +echo "configure:9798: checking Trimble GPS receiver/TSIP protocol" 1>&5 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given. if test "${enable_TRIMTSIP+set}" = set; then enableval="$enable_TRIMTSIP" @@ -9817,7 +9819,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking WHARTON 400A Series clock... $ac_c" 1>&6 -echo "configure:9821: checking WHARTON 400A Series clock" 1>&5 +echo "configure:9823: checking WHARTON 400A Series clock" 1>&5 # Check whether --enable-WHARTON or --disable-WHARTON was given. if test "${enable_WHARTON+set}" = set; then enableval="$enable_WHARTON" @@ -9842,7 +9844,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking VARITEXT clock... $ac_c" 1>&6 -echo "configure:9846: checking VARITEXT clock" 1>&5 +echo "configure:9848: checking VARITEXT clock" 1>&5 # Check whether --enable-VARITEXT or --disable-VARITEXT was given. if test "${enable_VARITEXT+set}" = set; then enableval="$enable_VARITEXT" @@ -9867,7 +9869,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking if we need to make and use the parse libraries... $ac_c" 1>&6 -echo "configure:9871: checking if we need to make and use the parse libraries" 1>&5 +echo "configure:9873: checking if we need to make and use the parse libraries" 1>&5 ans=no case "$ntp_libparse" in yes) @@ -9892,7 +9894,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need to make and use the RSAREF library... $ac_c" 1>&6 -echo "configure:9896: checking if we need to make and use the RSAREF library" 1>&5 +echo "configure:9898: checking if we need to make and use the RSAREF library" 1>&5 # Check whether --with-rsaref or --without-rsaref was given. if test "${with_rsaref+set}" = set; then withval="$with_rsaref" @@ -9927,7 +9929,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can make dcf parse utilities... $ac_c" 1>&6 -echo "configure:9931: checking if we can make dcf parse utilities" 1>&5 +echo "configure:9933: checking if we can make dcf parse utilities" 1>&5 ans=no if test "$ntp_parseutil" = "yes"; then case "$target" in @@ -9941,7 +9943,7 @@ fi echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can build kernel streams modules for parse... $ac_c" 1>&6 -echo "configure:9945: checking if we can build kernel streams modules for parse" 1>&5 +echo "configure:9947: checking if we can build kernel streams modules for parse" 1>&5 ans=no case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in yesyes) @@ -9968,7 +9970,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need basic refclock support... $ac_c" 1>&6 -echo "configure:9972: checking if we need basic refclock support" 1>&5 +echo "configure:9974: checking if we need basic refclock support" 1>&5 if test "$ntp_refclock" = "yes"; then cat >>confdefs.h <<\EOF #define REFCLOCK 1 @@ -9980,7 +9982,7 @@ echo "$ac_t""$ntp_refclock" 1>&6 echo $ac_n "checking if we want HP-UX adjtimed support... $ac_c" 1>&6 -echo "configure:9984: checking if we want HP-UX adjtimed support" 1>&5 +echo "configure:9986: checking if we want HP-UX adjtimed support" 1>&5 case "$target" in *-*-hpux[56789]*) ans=yes @@ -9998,7 +10000,7 @@ fi echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can read kmem... $ac_c" 1>&6 -echo "configure:10002: checking if we can read kmem" 1>&5 +echo "configure:10004: checking if we can read kmem" 1>&5 if test "${ac_cv_var_can_kmem+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10050,7 +10052,7 @@ EOF esac echo $ac_n "checking if adjtime is accurate... $ac_c" 1>&6 -echo "configure:10054: checking if adjtime is accurate" 1>&5 +echo "configure:10056: checking if adjtime is accurate" 1>&5 if test "${ac_cv_var_adjtime_is_accurate+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10101,7 +10103,7 @@ EOF esac echo $ac_n "checking the name of 'tick' in the kernel... $ac_c" 1>&6 -echo "configure:10105: checking the name of 'tick' in the kernel" 1>&5 +echo "configure:10107: checking the name of 'tick' in the kernel" 1>&5 if test "${ac_cv_var_nlist_tick+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10144,7 +10146,7 @@ EOF esac # echo $ac_n "checking for the units of 'tick'... $ac_c" 1>&6 -echo "configure:10148: checking for the units of 'tick'" 1>&5 +echo "configure:10150: checking for the units of 'tick'" 1>&5 if test "${ac_cv_var_tick_nano+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10167,7 +10169,7 @@ EOF esac # echo $ac_n "checking the name of 'tickadj' in the kernel... $ac_c" 1>&6 -echo "configure:10171: checking the name of 'tickadj' in the kernel" 1>&5 +echo "configure:10173: checking the name of 'tickadj' in the kernel" 1>&5 if test "${ac_cv_var_nlist_tickadj+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10219,7 +10221,7 @@ EOF esac # echo $ac_n "checking for the units of 'tickadj'... $ac_c" 1>&6 -echo "configure:10223: checking for the units of 'tickadj'" 1>&5 +echo "configure:10225: checking for the units of 'tickadj'" 1>&5 if test "${ac_cv_var_tickadj_nano+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10242,7 +10244,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel... $ac_c" 1>&6 -echo "configure:10246: checking half-heartedly for 'dosynctodr' in the kernel" 1>&5 +echo "configure:10248: checking half-heartedly for 'dosynctodr' in the kernel" 1>&5 if test "${ac_cv_var_nlist_dosynctodr+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10294,7 +10296,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'noprintf' in the kernel... $ac_c" 1>&6 -echo "configure:10298: checking half-heartedly for 'noprintf' in the kernel" 1>&5 +echo "configure:10300: checking half-heartedly for 'noprintf' in the kernel" 1>&5 if test "${ac_cv_var_nlist_noprintf+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10340,7 +10342,7 @@ EOF esac echo $ac_n "checking for a default value for 'tick'... $ac_c" 1>&6 -echo "configure:10344: checking for a default value for 'tick'" 1>&5 +echo "configure:10346: checking for a default value for 'tick'" 1>&5 if test "${ac_cv_var_tick+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10383,7 +10385,7 @@ EOF esac echo $ac_n "checking for a default value for 'tickadj'... $ac_c" 1>&6 -echo "configure:10387: checking for a default value for 'tickadj'" 1>&5 +echo "configure:10389: checking for a default value for 'tickadj'" 1>&5 if test "${ac_cv_var_tickadj+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10514,7 +10516,7 @@ case "$target" in esac echo $ac_n "checking if we want and can make the tickadj utility... $ac_c" 1>&6 -echo "configure:10518: checking if we want and can make the tickadj utility" 1>&5 +echo "configure:10520: checking if we want and can make the tickadj utility" 1>&5 if test "${ac_cv_make_tickadj+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10528,7 +10530,7 @@ case "$ac_cv_make_tickadj" in esac echo $ac_n "checking if we want and can make the ntptime utility... $ac_c" 1>&6 -echo "configure:10532: checking if we want and can make the ntptime utility" 1>&5 +echo "configure:10534: checking if we want and can make the ntptime utility" 1>&5 if test "${ac_cv_make_ntptime+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10553,7 +10555,7 @@ case "$ac_cv_make_ntptime" in esac echo $ac_n "checking if we want UDP wildcard delivery... $ac_c" 1>&6 -echo "configure:10557: checking if we want UDP wildcard delivery" 1>&5 +echo "configure:10559: checking if we want UDP wildcard delivery" 1>&5 if test "${ac_cv_var_udp_wildcard_delivery+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10631,7 +10633,7 @@ case "$host" in esac echo $ac_n "checking if we should always slew the time... $ac_c" 1>&6 -echo "configure:10635: checking if we should always slew the time" 1>&5 +echo "configure:10637: checking if we should always slew the time" 1>&5 if test "${ac_cv_var_slew_always+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10670,7 +10672,7 @@ EOF esac echo $ac_n "checking if we should step and slew the time... $ac_c" 1>&6 -echo "configure:10674: checking if we should step and slew the time" 1>&5 +echo "configure:10676: checking if we should step and slew the time" 1>&5 if test "${ac_cv_var_step_slew+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10712,7 +10714,7 @@ EOF esac echo $ac_n "checking if ntpdate should step the time... $ac_c" 1>&6 -echo "configure:10716: checking if ntpdate should step the time" 1>&5 +echo "configure:10718: checking if ntpdate should step the time" 1>&5 if test "${ac_cv_var_ntpdate_step+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10742,7 +10744,7 @@ EOF esac echo $ac_n "checking if we should sync TODR clock every hour... $ac_c" 1>&6 -echo "configure:10746: checking if we should sync TODR clock every hour" 1>&5 +echo "configure:10748: checking if we should sync TODR clock every hour" 1>&5 if test "${ac_cv_var_sync_todr+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10774,7 +10776,7 @@ EOF esac echo $ac_n "checking if we should avoid kernel FLL bug... $ac_c" 1>&6 -echo "configure:10778: checking if we should avoid kernel FLL bug" 1>&5 +echo "configure:10780: checking if we should avoid kernel FLL bug" 1>&5 if test "${ac_cv_var_kernel_fll_bug+set}" = set; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11144,6 +11146,7 @@ s%@PATH_PERL@%$PATH_PERL%;t t s%@U@%$U%;t t s%@ANSI2KNR@%$ANSI2KNR%;t t s%@LIBOBJS@%$LIBOBJS%;t t +s%@AUTOKEY@%$AUTOKEY%;t t s%@LIBPARSE@%$LIBPARSE%;t t s%@MAKE_LIBPARSE@%$MAKE_LIBPARSE%;t t s%@MAKE_LIBPARSE_KERNEL@%$MAKE_LIBPARSE_KERNEL%;t t diff --git a/configure.in b/configure.in index 2d926f783..de2549de6 100644 --- a/configure.in +++ b/configure.in @@ -1356,6 +1356,8 @@ ac_cv_var_use_md5=$ans]) case "$ac_cv_var_use_md5" in yes) AC_DEFINE(AUTOKEY, , [Autokey?]) + AC_SUBST(AUTOKEY) + AUTOKEY=1 AC_DEFINE(MD5) ;; esac diff --git a/flock-build b/flock-build index f67b4920e..feaf2d004 100755 --- a/flock-build +++ b/flock-build @@ -29,4 +29,5 @@ do echo $i ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks $BUILD_ARGS" & ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --without-rsaref $BUILD_ARGS" & + ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --disable-md5 $BUILD_ARGS" & done diff --git a/include/Makefile.in b/include/Makefile.in index 96ac009e8..63b25fcca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -65,6 +65,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/kernel/Makefile.in b/kernel/Makefile.in index e657e98e5..750625993 100644 --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -1,16 +1,13 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. + +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +28,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +43,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -72,7 +66,6 @@ CHUTEST = @CHUTEST@ CLKTEST = @CLKTEST@ CPP = @CPP@ CXX = @CXX@ -CXXCPP = @CXXCPP@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ LDFLAGS = @LDFLAGS@ @@ -89,6 +82,7 @@ MAKE_NTPTIME = @MAKE_NTPTIME@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ MAKE_TICKADJ = @MAKE_TICKADJ@ +MD5 = @MD5@ PACKAGE = @PACKAGE@ PATH_PERL = @PATH_PERL@ PATH_SH = @PATH_SH@ @@ -100,30 +94,27 @@ U = @U@ VERSION = @VERSION@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr SUBDIRS = sys ETAGS_ARGS = Makefile.am EXTRA_DIST = chuinit.c clkinit.c tty_chu.c tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c -subdir = kernel mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -DIST_SOURCES = DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP = --best +default: all -GZIP_ENV = --best -all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu kernel/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -141,177 +132,143 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + for subdir in $(SUBDIRS); do \ + target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + (cd $$subdir && $(MAKE) $$target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" + done && test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ + rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \ for subdir in $$rev; do \ + target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + (cd $$subdir && $(MAKE) $$target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + (cd $$subdir && $(MAKE) tags); \ done tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = kernel + distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu kernel/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ done -info-am: info: info-recursive -dvi-am: dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: +check: all-am + $(MAKE) check-recursive installcheck: installcheck-recursive -install-exec-am: +all-am: Makefile + install-exec: install-exec-recursive + @$(NORMAL_INSTALL) -install-data-am: install-data: install-data-recursive + @$(NORMAL_INSTALL) -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: + @: + uninstall: uninstall-recursive -all-am: Makefile -all-redirect: all-recursive + +all: all-recursive all-am + install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: installdirs-recursive -installdirs-am: mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -rm -f Makefile.in + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic -mostlyclean: mostlyclean-recursive - clean-am: clean-tags clean-generic mostlyclean-am -clean: clean-recursive - distclean-am: distclean-tags distclean-generic clean-am -distclean: distclean-recursive - maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ distclean-am + +mostlyclean: mostlyclean-recursive mostlyclean-am + +clean: clean-recursive clean-am + +distclean: distclean-recursive distclean-am + rm -f config.status + +maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-recursive - -.PHONY: install-recursive uninstall-recursive install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +.PHONY: default install-data-recursive uninstall-data-recursive \ +install-exec-recursive uninstall-exec-recursive installdirs-recursive \ +uninstalldirs-recursive all-recursive check-recursive \ +installcheck-recursive info-recursive dvi-recursive \ +mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs-am installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ +installcheck all-am install-exec install-data install uninstall all \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libntp/Makefile.in b/libntp/Makefile.in index a659a4fed..8d6f6f351 100644 --- a/libntp/Makefile.in +++ b/libntp/Makefile.in @@ -65,6 +65,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in index f7853cbda..e19c580b9 100644 --- a/librsaref/Makefile.in +++ b/librsaref/Makefile.in @@ -65,6 +65,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c index 202748e12..9ae95635f 100644 --- a/ntpd/ntp_crypto.c +++ b/ntpd/ntp_crypto.c @@ -342,10 +342,9 @@ crypto_recv( #ifdef DEBUG if (debug) printf( - "crypto_recv: verify %x autokey %d %08x ts %u (%u)\n", + "crypto_recv: verify %x autokey %d %08x ts %u\n", rval, ntohl(ap->seq), - ntohl(ap->key), tstamp, - peer->recauto.tstamp); + ntohl(ap->key), tstamp); #endif if (rval != 0) { peer->flags &= ~FLAG_AUTOKEY; @@ -396,7 +395,7 @@ crypto_recv( peer->flags &= ~FLAG_AUTOKEY; break; } - if (tstamp > 0) + if (!(peer->flags & FLAG_MCAST2) && tstamp > 0) peer->flags |= FLAG_AUTOKEY; #else temp = ntohl(cp->key); diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c index 9821656bb..bd2159a40 100644 --- a/ntpd/ntp_proto.c +++ b/ntpd/ntp_proto.c @@ -102,6 +102,16 @@ transmit( */ if (peer->hmode != MODE_BROADCAST) peer->unreach++; + if (peer->unreach > NTP_UNREACH) { + peer_clear(peer); + if (!(peer->flags & FLAG_CONFIG)) { + unpeer(peer); + return; + } + peer->unreach = 0; + peer->ppoll = peer->maxpoll; + hpoll++; + } oreach = peer->reach; if (oreach & 0x01) peer->valid++; @@ -118,27 +128,12 @@ transmit( report_event(EVNT_UNREACH, peer); peer->timereachable = current_time; peer_clear(peer); - } - - /* - * We would like to respond quickly when the - * peer comes back to life. If the probes since - * becoming unreachable are less than - * NTP_UNREACH, clamp the poll interval to the - * minimum. In order to minimize the network - * traffic, the interval gradually ramps up the - * the maximum after that. - */ - peer->ppoll = peer->maxpoll; - if (peer->unreach < NTP_UNREACH) { - hpoll = peer->minpoll; - } else { if (!(peer->flags & FLAG_CONFIG)) { unpeer(peer); return; } - hpoll++; } + hpoll = peer->minpoll; if (peer->flags & FLAG_BURST) { if (peer->flags & FLAG_MCAST2) peer->burst = NTP_SHIFT; @@ -714,10 +709,6 @@ receive( if (peer->flags & FLAG_SKEY) { peer->flash |= TEST10; crypto_recv(peer, rbufp); - -printf("xxxx %08x %08x %08x %08x\n", peer->keyid, skeyid, tkeyid, - peer->pkeyid); - if (hismode == MODE_SERVER) { if (skeyid == peer->keyid) peer->flash &= ~TEST10; @@ -1036,9 +1027,7 @@ clock_update(void) } if (oleap == LEAP_NOTINSYNC) { report_event(EVNT_SYNCCHG, (struct peer *)0); -/* expire_all(); -*/ } if (ostratum != sys_stratum) report_event(EVNT_PEERSTCHG, (struct peer *)0); @@ -1968,7 +1957,7 @@ peer_xmit( sendlen, CRYPTO_PRIV, peer->hcookie, peer->assoc); #endif /* PUBKEY */ - } else if (peer->recauto.tstamp == 0) { + } else if (!(peer->flags & FLAG_AUTOKEY)) { sendlen += crypto_xmit((u_int32 *)&xpkt, sendlen, CRYPTO_AUTO, peer->hcookie, peer->assoc); @@ -2006,14 +1995,14 @@ peer_xmit( peer->assoc); } else #endif /* PUBKEY */ - if (peer->recauto.tstamp == 0 && - peer->flags & FLAG_MCAST2) { + if (peer->pcookie.tstamp == 0) { sendlen += crypto_xmit((u_int32 *)&xpkt, - sendlen, CRYPTO_AUTO, peer->hcookie, + sendlen, CRYPTO_PRIV, peer->hcookie, peer->assoc); - } else if (peer->pcookie.tstamp == 0) { + } else if (!(peer->flags & FLAG_AUTOKEY) && + peer->flags & FLAG_MCAST2) { sendlen += crypto_xmit((u_int32 *)&xpkt, - sendlen, CRYPTO_PRIV, peer->hcookie, + sendlen, CRYPTO_AUTO, peer->hcookie, peer->assoc); } break; diff --git a/ntpdc/Makefile.in b/ntpdc/Makefile.in index 1b6cda61a..7b4a96d1b 100644 --- a/ntpdc/Makefile.in +++ b/ntpdc/Makefile.in @@ -1,16 +1,13 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. + +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +28,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +43,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -65,6 +59,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -72,7 +67,6 @@ CHUTEST = @CHUTEST@ CLKTEST = @CLKTEST@ CPP = @CPP@ CXX = @CXX@ -CXXCPP = @CXXCPP@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ LDFLAGS = @LDFLAGS@ @@ -100,21 +94,17 @@ U = @U@ VERSION = @VERSION@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr bin_PROGRAMS = ntpdc INCLUDES = -I$(top_srcdir)/include # LDADD might need RESLIB and ADJLIB -LDADD = version.o ../libntp/libntp.a @LIBRSAREF@ +LDADD = version.o ../libntp/libntp.a @LIBRSAREF@ DISTCLEANFILES = .version version.c noinst_HEADERS = ntpdc.h #EXTRA_DIST = ntpdc.mak ETAGS_ARGS = Makefile.am ntpdc_SOURCES = ntpdc.c ntpdc_ops.c -subdir = ntpdc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -125,35 +115,33 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ANSI2KNR = ../util/ansi2knr -am_ntpdc_OBJECTS = ntpdc$U.o ntpdc_ops$U.o -ntpdc_OBJECTS = $(am_ntpdc_OBJECTS) +ntpdc_OBJECTS = ntpdc$U.o ntpdc_ops$U.o ntpdc_LDADD = $(LDADD) ntpdc_DEPENDENCIES = version.o ../libntp/libntp.a ntpdc_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(ntpdc_SOURCES) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(noinst_HEADERS) -DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in +DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -GZIP_ENV = --best -depcomp = $(SHELL) $(top_srcdir)/depcomp -DEP_FILES = @AMDEP@ $(DEPDIR)/ntpdc$U.Po $(DEPDIR)/ntpdc_ops$U.Po +TAR = gtar +GZIP = --best +DEP_FILES = .deps/ntpdc.P .deps/ntpdc_ops.P SOURCES = $(ntpdc_SOURCES) -OBJECTS = $(am_ntpdc_OBJECTS) +OBJECTS = $(ntpdc_OBJECTS) + +default: all -all: all-redirect .SUFFIXES: .SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu ntpdc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -161,7 +149,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) mostlyclean-binPROGRAMS: clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) distclean-binPROGRAMS: @@ -169,41 +157,38 @@ maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/$$f; \ + echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \ + $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ else :; fi; \ done uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + $(NORMAL_UNINSTALL) + list='$(bin_PROGRAMS)'; for p in $$list; do \ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done +.c.o: + $(COMPILE) -c $< + mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + rm -f *.tab.c maintainer-clean-compile: ../util/ansi2knr: ../util/ansi2knr.o - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr - -../util/ansi2knr.o: - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o + cd ../util && $(MAKE) ansi2knr mostlyclean-kr: - -rm -f *_.c + rm -f *_.c clean-kr: @@ -215,152 +200,135 @@ ntpdc: $(ntpdc_OBJECTS) $(ntpdc_DEPENDENCIES) @rm -f ntpdc $(LINK) $(ntpdc_LDFLAGS) $(ntpdc_OBJECTS) $(ntpdc_LDADD) $(LIBS) ntpdc_.c: ntpdc.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_.c + $(ANSI2KNR) $< ntpdc_.c ntpdc_ops_.c: ntpdc_ops.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_ops_.c + $(ANSI2KNR) $< ntpdc_ops_.c ntpdc_.o ntpdc_ops_.o : $(ANSI2KNR) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = ntpdc + distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu ntpdc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done -@AMDEP@include $(DEPDIR)/ntpdc$U.Po -@AMDEP@include $(DEPDIR)/ntpdc_ops$U.Po +MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +-include .deps/.P +.deps/.P: $(BUILT_SOURCES) + echo > $@ + +-include $(DEP_FILES) mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf $(DEPDIR) maintainer-clean-depend: + rm -rf .deps + +.deps/%.P: %.c + @echo "Computing dependencies for $<..." + @o='o'; \ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp +info: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-binPROGRAMS + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) -@AMDEP@CCDEPMODE = @CCDEPMODE@ +install: install-exec install-data all + @: + +uninstall: uninstall-binPROGRAMS + +all: Makefile $(PROGRAMS) $(HEADERS) -.c.o: -@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ $< - -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-binPROGRAMS -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) $(HEADERS) -all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(bindir) mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -rm -f Makefile.in -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-kr mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-binPROGRAMS clean-compile clean-kr clean-tags \ - clean-depend clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-binPROGRAMS distclean-compile distclean-kr \ - distclean-tags distclean-depend distclean-generic \ - clean-am - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-kr \ - maintainer-clean-tags maintainer-clean-depend \ - maintainer-clean-generic distclean-am + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile mostlyclean-kr \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic + +clean: clean-binPROGRAMS clean-compile clean-kr clean-tags clean-depend \ + clean-generic mostlyclean + +distclean: distclean-binPROGRAMS distclean-compile distclean-kr \ + distclean-tags distclean-depend distclean-generic clean + rm -f config.status + +maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ + maintainer-clean-kr maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ +.PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \ +clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ +install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \ maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all install-strip installdirs mostlyclean-generic \ +clean-depend maintainer-clean-depend info dvi installcheck install-exec \ +install-data install uninstall all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff --git a/parseutil/Makefile.in b/parseutil/Makefile.in index 3d1dc0643..dce9dcd3b 100644 --- a/parseutil/Makefile.in +++ b/parseutil/Makefile.in @@ -1,16 +1,13 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# gives unlimited permission to copy, distribute and modify it. + +#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -SHELL = @SHELL@ +SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -31,8 +28,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -48,15 +43,14 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -72,7 +66,6 @@ CHUTEST = @CHUTEST@ CLKTEST = @CLKTEST@ CPP = @CPP@ CXX = @CXX@ -CXXCPP = @CXXCPP@ DCFD = @DCFD@ DEPDIR = @DEPDIR@ LDFLAGS = @LDFLAGS@ @@ -89,6 +82,7 @@ MAKE_NTPTIME = @MAKE_NTPTIME@ MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@ MAKE_TICKADJ = @MAKE_TICKADJ@ +MD5 = @MD5@ PACKAGE = @PACKAGE@ PATH_PERL = @PATH_PERL@ PATH_SH = @PATH_SH@ @@ -100,15 +94,11 @@ U = @U@ VERSION = @VERSION@ install_sh = @install_sh@ -#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies - - AUTOMAKE_OPTIONS = ../util/ansi2knr noinst_PROGRAMS = @TESTDCF@ @DCFD@ EXTRA_PROGRAMS = testdcf dcfd INCLUDES = -I$(top_srcdir)/include ETAGS_ARGS = Makefile.am -subdir = parseutil mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -119,38 +109,35 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ ANSI2KNR = ../util/ansi2knr -dcfd_SOURCES = dcfd.c -dcfd_OBJECTS = dcfd$U.o -dcfd_LDADD = $(LDADD) -dcfd_DEPENDENCIES = -dcfd_LDFLAGS = testdcf_SOURCES = testdcf.c testdcf_OBJECTS = testdcf$U.o testdcf_LDADD = $(LDADD) -testdcf_DEPENDENCIES = testdcf_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = dcfd.c testdcf.c +dcfd_SOURCES = dcfd.c +dcfd_OBJECTS = dcfd$U.o +dcfd_LDADD = $(LDADD) +dcfd_LDFLAGS = +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP = --best +DEP_FILES = .deps/dcfd.P .deps/testdcf.P +SOURCES = testdcf.c dcfd.c +OBJECTS = testdcf$U.o dcfd$U.o -GZIP_ENV = --best -depcomp = $(SHELL) $(top_srcdir)/depcomp -DEP_FILES = @AMDEP@ $(DEPDIR)/dcfd$U.Po $(DEPDIR)/testdcf$U.Po -SOURCES = dcfd.c testdcf.c -OBJECTS = dcfd$U.o testdcf$U.o +default: all -all: all-redirect .SUFFIXES: .SUFFIXES: .c .o $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu parseutil/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -158,30 +145,30 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) distclean-noinstPROGRAMS: maintainer-clean-noinstPROGRAMS: +.c.o: + $(COMPILE) -c $< + mostlyclean-compile: - -rm -f *.o core *.core + rm -f *.o core clean-compile: distclean-compile: - -rm -f *.tab.c + rm -f *.tab.c maintainer-clean-compile: ../util/ansi2knr: ../util/ansi2knr.o - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr - -../util/ansi2knr.o: - cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o + cd ../util && $(MAKE) ansi2knr mostlyclean-kr: - -rm -f *_.c + rm -f *_.c clean-kr: @@ -189,160 +176,144 @@ distclean-kr: maintainer-clean-kr: -dcfd: $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) - @rm -f dcfd - $(LINK) $(dcfd_LDFLAGS) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS) - testdcf: $(testdcf_OBJECTS) $(testdcf_DEPENDENCIES) @rm -f testdcf $(LINK) $(testdcf_LDFLAGS) $(testdcf_OBJECTS) $(testdcf_LDADD) $(LIBS) + +dcfd: $(dcfd_OBJECTS) $(dcfd_DEPENDENCIES) + @rm -f dcfd + $(LINK) $(dcfd_LDFLAGS) $(dcfd_OBJECTS) $(dcfd_LDADD) $(LIBS) dcfd_.c: dcfd.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/dcfd.c; then echo $(srcdir)/dcfd.c; else echo dcfd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > dcfd_.c + $(ANSI2KNR) $< dcfd_.c testdcf_.c: testdcf.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/testdcf.c; then echo $(srcdir)/testdcf.c; else echo testdcf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > testdcf_.c + $(ANSI2KNR) $< testdcf_.c dcfd_.o testdcf_.o : $(ANSI2KNR) tags: TAGS -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $(SOURCES) $(HEADERS) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - -rm -f TAGS ID + rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +subdir = parseutil + distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu parseutil/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir); \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done -@AMDEP@include $(DEPDIR)/dcfd$U.Po -@AMDEP@include $(DEPDIR)/testdcf$U.Po +MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) +-include .deps/.P +.deps/.P: $(BUILT_SOURCES) + echo > $@ + +-include $(DEP_FILES) mostlyclean-depend: clean-depend: distclean-depend: - -rm -rf $(DEPDIR) maintainer-clean-depend: + rm -rf .deps -@AMDEP@CCDEPMODE = @CCDEPMODE@ +.deps/%.P: %.c + @echo "Computing dependencies for $<..." + @o='o'; \ + test -n "$o" && o='$$o'; \ + $(MKDEP) $< >$@.tmp \ + && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \ + && rm -f $@.tmp +info: +dvi: +check: all + $(MAKE) check-local +installcheck: +install-exec: + @$(NORMAL_INSTALL) + +install-data: + @$(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: + +all: Makefile $(PROGRAMS) -.c.o: -@AMDEP@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c -o $@ $< - -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: mostlyclean-generic: + test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + rm -f Makefile $(DISTCLEANFILES) + rm -f config.cache config.log stamp-h stamp-h[0-9]* + test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -rm -f Makefile.in -mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ + test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ mostlyclean-kr mostlyclean-tags mostlyclean-depend \ mostlyclean-generic -mostlyclean: mostlyclean-am - -clean-am: clean-noinstPROGRAMS clean-compile clean-kr clean-tags \ - clean-depend clean-generic mostlyclean-am - -clean: clean-am +clean: clean-noinstPROGRAMS clean-compile clean-kr clean-tags \ + clean-depend clean-generic mostlyclean -distclean-am: distclean-noinstPROGRAMS distclean-compile distclean-kr \ - distclean-tags distclean-depend distclean-generic \ - clean-am +distclean: distclean-noinstPROGRAMS distclean-compile distclean-kr \ + distclean-tags distclean-depend distclean-generic clean + rm -f config.status -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ +maintainer-clean: maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-kr \ maintainer-clean-tags maintainer-clean-depend \ - maintainer-clean-generic distclean-am + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +.PHONY: default mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \ maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \ maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ -clean-depend maintainer-clean-depend info-am info dvi-am dvi \ -check-local check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all install-strip \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +clean-depend maintainer-clean-depend info dvi check-local installcheck \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean #EXTRA_DIST= TAGS diff --git a/scripts/Makefile.in b/scripts/Makefile.in index c10da9651..fa8cc1bde 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -65,6 +65,7 @@ target_alias = @target_alias@ target_triplet = @target@ AMDEP = @AMDEP@ AMTAR = @AMTAR@ +AUTOKEY = @AUTOKEY@ AWK = @AWK@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/scripts/mkver.in b/scripts/mkver.in index 800ccc1de..c4a97ee71 100644 --- a/scripts/mkver.in +++ b/scripts/mkver.in @@ -5,6 +5,9 @@ ConfStr="$PROG" ConfStr="$ConfStr @VERSION@" +case "@AUTOKEY@" in + '') ConfStr="${ConfStr}-a" ;; +esac case "@LIBRSAREF@" in '') ;; *) ConfStr="${ConfStr}-r" ;;