--- projects/cms/source/conient/configure	2001/03/14 21:56:00	1.3
+++ projects/cms/source/conient/configure	2003/02/05 19:35:04	1.8
@@ -4,27 +4,35 @@
 # i-scream Distributed Centralised Monitoring System
 # Conient configure script
 #
-# $Id: configure,v 1.3 2001/03/14 21:56:00 tdb Exp $
+# $Id: configure,v 1.8 2003/02/05 19:35:04 tdb Exp $
 #
 
 ## Config
 
 # HTTP Server. This is the source of all downloads.
-HTTPSERVER="http://killigrew.ukc.ac.uk/"
+HTTPSERVER="http://www.i-scream.org.uk/downloads/lib/"
 
 # This script uses wget, set it's path and parameters here
 WGETPARAM="-nv"
-WGET="/usr/local/bin/wget ${WGETPARAM}"
+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
 
 # This should always be the same
-PWD=`pwd`
+SRCROOT=`pwd`
 
 ## Library check
 
 echo "> Checking for required libraries"
 cd build/lib
 
-LIBRARIES="crimson.jar jaxp.jar iscream-util.jar"
+LIBRARIES="crimson.jar jaxp.jar iscream_util.jar"
 
 for LIB in ${LIBRARIES}; do
     
@@ -32,7 +40,7 @@ for LIB in ${LIBRARIES}; do
         echo "  + ${LIB} found"; \
     else \
         echo "  - ${LIB} not found, fetching from ${HTTPSERVER}${LIB}"; \
-        /usr/local/bin/wget -nv ${HTTPSERVER}${LIB}; \
+        ${WGET} ${HTTPSERVER}${LIB}; \
     fi
     
 done
@@ -41,9 +49,9 @@ done
 
 echo "> Generating Makefile includes"
 echo "  + writing root of source tree"
-echo "SOURCEROOT=${PWD}" > ${PWD}/Config.inc
+echo "SOURCEROOT=${SRCROOT}" > ${SRCROOT}/Config.inc
 echo "  + writing include"
-echo "include \$(SOURCEROOT)/Config2.inc" >> ${PWD}/Config.inc
+echo "include \$(SOURCEROOT)/Config2.inc" >> ${SRCROOT}/Config.inc
 
 echo "> Configure Completed"