Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity

into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55843493IiMODmrIt_K4S8MzyjFYnw

diff --cc tests/libntp/Makefile.am
index ac509eb1783d709e69897fdf3cd7345e9b3845ef,f007d867e9c3914757fc8eec0a0e68cbb47c3d57..b19a4641219d94e6a05c6c245cd65340b20b15fd
--- 1/tests/libntp/Makefile.am
--- 2/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -24,9 -25,9 +25,10 @@@ check_PROGRAMS =             
        test-numtohost          \
        test-octtoint           \
        test-refnumtoa          \
 +      test-ssl_init           \
        test-socktoa            \
        test-statestr           \
+       test-strtolfp       \
        test-timespecops        \
        test-timevalops         \
        test-uglydate           \
@@@ -98,10 -99,10 +100,10 @@@ tests_SOURCES =                                   
        recvbuff.cpp            \
        g_refnumtoa.cpp         \
        sfptostr.cpp            \
 -      socktoa.cpp             \
 -      ssl_init.cpp            \
 +      g_socktoa.cpp           \
 +      g_ssl_init.cpp          \
        g_statestr.cpp          \
-       strtolfp.cpp            \
+       g_strtolfp.cpp          \
        g_timespecops.cpp       \
        timestructs.cpp         \
        g_timevalops.cpp        \
@@@ -130,11 -132,9 +133,12 @@@ BUILT_SOURCES +=                 
        $(srcdir)/run-numtohost.c       \
        $(srcdir)/run-octtoint.c        \
        $(srcdir)/run-refnumtoa.c       \
 +      $(srcdir)/run-ssl_init.c        \
        $(srcdir)/run-socktoa.c         \
        $(srcdir)/run-statestr.c        \
+       $(srcdir)/run-strtolfp.c        \
 +      $(srcdir)/run-timevalops.c      \
 +      $(srcdir)/run-timespecops.c     \
        $(srcdir)/run-uglydate.c        \
        $(srcdir)/run-vi64ops.c         \
        $(srcdir)/run-ymd2yd.c          \