Resolve conflicts while merging the branch work.

bk: 41d4888aZ529gNurNQb59NVQdkSzkg

diff --cc configure.ac
Simple merge

diff --cc ntpq/Makefile.am
index 4fe155c8c15e3d49ca40ce18c2dfbbbf2615a661,89ad3f85bbe5f2268b47ff1615e75be9b732269a..0a5f6fd575f37531050702e4bb10cbe4f4100a74
--- 1/ntpq/Makefile.am
--- 2/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-subs.c
Simple merge

diff --cc ntpq/ntpq.c
index 4cee2c4e61f1a8444c9d8c32089161f7402dd3fc,5f74a1b2c5e7439388015fc5fa6910f0d249218a..847d9acec9bcc6dedbc5c5f931b138d0ee0d427f
--- 1/ntpq/ntpq.c
--- 2/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