1.1 --- a/etc/settings	Thu Jul 02 22:18:02 2009 +0200
     1.2 +++ b/etc/settings	Fri Jul 03 00:00:03 2009 +0200
     1.3 @@ -66,14 +66,14 @@
     1.4  ### JVM components (Scala or Java)
     1.5  ###
     1.6  
     1.7 +ISABELLE_JAVA="java"
     1.8  ISABELLE_SCALA="scala"
     1.9 -ISABELLE_JAVA="java"
    1.10  
    1.11 -if [ -e "$ISABELLE_HOME/contrib/scala" ]; then
    1.12 -  classpath "$ISABELLE_HOME/contrib/scala/lib/scala-library.jar"
    1.13 -elif [ -e "$ISABELLE_HOME/../scala" ]; then
    1.14 -  classpath "$ISABELLE_HOME/../scala/lib/scala-library.jar"
    1.15 -fi
    1.16 +[ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
    1.17 +  "$ISABELLE_HOME/contrib/scala"
    1.18 +  "$ISABELLE_HOME/../scala"
    1.19 +  "")
    1.20 +[ -n "$SCALA_HOME" ] && ISABELLE_SCALA="$SCALA_HOME/bin/scala"
    1.21  
    1.22  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.23