From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 30 Dec 2004 23:00:26 +0000 (-0500)
Subject: Resolve conflicts while merging the branch work.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ec5ec9e0eb4ed7134d764a7e2b114fd214ff23c;p=thirdparty%2Fntp.git

Resolve conflicts while merging the branch work.

bk: 41d4888aZ529gNurNQb59NVQdkSzkg
---

7ec5ec9e0eb4ed7134d764a7e2b114fd214ff23c
diff --cc ntpq/Makefile.am
index 4fe155c8c1,89ad3f85bb..0a5f6fd575
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@@ -1,29 -1,15 +1,30 @@@
- #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
- AUTOMAKE_OPTIONS = ../util/ansi2knr
+ AUTOMAKE_OPTIONS=	../util/ansi2knr
+ 
+ bin_PROGRAMS=	ntpq
+ AM_CPPFLAGS=	-I$(top_srcdir)/include
  
- bin_PROGRAMS = ntpq
- AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
  # LDADD might need RESLIB and ADJLIB
- ntpq_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@ $(LIBOPTS_LDADD)
- DISTCLEANFILES = .version version.c
- noinst_HEADERS = ntpq.h
- ETAGS_ARGS = Makefile.am
 -ntpq_LDADD=	version.o ../libntp/libntp.a @READLINE_LIBS@
++ntpq_LDADD=	version.o ../libntp/libntp.a @READLINE_LIBS@ $(LIBOPTS_LDADD)
+ DISTCLEANFILES=	.version version.c
+ noinst_HEADERS=	ntpq.h
+ ETAGS_ARGS=	Makefile.am
 +EXTRA_DIST=	ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu
 +BUILT_SOURCES=	ntpq-opts.c ntpq-opts.h ntpq.1 ntpq-opts.texi ntpq-opts.menu
 +man_MANS=	ntpq.1
 +
- ntpq_SOURCES = ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
++ntpq_SOURCES=	ntpq.c ntpq-subs.c ntpq-opts.c ntpq-opts.h
 +
 +ntpq-opts.h: ntpq-opts.c
 +ntpq-opts.c: ntpq-opts.def
 +	cd $(srcdir) && autogen ntpq-opts.def
 +
 +ntpq.1: ntpq-opts.def
 +	cd $(srcdir) && autogen -Tagman1.tpl -bntpq ntpq-opts.def
  
+ ntpq_SOURCES=	ntpq.c ntpq_ops.c
 +ntpq.texi ntpq.menu: ntpq-opts.def
 +	cd $(srcdir) && autogen -L ${prefix}/share/autogen \
 +		-Taginfo.tpl -DLEVEL=section ntpq-opts.def
  
  $(PROGRAMS): $(LDADD)
  
diff --cc ntpq/ntpq.c
index 4cee2c4e61,5f74a1b2c5..847d9acec9
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@@ -22,9 -21,8 +21,10 @@@
  #include "isc/net.h"
  #include "isc/result.h"
  
 +#include "ntpq-opts.h"
 +
  #ifdef SYS_WINNT
+ #include <Mswsock.h>
  # include <io.h>
  #else
  #define closesocket close