--- projects/cms/source/server/configure	2001/03/10 02:04:54	1.8
+++ projects/cms/source/server/configure	2001/11/25 19:46:35	1.14
@@ -1,56 +1,69 @@
 #!/bin/sh
 
-HTTPSERVER="http://killigrew.ukc.ac.uk/"
+#
+# i-scream Distributed Centralised Monitoring System
+# Server configure script
+#
+# $Id: configure,v 1.14 2001/11/25 19:46:35 tdb Exp $
+#
 
-echo "Generating Makefile includes"
-echo "SERVERROOT="`pwd` > Config.inc
-echo "include \$(SERVERROOT)/Config2.inc" >> Config.inc
+## Config
 
-echo "Checking for required libraries"
-cd build/lib
+# HTTP Server. This is the source of all downloads.
+HTTPSERVER="http://www.i-scream.org.uk/downloads/lib/"
 
-if test -r "crimson.jar"; then \
-  echo "  crimson.jar found"; \
-else \
-  echo "  crimson.jar not found, fetching from ${HTTPSERVER}crimson.jar"; \
-  /usr/local/bin/wget -nv ${HTTPSERVER}crimson.jar; \
+# This script uses wget, set it's path and parameters here
+WGETPARAM="-nv"
+if test -x /usr/bin/wget; then
+    WGET="/usr/bin/wget ${WGETPARAM}"
+else
+    if test -x /usr/local/bin/wget; then
+        WGET="/usr/local/bin/wget ${WGETPARAM}"
+    else
+        WGET="wget ${WGETPARAM}";
+    fi
 fi
 
-if test -r "idl.jar"; then \
-  echo "  idl.jar found"; \
-else \
-  echo "  idl.jar not found, fetching from ${HTTPSERVER}idl.jar"; \
-  /usr/local/bin/wget -nv ${HTTPSERVER}idl.jar; \
-fi
+# This should always be the same
+SRCROOT=`pwd`
 
-if test -r "jacorb.jar"; then \
-  echo "  jacorb.jar found"; \
-else \
-  echo "  jacorb.jar not found, fetching from ${HTTPSERVER}jacorb.jar"; \
-  /usr/local/bin/wget -nv ${HTTPSERVER}jacorb.jar; \
-fi
+## Library check
 
-if test -r "jaxp.jar"; then \
-  echo "  jaxp.jar found"; \
-else \
-  echo "  jaxp.jar not found, fetching from ${HTTPSERVER}jaxp.jar"; \
-  /usr/local/bin/wget -nv ${HTTPSERVER}jaxp.jar; \
-fi
+echo "> Checking for required libraries"
+cd build/lib
 
-if test -r "mm.mysql-2.0.2-bin.jar"; then \
-  echo "  mm.mysql-2.0.2-bin.jar found"; \
-else \
-  echo "  mm.mysql-2.0.2-bin.jar not found, fetching from ${HTTPSERVER}mm.mysql-2.0.2-bin.jar"; \
-  /usr/local/bin/wget -nv ${HTTPSERVER}mm.mysql-2.0.2-bin.jar; \
-fi
+LIBRARIES="crimson.jar idl.jar jacorb.jar jaxp.jar mm.mysql-2.0.4-bin.jar"
 
-echo "Checking for jacorb.properties"
+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
+
+## 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