Automerge cleanup.

bk: 3c729b0f8VV40XxNHC1bnQV4ddfWtA

diff --cc configure.in
index 7d3f9faa4669e9e0848787ffd9ca01822c1aa362,dba6d5ee2f43f0dcacbb6924103a8407f8ae6e37..1f3709a3c682b3672297a96688d787bf399ee694
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2109,23 -2079,26 +2111,34 @@@ if test "$ntp_ok" = "yes"; the
  fi
  AC_MSG_RESULT($ntp_ok)
  
 -AC_MSG_CHECKING(for Zyfer receiver)
 -AC_ARG_ENABLE(ZYFER,
 -    AC_HELP_STRING([--enable-ZYFER], [+ Zyfer GPStarplus receiver]),
 -    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
 +AC_MSG_CHECKING(WWV receiver)
 +AC_ARG_ENABLE(WWV,
 +    AC_HELP_STRING([--enable-WWV], [+ WWV Audio receiver]),
 +    [ntp_ok=$enableval],
 +    [case "$ntp_eac$ntp_canaudio" in
 +     *no*)    ntp_ok=no  ;;
 +     *)               ntp_ok=yes ;;
 +    esac])
  if test "$ntp_ok" = "yes"; then
      ntp_refclock=yes
 -    AC_DEFINE(CLOCK_ZYFER, 1, [Zyfer GPStarplus])
 +    AC_DEFINE(CLOCK_WWV)
  fi
  AC_MSG_RESULT($ntp_ok)
 +case "$ntp_ok$ntp_canaudio" in
 + yesno) AC_MSG_WARN(*** But the expected answer is... no ***) ;;
 +esac
  
+ AC_MSG_CHECKING(for Zyfer receiver)
+ AC_ARG_ENABLE(ZYFER,
+     AC_HELP_STRING([--enable-ZYFER], [+ Zyfer GPStarplus receiver]),
+     [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+ if test "$ntp_ok" = "yes"; then
+     ntp_refclock=yes
+     AC_DEFINE(CLOCK_ZYFER, 1, [Zyfer GPStarplus])
+ 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
index ad733c2a35991a9fddd75242ba436b3e6493ab46,1220e8bfb5fdb878b60a2499d2ea1db614271189..2546763a35dca4bf1d6bcf5014eb3cb5020532e7
--- 1/include/ntp.h
--- 2/include/ntp.h
+++ b/include/ntp.h
@@@ -445,11 -445,11 +445,12 @@@ struct peer 
  #define REFCLK_PCF            35      /* Conrad parallel port radio clock */
  #define REFCLK_WWV_AUDIO      36      /* WWV/H audio demodulator/decoder */
  #define REFCLK_FG             37      /* Forum Graphic GPS */
 -#define REFCLK_HOPF_SERIAL    38      /* hopf DCF77/GPS serial line receiver  */
 +#define REFCLK_HOPF_SERIAL    38      /* hopf DCF77/GPS serial receiver  */
  #define REFCLK_HOPF_PCI               39      /* hopf DCF77/GPS PCI receiver  */
 -#define REFCLK_JJY            40      /* JJY receiver  */
 -#define REFCLK_ZYFER          41      /* Zyfer GPStarplus receiver  */
 -#define REFCLK_MAX            41      /* Grow as needed... */
 +#define REFCLK_JJY            40      /* JJY receiver */
- #define       REFCLK_TT560            41      /* TrueTime 560 IRIG-B decoder (40) */
- #define REFCLK_MAX            41      /* Grow as needed... */
++#define       REFCLK_TT560            41      /* TrueTime 560 IRIG-B decoder */
++#define REFCLK_ZYFER          42      /* Zyfer GPStarplus receiver  */
++#define REFCLK_MAX            42      /* Grow as needed... */
  
  /*
   * We tell reference clocks from real peers by giving the reference

diff --cc libntp/clocktypes.c
index 78945d7705bcd6010f1a840e4b98d9edd818b956,3e767ce910213cf1e2e8a38319f51f2d11b1b73c..45588824aa1939fb5dc42984ff84732731d83fbd
--- 1/libntp/clocktypes.c
--- 2/libntp/clocktypes.c
+++ b/libntp/clocktypes.c
@@@ -90,10 -90,10 +90,12 @@@ struct clktype clktypes[] = 
          "HOPF_S"},
        { REFCLK_HOPF_PCI,      "hopf Elektronic PCI receiver (39)",
          "HOPF_P"},
 -      { REFCLK_JJY,   "JJY receiver (40)",
 -        "JJY" },
 -      { REFCLK_ZYFER, "Zyfer GPStarplus receiver (41)",
 +      { REFCLK_JJY,           "JJY receiver (40)",
 +        "JJY"},
-       { REFCLK_TT560,         "TrueTime 560 IRIG-B decoder (40)",
++      { REFCLK_TT560,         "TrueTime 560 IRIG-B decoder (41)",
 +        "TT_IRIG"},
++      { REFCLK_ZYFER,         "Zyfer GPStarplus receiver (42)",
+         "GPS_ZYFER" },
        { -1,                   "", "" }
  };
  

diff --cc ntpd/Makefile.am
index 32df419dea19d68e3a159bff2c056ed304772dfd,6cb46eaf86bf62af605cbec1ad93e1c5e02f039a..30f70a874f5b7da35f13f0d96300a7d9978cbb6f
--- 1/ntpd/Makefile.am
--- 2/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@@ -25,18 -25,19 +25,19 @@@ ntpd_SOURCES = cmd_args.c jupiter.h map
        ntp_crypto.c ntp_filegen.c \
        ntp_intres.c ntp_io.c ntp_loopfilter.c ntp_monitor.c ntp_peer.c \
        ntp_proto.c ntp_refclock.c ntp_request.c \
 -      ntp_restrict.c ntp_timer.c \
 -      ntp_util.c ntpd.c refclock_acts.c refclock_arbiter.c refclock_arc.c \
 -      refclock_as2201.c refclock_atom.c refclock_bancomm.c \
 -      refclock_chronolog.c refclock_chu.c refclock_conf.c refclock_datum.c \
 -      refclock_dumbclock.c refclock_fg.c refclock_gpsvme.c refclock_heath.c \
 -      refclock_hopfser.c refclock_hopfpci.c refclock_hpgps.c \
 -      refclock_irig.c refclock_jjy.c refclock_jupiter.c refclock_leitch.c \
 -      refclock_local.c refclock_msfees.c refclock_mx4200.c refclock_nmea.c \
 -      refclock_oncore.c refclock_palisade.c refclock_palisade.h \
 -      refclock_parse.c refclock_pcf.c refclock_pst.c refclock_ptbacts.c \
 -      refclock_shm.c refclock_tpro.c refclock_trak.c refclock_true.c \
 +      ntp_restrict.c ntp_timer.c ntp_util.c ntpd.c \
 +      refclock_acts.c refclock_arbiter.c refclock_arc.c refclock_as2201.c \
 +      refclock_atom.c refclock_bancomm.c refclock_chronolog.c \
 +      refclock_chu.c refclock_conf.c refclock_datum.c refclock_dumbclock.c \
 +      refclock_fg.c refclock_gpsvme.c refclock_heath.c refclock_hopfser.c \
 +      refclock_hopfpci.c refclock_hpgps.c refclock_irig.c refclock_jjy.c \
 +      refclock_jupiter.c refclock_leitch.c refclock_local.c \
 +      refclock_msfees.c refclock_mx4200.c refclock_nmea.c refclock_oncore.c \
 +      refclock_palisade.c refclock_palisade.h refclock_parse.c \
 +      refclock_pcf.c refclock_pst.c refclock_ptbacts.c refclock_shm.c \
 +      refclock_tpro.c refclock_trak.c refclock_true.c refclock_tt560.c \
-       refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c
+       refclock_ulink.c refclock_usno.c refclock_wwv.c refclock_wwvb.c \
+       refclock_zyfer.c
  
  $(PROGRAMS): $(LDADD)
  

diff --cc ntpd/refclock_conf.c
index 10f4089c4495f51d83c696f75576338643eb3357,efe1f823d6ff21c5d2b6e061b6e72eb52393204a..dd8333a0031ab206d81a0cc98d8aa9b47ec7574e
--- 1/ntpd/refclock_conf.c
--- 2/ntpd/refclock_conf.c
+++ b/ntpd/refclock_conf.c
@@@ -246,12 -246,12 +246,18 @@@ extern  struct refclock refclock_jjy
  #define       refclock_jjy refclock_none
  #endif
  
 +#ifdef CLOCK_TT560
 +extern        struct refclock refclock_tt560;
 +#else
 +#define       refclock_tt560 refclock_none
 +#endif
 +
+ #ifdef CLOCK_ZYFER
+ extern        struct refclock refclock_zyfer;
+ #else
+ #define       refclock_zyfer refclock_none
+ #endif
+ 
  /*
   * Order is clock_start(), clock_shutdown(), clock_poll(),
   * clock_control(), clock_init(), clock_buginfo, clock_flags;
@@@ -300,7 -300,7 +306,8 @@@ struct refclock *refclock_conf[] = 
        &refclock_hopfser,      /* 38 REFCLK_HOPF_SERIAL */
        &refclock_hopfpci,      /* 39 REFCLK_HOPF_PCI */
        &refclock_jjy,          /* 40 REFCLK_JJY */
-       &refclock_tt560         /* 41 REFCLK_TT560 */
 -      &refclock_zyfer         /* 41 REFCLK_ZYFER */
++      &refclock_tt560,        /* 41 REFCLK_TT560 */
++      &refclock_zyfer         /* 42 REFCLK_ZYFER */
  };
  
  u_char num_refclock_conf = sizeof(refclock_conf)/sizeof(struct refclock *);