--- projects/cms/source/server/configure	2000/12/13 18:34:09	1.2
+++ projects/cms/source/server/configure	2001/03/14 23:24:21	1.12
@@ -1,49 +1,61 @@
 #!/bin/sh
 
+#
+# i-scream Distributed Centralised Monitoring System
+# Server configure script
+#
+# $Id: configure,v 1.12 2001/03/14 23:24:21 tdb Exp $
+#
+
+## Config
+
+# HTTP Server. This is the source of all downloads.
 HTTPSERVER="http://killigrew.ukc.ac.uk/"
 
-echo "Generating Makefile includes"
-echo "SERVERROOT="`pwd` > Config.inc
-echo "include $(SERVERROOT)/Config2.inc" >> Config.inc
+# This script uses wget, set it's path and parameters here
+WGETPARAM="-nv"
+WGET="/usr/local/bin/wget ${WGETPARAM}"
 
-echo "Checking for required libraries"
-cd build/lib
+# This should always be the same
+SRCROOT=`pwd`
 
-if test -r "idl.jar"; then \
-  echo "  idl.jar found"; \
-else \
-  echo "  idl.jar not found, fetching from ${HTTPSERVER}idl.jar"; \
-  wget -nv ${HTTPSERVER}idl.jar; \
-fi
+## Library check
 
-if test -r "jacorb.jar"; then \
-  echo "  jacorb.jar found"; \
-else \
-  echo "  jacorb.jar not found, fetching from ${HTTPSERVER}jacorb.jar"; \
-  wget -nv ${HTTPSERVER}jacorb.jar; \
-fi
+echo "> Checking for required libraries"
+cd build/lib
 
-if test -r "jaxp.jar"; then \
-  echo "  jaxp.jar found"; \
-else \
-  echo "  jaxp.jar not found, fetching from ${HTTPSERVER}jaxp.jar"; \
-  wget -nv ${HTTPSERVER}jaxp.jar; \
-fi
+LIBRARIES="crimson.jar idl.jar jacorb.jar jaxp.jar mm.mysql-2.0.4-bin.jar"
 
-if test -r "parser.jar"; then \
-  echo "  parser.jar found"; \
-else \
-  echo "  parser.jar not found, fetching from ${HTTPSERVER}parser.jar"; \
-  wget -nv ${HTTPSERVER}parser.jar; \
-fi
+for LIB in ${LIBRARIES}; do
+    
+    if test -r "${LIB}"; then \
+        echo "  + ${LIB} found"; \
+    else \
+        echo "  - ${LIB} not found, fetching from ${HTTPSERVER}${LIB}"; \
+        ${WGET} -nv ${HTTPSERVER}${LIB}; \
+    fi
+    
+done
 
-echo "Checking for jacorb.properties"
+## Check for jacorb properties file
+
+echo "> Checking for jacorb.properties"
 cd ${HOME}
 if test -r "jacorb.properties"; then \
-  echo "  jacorb.properties found"; \
+  echo "  + jacorb.properties found"; \
 else \
-  echo "  jacorb.properties not found, fetching from ${HTTPSERVER}jacorb.properties"; \
-  wget -nv ${HTTPSERVER}jacorb.properties; \
+  echo "  - jacorb.properties not found, fetching from ${HTTPSERVER}jacorb.properties"; \
+  ${WGET} ${HTTPSERVER}jacorb.properties; \
 fi
 
-echo "Configure Completed"
+## Write out the include file for the Makefile's
+
+echo "> Generating Makefile includes"
+echo "  + writing root of source tree"
+echo "SOURCEROOT=${SRCROOT}" > ${SRCROOT}/Config.inc
+echo "  + writing include"
+echo "include \$(SOURCEROOT)/Config2.inc" >> ${SRCROOT}/Config.inc
+
+echo "> Configure Completed"
+
+## End