--- projects/cms/source/server/configure 2001/03/14 22:21:18 1.11 +++ projects/cms/source/server/configure 2002/02/07 17:15:18 1.16 @@ -4,17 +4,25 @@ # i-scream Distributed Centralised Monitoring System # Server configure script # -# $Id: configure,v 1.11 2001/03/14 22:21:18 tdb Exp $ +# $Id: configure,v 1.16 2002/02/07 17:15:18 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 SRCROOT=`pwd` @@ -24,7 +32,7 @@ SRCROOT=`pwd` echo "> Checking for required libraries" cd build/lib -LIBRARIES="crimson.jar idl.jar jacorb.jar jaxp.jar mm.mysql-2.0.4-bin.jar" +LIBRARIES="crimson.jar idl.jar jacorb.jar jaxp.jar mm.mysql-2.0.11-bin.jar pircbot.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} -nv ${HTTPSERVER}${LIB}; \ fi done @@ -45,7 +53,7 @@ if test -r "jacorb.properties"; then \ echo " + jacorb.properties found"; \ else \ echo " - jacorb.properties not found, fetching from ${HTTPSERVER}jacorb.properties"; \ - wget -nv ${HTTPSERVER}jacorb.properties; \ + ${WGET} ${HTTPSERVER}jacorb.properties; \ fi ## Write out the include file for the Makefile's