11 files changed, 139 insertions, 42 deletions

diff --git a/tools/check/check_brctl b/tools/check/check_brctl
index 6b8250f5cc..e926120235 100755
--- a/tools/check/check_brctl
+++ b/tools/check/check_brctl
@@ -1,10 +1,27 @@
-#!/bin/bash
+#!/bin/sh
 # CHECK-INSTALL
 
-function error {
-   echo
-   echo '  *** Check for the bridge control utils (brctl) FAILED'
-   exit 1
-}
+RC=0
 
-which brctl 1>/dev/null 2>&1 || error
+case ${OS} in
+OpenBSD|NetBSD|FreeBSD)
+	# These systems have a bridge builtin
+	TOOL="brconfig"
+	which ${TOOL} 1>/dev/null 2>&1 || RC=1 
+	;;
+Linux)
+	TOOL="brctl"
+	which ${TOOL} 1>/dev/null 2>&1 || RC=1
+	;;
+*)
+	TOOL=""
+	echo "Unknown OS" && RC=1
+	;;
+esac
+
+if test ${RC} -ne 0; then
+	echo
+	echo " *** Check for the bridge control utils (${TOOL}) FAILED"
+fi
+
+exit ${RC} 
diff --git a/tools/check/check_crypto_lib b/tools/check/check_crypto_lib
new file mode 100755
index 0000000000..02e0d1821c
--- /dev/null
+++ b/tools/check/check_crypto_lib
@@ -0,0 +1,11 @@
+#!/bin/bash
+# CHECK-BUILD CHECK-INSTALL
+
+function error {
+    echo
+    echo "  *** Check for crypto library FAILED"
+    exit 1
+}
+
+set -e
+ldconfig -p | grep -q libcrypto.so || error
diff --git a/tools/check/check_iproute b/tools/check/check_iproute
index c990349a9b..35af9a4c4b 100755
--- a/tools/check/check_iproute
+++ b/tools/check/check_iproute
@@ -1,11 +1,26 @@
-#!/bin/bash
+#!/bin/sh
 # CHECK-INSTALL
 
-function error {
-   echo
-   echo '  *** Check for iproute (ip addr) FAILED'
-   exit 1
-}
+RC=0
 
-ip addr list 1>/dev/null 2>&1 || error
+case ${OS} in
+OpenBSD|NetBSD|FreeBSD)
+	TOOL="ifconfig"
+	eval ${TOOL} -a 1>/dev/null 2>&1 || RC=1 
+	;;
+Linux)
+	TOOL="ip addr"
+	eval ${TOOL} list 1>/dev/null 2>&1 || RC=1 
+	;;
+*)
+	TOOL=""
+	echo "Unknown OS" && RC=1 
+	;;
+esac
 
+if test ${RC} -ne 0; then
+	echo
+	echo " *** Check for iproute (${TOOL}) FAILED"
+fi
+
+exit ${RC} 
diff --git a/tools/check/check_openssl_devel b/tools/check/check_openssl_devel
new file mode 100755
index 0000000000..fe9d0106d7
--- /dev/null
+++ b/tools/check/check_openssl_devel
@@ -0,0 +1,11 @@
+#!/bin/bash
+# CHECK-BUILD
+
+function error {
+    echo
+    echo "  *** Check for openssl headers FAILED"
+    exit 1
+}
+
+set -e
+[ -e /usr/include/openssl/md5.h ] || error
diff --git a/tools/check/check_python b/tools/check/check_python
index a30b0690a2..e56f5a9684 100755
--- a/tools/check/check_python
+++ b/tools/check/check_python
@@ -1,10 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
-function error {
-    echo
-    echo "  *** Check for Python version >= 2.2 FAILED"
-    exit 1
-}
+RC=0
 
-python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || error
+python -V 2>&1 | cut -d ' ' -f 2 | grep -q '^2.[2345]' || RC=1
+
+if test ${RC} -ne 0; then
+	echo
+	echo " *** Check for Python version >= 2.2 FAILED"
+fi
+
+exit ${RC} 
diff --git a/tools/check/check_python_devel b/tools/check/check_python_devel
new file mode 100755
index 0000000000..1074f4cf07
--- /dev/null
+++ b/tools/check/check_python_devel
@@ -0,0 +1,16 @@
+#!/bin/bash
+# CHECK-BUILD
+
+function error {
+    echo
+    echo "  *** Check for python development environment FAILED"
+    exit 1
+}
+
+python -c '
+import os.path, sys
+for p in sys.path:
+	if os.path.exists(p + "/config/Makefile"):
+		sys.exit(0)
+sys.exit(1)
+' || error
diff --git a/tools/check/check_hotplug b/tools/check/check_udev
index 999c7d8e2e..2dd226ac46 100644..100755
--- a/tools/check/check_hotplug
+++ b/tools/check/check_udev
@@ -3,7 +3,7 @@
 
 function error {
    echo
-   echo '  *** Check for the hotplug scripts (hotplug) FAILED'
+   echo '  *** Check for udev/hotplug FAILED'
    exit 1
 }
 [ -x "$(which udevinfo)" ] && \
diff --git a/tools/check/check_x11_devel b/tools/check/check_x11_devel
new file mode 100755
index 0000000000..7154331000
--- /dev/null
+++ b/tools/check/check_x11_devel
@@ -0,0 +1,11 @@
+#!/bin/bash
+# CHECK-BUILD
+
+function error {
+    echo
+    echo "  *** Check for x11 headers FAILED"
+    exit 1
+}
+
+set -e
+[ -e /usr/include/X11/keysymdef.h ] || error
diff --git a/tools/check/check_zlib_devel b/tools/check/check_zlib_devel
index 4986b4403e..108e06a616 100755
--- a/tools/check/check_zlib_devel
+++ b/tools/check/check_zlib_devel
@@ -1,11 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 # CHECK-BUILD
 
-function error {
-    echo
-    echo "  *** Check for zlib headers FAILED"
-    exit 1
-}
+RC=0
 
 set -e
-[ -e /usr/include/zlib.h ] || error
+test -r /usr/include/zlib.h || RC=1
+
+if test ${RC} -ne 0; then
+	echo
+	echo " *** Check for zlib headers FAILED"
+fi 
+
+exit ${RC}
diff --git a/tools/check/check_zlib_lib b/tools/check/check_zlib_lib
index 8820a30371..92d879ceda 100755
--- a/tools/check/check_zlib_lib
+++ b/tools/check/check_zlib_lib
@@ -1,11 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 # CHECK-BUILD CHECK-INSTALL
 
-function error {
-    echo
-    echo "  *** Check for zlib library FAILED"
-    exit 1
-}
+RC=0
 
 set -e
-ldconfig -p | grep -q libz.so || error
+ldconfig -v 2>&1 | grep -q libz.so || RC=1
+
+if test ${RC} -ne 0; then
+	echo
+	echo " *** Check for zlib library FAILED"
+fi
+
+exit ${RC} 
diff --git a/tools/check/chk b/tools/check/chk
index 7859760bd7..d8eb2f17e3 100755
--- a/tools/check/chk
+++ b/tools/check/chk
@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-function usage {
+func_usage ()
+{
     echo "Usage:"
-    echo "\t$0 [build|install|clean]"
+    echo "	$0 [build|install|clean]"
     echo
     echo "Check suitability for Xen build or install."
     echo "Exit with 0 if OK, 1 if not."
@@ -12,7 +13,13 @@ function usage {
     exit 1
 }
 
-export PATH=${PATH}:/sbin:/usr/sbin
+PATH=${PATH}:/sbin:/usr/sbin
+OS=`uname -s`
+export PATH OS
+
+if test "${OS}" = "SunOS"; then
+	exit 0
+fi
 
 case $1 in
     build)
@@ -25,7 +32,7 @@ case $1 in
         exit 0
         ;;
     *)
-        usage
+        func_usage
         ;;
 esac
 
@@ -54,4 +61,4 @@ for f in check_* ; do
     fi
 done
 
-exit $failed
+exit ${failed}