RedHat and Ubuntu can't even agree on where the freaking "test"

program lives, so even autoconf wouldn't be able to sort this out
without relying on a sane $PATH setting.  Enough already.  Use
unadorned program names, and if that bites the user during the build
process, blame it on the penguins.  Closes #368.

svn path=/trunk/; revision=4937

1 files changed, 26 insertions, 11 deletions

diff --git a/buildtools/trang-not-found b/buildtools/trang-not-found
index 56574ea8..69a481e6 100755
--- a/buildtools/trang-not-found
+++ b/buildtools/trang-not-found
@@ -1,7 +1,31 @@
 #!/bin/sh -
 # $Id$
 
-/bin/cat <<EOF
+# Copyright (C) 2012  Internet Systems Consortium ("ISC")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# This script formerly used absolute paths for all (ie, both) programs
+# it called, as any sane script should, but it met defeat at the hands
+# of the penguinistas, who can't even agree on whether to keep the
+# "test" program in /bin or /usr/bin, thus creating a second-order
+# problem of finding the test program to test for the existence of the
+# program we really wanted to run.  Enough already.
+#
+# So: If this script breaks because it can't find the "cat" or "touch"
+# programs on your path, fix your path.
+
+cat <<EOF
 
 WARNING:
 
@@ -17,13 +41,4 @@ Suppressing this warning for file: $2
 
 EOF
 
-# You can thank Red Hat for the following silliness.
-
-for touch in /usr/bin/touch /bin/touch
-do
-    if /bin/test -x $touch
-    then
-	$touch "$2"
-	exit
-    fi
-done
+touch "$2"