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

bk: 4cb3c9c16DaIIKR6x7Hmf9IZUfj6wg

diff --git a/ChangeLog b/ChangeLog
index 2b0538378ab67640a4883e6626fd92705e3e1f7f..12cb85f991eb0275ba14045a0ec39591f6102bc6 100644 (file)
--- 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 8b1b224097ec1e1097074afc73e640f7bdad96be..96df9459e929be997228b8c9cb17d5d9751097b8 100644 (file)
--- 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 32fd39cb57289065b834838c9888b4609248e315..5f57818f9a08da5146ff246cd7601cf7d05a8aae 100644 (file)
--- 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]),