Unity test framework fixes

bk: 555b0f4apedmWH2_44G79qR62-3pVQ

diff --git a/configure.ac b/configure.ac
index 9b687b960af0e63c6e15757f865ba46027c32284..0cd0e482223f43eaf059971551a7867b543cfc96 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4343,7 +4343,7 @@ esac
 AM_CONDITIONAL([SAVECONFIG_ENABLED], [test x$ntp_saveconfig_enabled = x1])
 AC_MSG_RESULT([$ntp_ok])
 
-NTP_UNITYTEST
+NTP_UNITYBUILD
 
 dnl  gtest is needed for our tests subdirs. It would be nice if we could
 dnl  require a C++ compiler only if we will use gtest, but AC_PROG_CXX

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 0462fb1ccb06aa06e05b12525c85fbc815ecb89c..bcd592060ed0f12f57d3740fe6ef310715f701d3 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -137,7 +137,7 @@ AC_DEFINE([HAVE_TERMIOS], 1, [sntp does not care about TTY stuff])
 # Checks for library functions.
 AC_CHECK_FUNCS([socket])
 
-NTP_UNITYTEST
+NTP_UNITYBUILD
 # HMS: if we don't find c++ we should not look for gtest.
 AC_PROG_CXX
 NTP_GOOGLETEST

diff --git a/sntp/m4/ntp_unitytest.m4 b/sntp/m4/ntp_unitytest.m4
index 1f18535834e121a20aeed83256e6e0accd4cd41a..dd7ad3d184c48d91843881adfa0e7a68df808c6d 100644 (file)
--- a/sntp/m4/ntp_unitytest.m4
+++ b/sntp/m4/ntp_unitytest.m4
@@ -4,7 +4,7 @@ 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([ruby])
+AC_PATH_PROG([PATH_RUBY], [ruby])
 case "$PATH_RUBY" in
  /*)
     have_unity=true