From 13b8dbfcd864eddfe1fb88793e11e6f39cfd2c08 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Fri, 18 Mar 2005 13:08:05 +0000
Subject: [PATCH] better check for 'echo -n'

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1591 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/unix/config_proginfo | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/sc2/build/unix/config_proginfo b/sc2/build/unix/config_proginfo
index aeba1e712..812b4a8b1 100644
--- a/sc2/build/unix/config_proginfo
+++ b/sc2/build/unix/config_proginfo
@@ -43,7 +43,7 @@ PROG_echon_ACTION=""
 PROG_echon_VERSION=''
 PROG_echon_DETECT="echon_detect"
 echon_detect() {
-	local TEST
+	local TEST LOCATIONS LOCATION
 	
 	# Default echo (probably builtin)
 	TEST=`echo -n X`
@@ -53,11 +53,16 @@ echon_detect() {
 	fi
 
 	# External echo
-	TEST=`/bin/echo -n X`
-	if [ "$TEST" = X ]; then
-		PROG_echon_FILE="/bin/echo -n"
-		return 0;
-	fi
+	LOCATIONS="/bin/ /usr/ucb/"
+	for LOCATION in $LOCATIONS; do
+		if [ -x ${LOCATION}echo ]; then
+			TEST=`${LOCATION}echo -n X`
+			if [ "$TEST" = X ]; then
+				PROG_echon_FILE="${LOCATION}echo -n"
+				return 0;
+			fi
+		fi
+	done
 
 	# Using printf as echo
 	TEST=`printf %s X`