Make sure "which" is present before we verify our tools. Add "env" to

the list of programs to check.  Make sure our python scripts start with
"#!/usr/bin/env python" as recommended at

  http://www.python.org/doc/faq/library.html#how-do-i-make-a-python-script-executable-on-unix

svn path=/trunk/; revision=14871

4 files changed, 6 insertions, 2 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 59dd35b964..afb93da819 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -406,6 +406,7 @@ REQUIRED_TOOLS=\
 	$(SH)	\
 	$(YACC)	\
 	$(LEX)	\
+	env	\
 	grep	\
 	/usr/bin/find	\
 	$(PERL)	\
diff --git a/epan/dissectors/make-reg-dotc.py b/epan/dissectors/make-reg-dotc.py
index 5c1411cb9c..0ce7ed6029 100755
--- a/epan/dissectors/make-reg-dotc.py
+++ b/epan/dissectors/make-reg-dotc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Looks for registration routines in the protocol dissectors,
 # and assembles C code to call all the routines.
diff --git a/tools/cvsdiff-fix.py b/tools/cvsdiff-fix.py
index 17b5fc3be3..6d9ecd3f81 100755
--- a/tools/cvsdiff-fix.py
+++ b/tools/cvsdiff-fix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # cvsdiff-fix
 #
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 105e119b18..0650aab2cc 100644
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -4,6 +4,7 @@
 DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-01-17/packages"
 
 err_exit () {
+	echo ""
 	echo "ERROR: $1"
 	echo ""
 	exit 1
@@ -25,6 +26,8 @@ case "$1" in
 		usage
 	fi
 	echo "Checking for required applications:"
+	which which > /dev/null 2>&1 || \
+		err_exit "Can't find 'which'.  Unable to proceed."
 	for APP in $* ; do
 		APP_PATH=`cygpath --unix $APP`
 		if [ -x "$APP_PATH" -a ! -d "$APP_PATH" ] ; then