From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Oct 2010 02:36:49 +0000 (-0400)
Subject: [Bug 1660]: On some systems, test is in /usr/bin, not /bin
X-Git-Tag: NTP_4_2_7P62~5^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b1ff2bc37610992940ca151179f62ac1ebfecd5;p=thirdparty%2Fntp.git

[Bug 1660]: On some systems, test is in /usr/bin, not /bin

bk: 4cb3c9c16DaIIKR6x7Hmf9IZUfj6wg
---

diff --git a/ChangeLog b/ChangeLog
index 2b0538378..12cb85f99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 * [Bug 1643]: Range-check the decoding of the RIPE-NCC status codes.
 * [Bug 1644]: cvo.sh should use lsb_release to identify linux distros.
+* [Bug 1660]: On some systems, test is in /usr/bin, not /bin.
 
 ---
 (4.2.6p3-RC2) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/Makefile.am b/Makefile.am
index 8b1b22409..96df9459e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,7 +167,7 @@ dist-hook:
 
 CommitLog: FRC.CommitLog
 	cd $(srcdir)					\
-	&& /bin/test -e CommitLog			\
+	&& $(PATH_TEST) -e CommitLog			\
 		-a SCCS/s.ChangeSet -ot CommitLog	\
 	|| scripts/genCommitLog
 
diff --git a/configure.ac b/configure.ac
index 32fd39cb5..5f57818f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,8 +331,10 @@ AC_PROG_LN_S
 AC_PROG_GCC_TRADITIONAL
 AC_C_VOLATILE
 AC_ISC_POSIX
-AC_PATH_PROG(PATH_SH, sh)
+
 AC_PATH_PROG(PATH_PERL, perl)
+AC_PATH_PROG(PATH_SH, sh)
+AC_PATH_PROG(PATH_TEST, test)
 
 AC_ARG_WITH(net-snmp-config,
 	AC_HELP_STRING([--with-net-snmp-config], [+ =net-snmp-config]),