Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3cc64246hb94jDrbxSvdLvFnDziVwQ

diff --cc configure.in
index a161805c514558bb98f93dc0a922d4c3fa9fa661,166d778181c91f7fdcfe750afc96861f61a5a445..4746403be077df70f5b1469e6ea5e7ce4c0435a0
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1845,9 -1756,26 +1845,27 @@@ if test "$ntp_ok" = "yes"; the
  fi
  AC_MSG_RESULT($ntp_ok)
  
+ AC_MSG_CHECKING(for hopf serial clock device)
+ AC_ARG_ENABLE(HOPFSERIAL,     [  --enable-HOPFSERIAL     + hopf serial clock device],
+       [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+   if test "$ntp_ok" = "yes"; then
+       ntp_refclock=yes
+       AC_DEFINE(CLOCK_HOPF_SERIAL)
+   fi
+   AC_MSG_RESULT($ntp_ok)
+ 
+ AC_MSG_CHECKING(for hopf PCI clock 6039)
+ AC_ARG_ENABLE(HOPFPCI,                [  --enable-HOPFPCI        + hopf 6039 PCI board],
+       [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
+ if test "$ntp_ok" = "yes"; then
+     ntp_refclock=yes
+     AC_DEFINE(CLOCK_HOPF_PCI)
+ fi
+ AC_MSG_RESULT($ntp_ok)
+ 
  AC_MSG_CHECKING(HP 58503A GPS receiver)
 -AC_ARG_ENABLE(HPGPS,          [  --enable-HPGPS          + HP 58503A GPS receiver],
 +AC_ARG_ENABLE(HPGPS,
 +    AC_HELP_STRING([--enable-HPGPS], [+ HP 58503A GPS receiver]),
      [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
  if test "$ntp_ok" = "yes"; then
      ntp_refclock=yes