--- GOLD/axiom/configure 2005-06-05 05:59:28.000000000 +0200 +++ config/axiom/configure 2006-02-22 20:36:57.439491928 +0100 @@ -1,3 +1,5 @@ +#! /bin/sh + # The sysname function uses uname -s to try to decode what kind of # system to build. Currently the return value of uname is mapped as # Linux --> linux @@ -8,7 +10,8 @@ # # The solaris platform needs patch->gpatch, awk->gawk, tar->gtar -sysname () { +sysname () +{ if [ -f /etc/redhat-release ] ; then SYSNAME=`cat /etc/redhat-release` @@ -21,16 +24,16 @@ then SYSNAME=`uname -s` echo $SYSNAME - if [ "$SYSNAME" = "Linux" ] ; then SYSNAME=linux - elif [ "$SYSNAME" = "MINGW32_NT-5.1" ] ; then SYSNAME=windows - elif [ "$SYSNAME" = "SunOS" ] ; then SYSNAME=solaris9 - elif [ "$SYSNAME" = "freebsd" ] ; then SYSNAME=freebsd + if [ "$SYSNAME" == "Linux" ] ; then SYSNAME=linux + elif [ "$SYSNAME" == "MINGW32_NT-5.1" ] ; then SYSNAME=windows + elif [ "$SYSNAME" == "SunOS" ] ; then SYSNAME=solaris9 + elif [ "$SYSNAME" == "freebsd" ] ; then SYSNAME=freebsd else echo Your system name is $SYSNAME echo We do not know how to build for this kind of system echo Send a note to address@hidden about it echo - exit 0 + exit 1 fi fi @@ -39,7 +42,8 @@ # This function checks for the gawk command. # If it exists then AWKNAME is the complete pathname -checkgawk() { +checkgawk() +{ AWKNAME=`which gawk 2>>trace` if [ -n "$AWKNAME" ] ; then if [ -x $AWKNAME ] ; then @@ -51,7 +55,8 @@ # This function checks for the nawk command. # If it exists then AWKNAME is the complete pathname -checknawk() { +checknawk() +{ AWKNAME=`which nawk 2>>trace` if [ -n "$AWKNAME" ] ; then if [ -x $AWKNAME ] ; then @@ -63,7 +68,8 @@ # This function checks for the awk command. # If it exists then AWKNAME is the complete pathname -checkawk() { +checkawk() +{ AWKNAME=`which awk 2>>trace` if [ -n "$AWKNAME" ] ; then if [ -x $AWKNAME ] ; then @@ -84,7 +90,7 @@ checkawk if [ -z "$AWKNAME" ] ; then echo We need the commands gawk, nawk, or awk - exit 0 + exit 1 fi fi fi @@ -101,7 +107,8 @@ # We generate the appropriate command line that the user should use. -mustSet() { +mustSet() +{ echo echo =================================================== echo You must set your AXIOM and PATH variables. Type: @@ -110,16 +117,16 @@ echo echo export AXIOM=`pwd`/mnt/$SYSNAME echo 'export PATH=$AXIOM/bin:$PATH' -if [ "$SYSNAME" = "freebsd" ] ; then +if [ "$SYSNAME" == "freebsd" ] ; then echo Note that freebsd usually has noweb available echo If you wish to use the standard version you must type echo touch noweb echo If you wish to use a pre-installed GCL you must type echo make GCLVERSION=gcl-system fi -if [ "$SYSNAME" = "solaris9" ] ; +if [ "$SYSNAME" == "solaris9" ] ; then echo make AWK=gawk TAR=gtar PATCH=gpatch -elif [ "`basename $AWKNAME`" = "gawk" ] ; +elif [ "`basename $AWKNAME`" == "gawk" ] ; then echo make else echo make AWK=$AWKNAME fi @@ -146,10 +153,10 @@ sysname needAwk -if [ "x$AXIOM" = "x" ] ; +if [ "x$AXIOM" == "x" ] ; then mustSet else - if [ ! "`dirname $AXIOM`" = "`pwd`/mnt" ] + if [ "`dirname $AXIOM`" != "`pwd`/mnt" ] then mustSet else echo Configure complete. Now type