Merge

bk: 3d3257d2VWcGwWa8Y_Ilv-0LHMkqlQ

diff --cc configure.in
index 37d2fc40e99b0850763902f5f8bd1b5dfe633cf7,8503d6cded124c45adb3b2c587bc3e0251b839ab..f810da657141acae8f60d431d76b5ad52f5860bf
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2,10 -2,10 +2,10 @@@ dnl -*-fundamental-*
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(ntpd/ntp_refclock.c)
  AC_CANONICAL_SYSTEM
- AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host")
+ AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
  AM_CONFIG_HEADER(config.h)
  AC_ARG_PROGRAM
 -AM_INIT_AUTOMAKE(ntp, 4.1.1a)
 +AM_INIT_AUTOMAKE(ntp, 4.1.72b)
  AC_PREREQ(2.52)               # We need the cross-compile-aware SIZEOF stuff.
  
  ac_cv_var_atom_ok=no
@@@ -1831,9 -1831,9 +1831,9 @@@ if test "$ntp_ok" = "yes"; the
  fi
  AC_MSG_RESULT($ntp_ok)
  
- AC_MSG_CHECKING(Sun IRIG audio decoder)
+ AC_MSG_CHECKING(IRIG audio decoder)
  AC_ARG_ENABLE(IRIG,
-     AC_HELP_STRING([--enable-IRIG], [s Sun IRIG audio decoder]),
 -    AC_HELP_STRING([--enable-IRIG], [s iRIG audio decoder]),
++    AC_HELP_STRING([--enable-IRIG], [s IRIG audio decoder]),
      [ntp_ok=$enableval],
      [case "$ntp_eac$ntp_canaudio" in
       *no*)    ntp_ok=no  ;;
@@@ -2101,7 -2101,7 +2101,7 @@@ AC_ARG_ENABLE(ULINK
      [ntp_ok=$enableval], [ntp_ok=$ntp_eac])
  if test "$ntp_ok" = "yes"; then
      ntp_refclock=yes
-     AC_DEFINE(CLOCK_ULINK)
 -    AC_DEFINE(CLOCK_ULINK, 1, [Ultralink M320 WWVB receiver])
++    AC_DEFINE(CLOCK_ULINK, 1, [Ultralink M320 WWVB receiver?])
  fi
  AC_MSG_RESULT($ntp_ok)
  
@@@ -2476,20 -2477,63 +2476,20 @@@ AC_ARG_WITH(crypto
  [ans=$withval], [ans=yes])
  case "$ans" in
   no) ;;
 - yes|rsaref|openssl)
 -    case "$ans" in
 -     yes|rsaref) # Just "rsaref" when OpenSSL is ready
 + yes|openssl)
 +    if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
 +    then
        ans=no
 -      ;;
 -     *)
 -      if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
 -      then
 -          ans=no
 -      else
 -          # We have OpenSSL inc/lib - use them.
 -          ans=openssl
 -          CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
 -          LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
 -          LIBS="$LIBS -lcrypto"
 -          AC_DEFINE(DES, 1, [Use DES?])
 -          AC_DEFINE(OPENSSL, , [Use OpenSSL?])
 -          AC_DEFINE(PUBKEY, , [Public key?])
 -      fi
 -      ;;
 -    esac
 -
 -    case "$ans" in
 -     no)
 -      if test -f $srcdir/rsaref2/source/digit.c
 -      then
 -          ans=rsaref
 -          RSAOBJS=digit.o
 -          RSASRCS="digit.c digit.h"
 -          RSADIR=rsaref2
 -      fi
 -      if test -f $srcdir/rsaeuro1/source/rsaeuro.h
 -      then
 -          ans=rsaref
 -            RSAOBJS="md4c.o shsc.o"
 -            RSASRCS="md4c.c shsc.c"
 -          RSADIR=rsaeuro1
 -      fi
 -      if test "$ans" = "rsaref"; then
 -          LIBRSAREF=../librsaref/librsaref.a
 -          MAKE_LIBRSAREF=librsaref.a
 -          AC_DEFINE(DES, 1, [Use DES?])
 -          AC_DEFINE(PUBKEY)
 -          AC_DEFINE(RSAREF, , [Use RSAREF?])
 -      fi
 -      ;;
 -    esac
 -    ;;
 -esac
 -AM_CONDITIONAL(isRSAREF, test x$RSADIR = xrsaref2)
 -AM_CONDITIONAL(isRSAEURO, test x$RSADIR = xrsaeuro1)
 -AC_SUBST(AUTOKEY)
 -case "$ans" in
 - no) ;;
 - *)
 -    AC_DEFINE(AUTOKEY, , [Autokey?])
 -    AUTOKEY=1
 +    else
 +      # We have OpenSSL inc/lib - use them.
 +      ans=openssl
 +      CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
 +      LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
 +      LIBS="$LIBS -lcrypto"
-       MAKE_NTP_KEYGEN=ntp-keygen
++      MAKE_NTP_GENKEYS=ntp-genkeys
 +      AC_DEFINE(OPENSSL, , [Use OpenSSL?])
 +      AC_CHECK_FUNCS(EVP_md2 EVP_mdc2)
 +    fi
      ;;
  esac
  AC_MSG_CHECKING(for the level of crypto support)