Merge cleanup.

bk: 3d384951DB34k16rwulJ1p864UMDMw

diff --cc configure.in
index 973320cef2a2c7df3eaa614d2c533869b068e8df,ae9d6de3bd6da75f0a387b8d1726130d1e67c2d1..38087740a3a4c6696bd3d1c70e5711fd4bd8fd2d
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1928,6 -1928,6 +1928,16 @@@ case "$ntp_ok$host" i
   yes*-*-ultrix*) AC_MSG_WARN(*** But the expected answer is... no ***) ;;
  esac
  
++AC_MSG_CHECKING(for NeoClock4X receiver)
++AC_ARG_ENABLE(NEOCLOCK4X,
++    AC_HELP_STRING([--enable-NEOCLOCK4X], [+ NeoClock4X DCF77 / TDF receiver]),
++    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
++if test "$ntp_ok" = "yes"; then
++    ntp_refclock=yes
++    AC_DEFINE(CLOCK_NEOCLOCK4X, 1, [NeoClock4X])
++fi
++AC_MSG_RESULT($ntp_ok)
++
  AC_MSG_CHECKING(NMEA GPS receiver)
  AC_ARG_ENABLE(NMEA,
      AC_HELP_STRING([--enable-NMEA], [+ NMEA GPS receiver]),
@@@ -2152,7 -2152,16 +2162,6 @@@ if test "$ntp_ok" = "yes"; the
  fi
  AC_MSG_RESULT($ntp_ok)
  
 -AC_MSG_CHECKING(for NeoClock4X receiver)
 -AC_ARG_ENABLE(NEOCLOCK4X,
 -    AC_HELP_STRING([--enable-NEOCLOCK4X], [+ NeoClock4X DCF77 / TDF receiver]),
 -    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 -if test "$ntp_ok" = "yes"; then
 -    ntp_refclock=yes
 -    AC_DEFINE(CLOCK_NEOCLOCK4X, 1, [NeoClock4X])
 -fi
 -AC_MSG_RESULT($ntp_ok)
--
  AC_MSG_CHECKING(for default inclusion of all suitable PARSE clocks)
  AC_ARG_ENABLE(parse-clocks,   [  --enable-parse-clocks   - include all suitable PARSE clocks:],
      [ntp_eapc=$enableval],

diff --cc include/ntp.h
Simple merge

diff --cc libntp/clocktypes.c
Simple merge

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge