Recover from the big merge.

bk: 3cfc63d0M4vxjNHEEKrR2D3KWvkYBQ

diff --git a/configure.in b/configure.in
index e3a0cb3dbf38089b1b203152d2e66c15418e2315..5cc68f05a84f7c189fd79ff1d1e98116162a1613 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2079,32 +2079,6 @@ if test "$ntp_ok" = "yes"; then
 fi
 AC_MSG_RESULT($ntp_ok)
 
-AC_MSG_CHECKING(Ultralink M320 WWVB receiver)
-AC_ARG_ENABLE(ULINK,
-    AC_HELP_STRING([--enable-ULINK], [+ Ultralink WWVB receiver]),
-    [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
-if test "$ntp_ok" = "yes"; then
-    ntp_refclock=yes
-    AC_DEFINE(CLOCK_TT560, , [TrueTime 560 IRIG-B decoder?])
-fi
-AC_MSG_RESULT($ntp_ok)
-
-AC_MSG_CHECKING(WWV receiver)
-AC_ARG_ENABLE(WWV,             [  --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_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(Ultralink M320 WWVB receiver)
 AC_ARG_ENABLE(ULINK,
     AC_HELP_STRING([--enable-ULINK], [+ Ultralink WWVB receiver]),
@@ -2599,19 +2573,6 @@ if test "$ans" = "yes"; then
 fi
 AC_MSG_RESULT($ans)
 
-AC_MSG_CHECKING(if we want QNX adjtime support)
-case "$host" in
- *-*-qnx*)
-    ans=yes
-    ;;
- *) ans=no
-    ;;
-esac
-if test "$ans" = "yes"; then
-    AC_DEFINE(NEED_QNX_ADJTIME, 1, [Do we need the qnx adjtime call?])
-fi
-AC_MSG_RESULT($ans)
-
 AC_CACHE_CHECK(if we can read kmem, ac_cv_var_can_kmem,
 [AC_ARG_ENABLE(kmem,           [  --enable-kmem           s read /dev/kmem for tick and/or tickadj],
     [ans=$enableval],