6 files changed, 45 insertions, 8 deletions
diff --git a/contrib/ntp/sntp/m4/ltversion.m4 b/contrib/ntp/sntp/m4/ltversion.m4
index 9c7b5d4..07a8602 100644
--- a/contrib/ntp/sntp/m4/ltversion.m4
+++ b/contrib/ntp/sntp/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/contrib/ntp/sntp/m4/ntp_libntp.m4 b/contrib/ntp/sntp/m4/ntp_libntp.m4
index 3aa3dff..89b94b6 100644
--- a/contrib/ntp/sntp/m4/ntp_libntp.m4
+++ b/contrib/ntp/sntp/m4/ntp_libntp.m4
@@ -912,6 +912,9 @@ case "$ntp_cv_hdr_def_sigio" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-univel-sysv*)
 	ans=no
 	;;
@@ -976,6 +979,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[[4-9]]*)
 	# XXX Only verified thru AIX6
 	ans=no
@@ -1035,6 +1041,9 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
+     *-stratus-vos)
+	ans=no
+	;;
      *-*-aix[[4-9]]*)
 	# XXX Only verified thru AIX6
 	ans=no
diff --git a/contrib/ntp/sntp/m4/ntp_openssl.m4 b/contrib/ntp/sntp/m4/ntp_openssl.m4
index 9d9189c..0e38aba 100644
--- a/contrib/ntp/sntp/m4/ntp_openssl.m4
+++ b/contrib/ntp/sntp/m4/ntp_openssl.m4
@@ -360,7 +360,16 @@ case "$ntp_openssl:$GCC" in
     CFLAGS_NTP="$CFLAGS_NTP -Wstrict-prototypes"
 esac
 
+# Because we don't want -Werror for the EVP_MD_do_all_sorted check
 CFLAGS="$NTPO_SAVED_CFLAGS"
+
+case "$ntp_openssl" in
+ yes)
+    LIBS="$NTPO_SAVED_LIBS $LDADD_NTP"
+    AC_CHECK_FUNCS([EVP_MD_do_all_sorted])
+    ;;
+esac
+
 CPPFLAGS="$NTPO_SAVED_CPPFLAGS"
 LIBS="$NTPO_SAVED_LIBS"
 AS_UNSET([NTPO_SAVED_CFLAGS])
diff --git a/contrib/ntp/sntp/m4/ntp_unitytest.m4 b/contrib/ntp/sntp/m4/ntp_unitytest.m4
new file mode 100644
index 0000000..dd7ad3d
--- /dev/null
+++ b/contrib/ntp/sntp/m4/ntp_unitytest.m4
@@ -0,0 +1,19 @@
+dnl ######################################################################
+dnl NTP_UNITYBUILD -  Unity build support
+dnl shared by top-level and sntp/configure.ac
+AC_DEFUN([NTP_UNITYBUILD], [
+# We may not need have_unity
+have_unity=false
+AC_PATH_PROG([PATH_RUBY], [ruby])
+case "$PATH_RUBY" in
+ /*)
+    have_unity=true
+    ;;
+ *) PATH_RUBY="false"
+    ;;
+esac
+# We may not need UNITYBUILD_AVAILABLE
+AM_CONDITIONAL([UNITYBUILD_AVAILABLE], [$have_unity])
+
+])
+dnl ======================================================================
diff --git a/contrib/ntp/sntp/m4/os_cflags.m4 b/contrib/ntp/sntp/m4/os_cflags.m4
index 2ac4ffc..a2161e6 100644
--- a/contrib/ntp/sntp/m4/os_cflags.m4
+++ b/contrib/ntp/sntp/m4/os_cflags.m4
@@ -45,7 +45,7 @@ AC_DEFUN([NTP_OS_CFLAGS], [
 		ntp_os_cflags="-Ae -Wp,-H18816"
 		;;
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 hpux*)
 	    case "$GCC" in
@@ -55,7 +55,7 @@ AC_DEFUN([NTP_OS_CFLAGS], [
 		# use Ansi compiler on HPUX
 		ntp_os_cflags="-Ae"
 	    esac
-	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE"
+	    ntp_os_cflags="${ntp_os_cflags} -D_HPUX_SOURCE -D__STDC_VERSION__=199901L"
 	    ;;
 	 irix6*)
 	    case "$CC" in
diff --git a/contrib/ntp/sntp/m4/version.m4 b/contrib/ntp/sntp/m4/version.m4
index 945d9cb..b83123f 100644
--- a/contrib/ntp/sntp/m4/version.m4
+++ b/contrib/ntp/sntp/m4/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[4.2.8p2])
+m4_define([VERSION_NUMBER],[4.2.8p3])