Merge

bk: 3bcbb03azF2sDwOVoSJkYhnZvFGqRw

diff --cc libntp/Makefile.am
index 945cc7eaa467ef8122d6bfec7725cccf7635e3a1,56448af5062e690f7c9911b691304e154ab3ad33..ebf33b582fcb4838f9d9c427244cfc66942c4511
--- 1/libntp/Makefile.am
--- 2/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@@ -13,11 -13,11 +13,11 @@@ libntp_a_SOURCES = a_md5encrypt.c adjti
        tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
        mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
        icom.c audio.c
- EXTRA_libntp_a_SOURCES = adjtimex.c log.c mktime.c random.c snprintf.c \
-       strdup.c strerror.c
+ EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
+ #     mktime.c snprintf.c strdup.c strerror.c
  libntp_a_LIBADD = @LIBOBJS@
  libntp_a_DEPENDENCIES = @LIBOBJS@
 -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 +INCLUDES = -I$(top_srcdir)/include
  ETAGS_ARGS = Makefile.am
  
  noinst_HEADERS = lib_strbuf.h log.h