From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 19 May 2015 10:24:10 +0000 (+0000)
Subject: Unity test framework fixes
X-Git-Tag: NTP_4_3_40~6^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49a4cd3f83d3f65bb4be706026a20497c19cc745;p=thirdparty%2Fntp.git

Unity test framework fixes

bk: 555b0f4apedmWH2_44G79qR62-3pVQ
---

diff --git a/configure.ac b/configure.ac
index 9b687b960..0cd0e4822 100644
--- 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 0462fb1cc..bcd592060 100644
--- 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 1f1853583..dd7ad3d18 100644
--- 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