Changeset 2690

Timestamp:

Nov 17, 2011 8:40:07 AM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui

Files:

• aclocal.m4 (modified) (1 diff)
• apps/Makefile.in (modified) (2 diffs)
• apps/rpdiff (added)
• apps/simsim.in (modified) (5 diffs)
• cf/config.guess (modified) (53 diffs)
• cf/config.sub (modified) (51 diffs)
• cf/install-sh (modified) (3 diffs)
• cf/mkindex.tcl (added)
• cf/mkinstalldirs (added)
• cf/patchlevel.tcl (added)
• cf/tcl.m4 (added)
• configure (modified) (14 diffs)
• configure.in (modified) (10 diffs)
• scripts/Makefile.in (modified) (1 diff)
• scripts/analyzer.tcl (modified) (1 diff)
• scripts/bugreport.tcl (modified) (1 diff)
• scripts/drawing3d.tcl (deleted)
• scripts/field.tcl (modified) (5 diffs)
• scripts/flowvisviewer.tcl (modified) (4 diffs)
• scripts/heightmapviewer.tcl (modified) (4 diffs)
• scripts/images/font-bold.png (modified) (previous)
• scripts/images/font-italic.png (modified) (previous)
• scripts/molvisviewer.tcl (modified) (30 diffs)
• tclconfig (deleted)

branches/blt4/gui/aclocal.m4

@@ -1 @@
-builtin(include,./tclconfig/tcl.m4)
+builtin(include,./cf/tcl.m4)

branches/blt4/gui/apps/Makefile.in

@@ -34 +34 @@
                 rappture.use \
                 rerun \
+                rpdiff \
                 simsim  \
                 xmldiff \
@@ -55 +56 @@
 
 distclean: clean
-        $(RM) encodedata rappture.env rappture rappture.use rerun simsim xmldiff
+        $(RM) encodedata rappture.env rappture rappture.use rerun rpdiff simsim xmldiff
         $(RM) Makefile *~
 

branches/blt4/gui/apps/simsim.in

@@ -620 +620 @@
     for {set i 0} {$i < $argc} {incr i} {
         set opt [lindex $argv $i]
-        if {("-t" == $opt) || ("-tool" == $opt) || ("--tool" == $opt)} {
+        if { ("-t" == $opt)    ||
+             ("-tool" == $opt) ||
+             ("--tool" == $opt)   } {
             if {[expr {$i + 1}] < $argc} {
                 incr i
                 set params(--tool) [lindex $argv $i]
                 # need to check to see if file exists, if not raise error
+            } else {
+                printHelp
+            }
+        } elseif {  ("-tooldir" == $opt) ||
+                    ("--tooldir" == $opt)    } {
+            if {[expr {$i + 1}] < $argc} {
+                incr i
+                set params(--tooldir) [lindex $argv $i]
+                # need to check to see if directory exists, if not raise error
             } else {
                 printHelp
@@ -688 +699 @@
 }
 
+proc storeoutput {data} {
+    global _d
+    append _d $data
+}
+
 proc main {argv} {
     # set default values
@@ -700 +716 @@
         --runfile ""
         --tool "./tool.xml"
+        --tooldir ""
         oParams {}
     }
 
     parseOptions argv params
+
+    # keep the wish window from popping up
+    catch {wm withdraw .}
 
     # parse out path=val combinations from the list of orphaned parameters
@@ -723 +743 @@
 
     set xmlobj [Rappture::library $params(--tool)]
-    set installdir [file dirname $params(--tool)]
+    if {$params(--tooldir) == ""} {
+        set installdir [file dirname $params(--tool)]
+    } else {
+        set installdir $params(--tooldir)
+    }
 
     # need a better way to do this,
@@ -759 +783 @@
     set result ""
     # execute the job
-    foreach {status result} [eval $tool run] break
-
-    if {[string compare "" $params(--runfile)] != 0} {
-        set runfilename [$tool getRunFile]
-        set err [catch {file rename $runfilename $params(--runfile)} out]
-        if {$err} {
-            puts stderr $out
-        }
-    }
+    foreach {status result} [eval $tool run -output storeoutput] break
 
     # if run was successful, check to see if we should compare
     if {$status == 0 && $result != "ABORT"} {
-        if {[Rappture::library isvalid $result]} {
+        global _d
+        if {[regexp {=RAPPTURE-RUN=>([^\n]+)} $_d match result]} {
+            if {[string compare "" $params(--runfile)] != 0} {
+                if {[catch {file rename -force -- $result $params(--runfile)} out]} {
+                    puts stderr "while moving $result to $params(--runfile): $out"
+                }
+            }
             # do comparison if user chose to compare with other results
             if {"" != $params(--compare)} {

branches/blt4/gui/cf/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-04-14'
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -19 +18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
@@ -26 +24 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-
 
 # Originally written by Per Bothner <per@bothner.com>.
@@ -57 +54 @@
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -70 +67 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -108 +105 @@
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
@@ -127 +123 @@
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
@@ -162 +158 @@
             sh3el) machine=shl-unknown ;;
             sh3eb) machine=sh-unknown ;;
-            sh5el) machine=sh5le-unknown ;;
             *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
         esac
@@ -201 +196 @@
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
         echo "${machine}-${os}${release}"
-        exit ;;
+        exit 0 ;;
+    amiga:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    arc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    hp300:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mac68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    macppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+        echo m88k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+        echo powerpc-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    pmax:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sgi:OpenBSD:*:*)
+        echo mipseb-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    sun3:OpenBSD:*:*)
+        echo m68k-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+        echo mipsel-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     *:OpenBSD:*:*)
-        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-        exit ;;
-    *:ekkoBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-        exit ;;
-    *:SolidBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-        exit ;;
-    macppc:MirBSD:*:*)
-        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-        exit ;;
-    *:MirBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-        exit ;;
+        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+        exit 0 ;;
     alpha:OSF1:*:*)
-        case $UNAME_RELEASE in
-        *4.0)
+        if test $UNAME_RELEASE = "V4.0"; then
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-                ;;
-        *5.*)
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-                ;;
-        esac
+        fi
         # According to Compaq, /usr/sbin/psrinfo has been available on
         # OSF/1 and Tru64 systems produced since 1995.  I hope that
@@ -264 +277 @@
                 UNAME_MACHINE="alphaev79" ;;
         esac
-        # A Pn.n version is a patched version.
         # A Vn.n version is a released version.
         # A Tn.n version is a released field test version.
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        exit ;;
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        exit 0 ;;
     Alpha\ *:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -276 +288 @@
         # of the specific Alpha model?
         echo alpha-pc-interix
-        exit ;;
+        exit 0 ;;
     21064:Windows_NT:50:3)
         echo alpha-dec-winnt3.5
-        exit ;;
+        exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
         echo m68k-unknown-sysv4
-        exit ;;
+        exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-amigaos
-        exit ;;
+        exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
         echo ${UNAME_MACHINE}-unknown-morphos
-        exit ;;
+        exit 0 ;;
     *:OS/390:*:*)
         echo i370-ibm-openedition
-        exit ;;
-    *:z/VM:*:*)
-        echo s390-ibm-zvmoe
-        exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-        exit ;;
+        exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
         echo arm-acorn-riscix${UNAME_RELEASE}
-        exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-        echo arm-unknown-riscos
-        exit ;;
+        exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
         echo hppa1.1-hitachi-hiuxmpp
-        exit ;;
+        exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
@@ -314 +317 @@
                 echo pyramid-pyramid-bsd
         fi
-        exit ;;
+        exit 0 ;;
     NILE*:*:*:dcosx)
         echo pyramid-pyramid-svr4
-        exit ;;
-    DRS?6000:unix:4.0:6*)
-        echo sparc-icl-nx6
-        exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+        exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
         case `/usr/bin/uname -p` in
-            sparc) echo sparc-icl-nx7; exit ;;
+            sparc) echo sparc-icl-nx7 && exit 0 ;;
         esac ;;
     sun4H:SunOS:5.*:*)
         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+        exit 0 ;;
+    i86pc:SunOS:5.*:*)
         echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:6*:*)
         # According to config.sub, this is the proper way to canonicalize
@@ -339 +339 @@
         # it's likely to be more like Solaris than SunOS4.
         echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     sun4*:SunOS:*:*)
         case "`/usr/bin/arch -k`" in
@@ -348 +348 @@
         # Japanese Language versions have a version number like `4.1.3-JL'.
         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-        exit ;;
+        exit 0 ;;
     sun3*:SunOS:*:*)
         echo m68k-sun-sunos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     sun*:*:4.2BSD:*)
         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
@@ -363 +363 @@
                 ;;
         esac
-        exit ;;
+        exit 0 ;;
     aushp:SunOS:*:*)
         echo sparc-auspex-sunos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
@@ -377 +377 @@
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-        echo m68k-apple-machten${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     powerpc:machten:*:*)
         echo powerpc-apple-machten${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     RISC*:Mach:*:*)
         echo mips-dec-mach_bsd4.3
-        exit ;;
+        exit 0 ;;
     RISC*:ULTRIX:*:*)
         echo mips-dec-ultrix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     VAX*:ULTRIX*:*:*)
         echo vax-dec-ultrix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
         echo clipper-intergraph-clix${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
         eval $set_cc_for_build
@@ -434 +431 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c &&
-          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-          SYSTEM_NAME=`$dummy $dummyarg` &&
-            { echo "$SYSTEM_NAME"; exit; }
+        $CC_FOR_BUILD -o $dummy $dummy.c \
+          && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+          && exit 0
         echo mips-mips-riscos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
         echo powerpc-motorola-powermax
-        exit ;;
+        exit 0 ;;
     Motorola:*:4.3:PL8-*)
         echo powerpc-harris-powermax
-        exit ;;
+        exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
         echo powerpc-harris-powermax
-        exit ;;
+        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
-        exit ;;
+        exit 0 ;;
     m88k:CX/UX:7*:*)
         echo m88k-harris-cxux7
-        exit ;;
+        exit 0 ;;
     m88k:*:4*:R4*)
         echo m88k-motorola-sysv4
-        exit ;;
+        exit 0 ;;
     m88k:*:3*:R3*)
         echo m88k-motorola-sysv3
-        exit ;;
+        exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
@@ -476 +472 @@
             echo i586-dg-dgux${UNAME_RELEASE}
         fi
-        exit ;;
+        exit 0 ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
-        exit ;;
+        exit 0 ;;
     M88*:*:R3*:*)
         # Delta 88k system running SVR3
         echo m88k-motorola-sysv3
-        exit ;;
+        exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
         echo m88k-tektronix-sysv3
-        exit ;;
+        exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
         echo m68k-tektronix-bsd
-        exit ;;
+        exit 0 ;;
     *:IRIX*:*:*)
         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-        exit ;;
+        exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-        echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+        echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
         echo i386-ibm-aix
-        exit ;;
+        exit 0 ;;
     ia64:AIX:*:*)
         if [ -x /usr/bin/oslevel ] ; then
@@ -506 +502 @@
         fi
         echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-        exit ;;
+        exit 0 ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -521 +517 @@
                         }
 EOF
-                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-                then
-                        echo "$SYSTEM_NAME"
-                else
-                        echo rs6000-ibm-aix3.2.5
-                fi
+                $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+                echo rs6000-ibm-aix3.2.5
         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                 echo rs6000-ibm-aix3.2.4
@@ -532 +524 @@
                 echo rs6000-ibm-aix3.2
         fi
-        exit ;;
-    *:AIX:*:[456])
+        exit 0 ;;
+    *:AIX:*:[45])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -546 +538 @@
         fi
         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-        exit ;;
+        exit 0 ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
-        exit ;;
+        exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
         echo romp-ibm-bsd4.4
-        exit ;;
+        exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-        exit ;;                             # report: romp-ibm BSD 4.3
+        exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
         echo rs6000-bull-bosx
-        exit ;;
+        exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
         echo m68k-bull-sysv3
-        exit ;;
+        exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
         echo m68k-hp-bsd
-        exit ;;
+        exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
         echo m68k-hp-bsd4.4
-        exit ;;
+        exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -629 +621 @@
         if [ ${HP_ARCH} = "hppa2.0w" ]
         then
-            eval $set_cc_for_build
-
-            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-            # generating 64-bit code.  GNU and HP use different nomenclature:
-            #
-            # $ CC_FOR_BUILD=cc ./config.guess
-            # => hppa2.0w-hp-hpux11.23
-            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-            # => hppa64-hp-hpux11.23
-
-            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-                grep __LP64__ >/dev/null
+            # avoid double evaluation of $set_cc_for_build
+            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
             then
                 HP_ARCH="hppa2.0w"
@@ -649 +631 @@
         fi
         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-        exit ;;
+        exit 0 ;;
     ia64:HP-UX:*:*)
         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
         echo ia64-hp-hpux${HPUX_REV}
-        exit ;;
+        exit 0 ;;
     3050*:HI-UX:*:*)
         eval $set_cc_for_build
@@ -681 +663 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-                { echo "$SYSTEM_NAME"; exit; }
+        $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
         echo unknown-hitachi-hiuxwe2
-        exit ;;
+        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
         echo hppa1.1-hp-bsd
-        exit ;;
+        exit 0 ;;
     9000/8??:4.3bsd:*:*)
         echo hppa1.0-hp-bsd
-        exit ;;
+        exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
         echo hppa1.0-hp-mpeix
-        exit ;;
+        exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
         echo hppa1.1-hp-osf
-        exit ;;
+        exit 0 ;;
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
-        exit ;;
+        exit 0 ;;
     i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
@@ -706 +687 @@
             echo ${UNAME_MACHINE}-unknown-osf1
         fi
-        exit ;;
+        exit 0 ;;
     parisc*:Lites*:*:*)
         echo hppa1.1-hp-lites
-        exit ;;
+        exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
@@ -718 +699 @@
         else echo c2-convex-bsd
         fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
         echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
         echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
@@ -736 +717 @@
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
               -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*TS:*:*:*)
         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*T3E:*:*:*)
         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     CRAY*SV1:*:*:*)
         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        exit 0 ;;
     *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-        exit ;;
+        echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -754 +735 @@
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     sparc*:BSD/OS:*:*)
         echo sparc-unknown-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:BSD/OS:*:*)
         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:FreeBSD:*:*)
-        case ${UNAME_MACHINE} in
-            pc98)
-                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-            amd64)
-                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-            *)
-                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-        esac
-        exit ;;
+        # Determine whether the default compiler uses glibc.
+        eval $set_cc_for_build
+        sed 's/^        //' << EOF >$dummy.c
+        #include <features.h>
+        #if __GLIBC__ >= 2
+        LIBC=gnu
+        #else
+        LIBC=
+        #endif
+EOF
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+        exit 0 ;;
     i*:CYGWIN*:*)
         echo ${UNAME_MACHINE}-pc-cygwin
-        exit ;;
-    *:MINGW*:*)
+        exit 0 ;;
+    i*:MINGW*:*)
         echo ${UNAME_MACHINE}-pc-mingw32
-        exit ;;
-    i*:windows32*:*)
-        # uname -m includes "-pc" on this system.
-        echo ${UNAME_MACHINE}-mingw32
-        exit ;;
+        exit 0 ;;
+    i*:MSYS*:*)
+        echo ${UNAME_MACHINE}-pc-msys
+        exit 0 ;;
     i*:PW*:*)
         echo ${UNAME_MACHINE}-pc-pw32
-        exit ;;
-    *:Interix*:[3456]*)
-        case ${UNAME_MACHINE} in
-            x86)
-                echo i586-pc-interix${UNAME_RELEASE}
-                exit ;;
-            EM64T | authenticamd)
-                echo x86_64-unknown-interix${UNAME_RELEASE}
-                exit ;;
-            IA64)
-                echo ia64-unknown-interix${UNAME_RELEASE}
-                exit ;;
-        esac ;;
+        exit 0 ;;
+    x86:Interix*:3*)
+        echo i586-pc-interix3
+        exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
         echo i${UNAME_MACHINE}-pc-mks
-        exit ;;
+        exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -812 +782 @@
         # UNAME_MACHINE based on the output of uname instead of i386?
         echo i586-pc-interix
-        exit ;;
+        exit 0 ;;
     i*:UWIN*:*)
         echo ${UNAME_MACHINE}-pc-uwin
-        exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-        echo x86_64-unknown-cygwin
-        exit ;;
+        exit 0 ;;
     p*:CYGWIN*:*)
         echo powerpcle-unknown-cygwin
-        exit ;;
+        exit 0 ;;
     prep*:SunOS:5.*:*)
         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-        exit ;;
+        exit 0 ;;
     *:GNU:*:*)
-        # the GNU system
         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-        exit ;;
-    *:GNU/*:*:*)
-        # other systems with GNU libc and userland
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-        exit ;;
+        exit 0 ;;
     i*86:Minix:*:*)
         echo ${UNAME_MACHINE}-pc-minix
-        exit ;;
+        exit 0 ;;
     arm*:Linux:*:*)
-        eval $set_cc_for_build
-        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-            | grep -q __ARM_EABI__
-        then
-            echo ${UNAME_MACHINE}-unknown-linux-gnu
-        else
-            echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-        fi
-        exit ;;
-    avr32*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    cris:Linux:*:*)
-        echo cris-axis-linux-gnu
-        exit ;;
-    crisv32:Linux:*:*)
-        echo crisv32-axis-linux-gnu
-        exit ;;
-    frv:Linux:*:*)
-        echo frv-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     ia64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    m32r*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     m68*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     mips:Linux:*:*)
         eval $set_cc_for_build
@@ -883 +823 @@
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
         ;;
     mips64:Linux:*:*)
@@ -906 +842 @@
         #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^CPU/{
-                s: ::g
-                p
-            }'`"
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
         ;;
-    or32:Linux:*:*)
-        echo or32-unknown-linux-gnu
-        exit ;;
     ppc:Linux:*:*)
         echo powerpc-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     ppc64:Linux:*:*)
         echo powerpc64-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     alpha:Linux:*:*)
         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -935 +864 @@
         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-        exit ;;
+        exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
@@ -943 +872 @@
           *)    echo hppa-unknown-linux-gnu ;;
         esac
-        exit ;;
+        exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
         echo hppa64-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
         echo ${UNAME_MACHINE}-ibm-linux
-        exit ;;
-    sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     sh*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
-    vax:Linux:*:*)
-        echo ${UNAME_MACHINE}-dec-linux-gnu
-        exit ;;
+        exit 0 ;;
     x86_64:Linux:*:*)
         echo x86_64-unknown-linux-gnu
-        exit ;;
-    xtensa*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-gnu
-        exit ;;
+        exit 0 ;;
     i*86:Linux:*:*)
         # The BFD linker knows what the default object file format is, so
@@ -985 +905 @@
           a.out-i386-linux)
                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-                exit ;;
+                exit 0 ;;
+          coff-i386)
+                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+                exit 0 ;;
           "")
                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
                 # one that does not give us useful --help.
                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-                exit ;;
+                exit 0 ;;
         esac
         # Determine whether the default compiler is a.out or elf
@@ -1007 +930 @@
         # endif
         #else
-        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+        #ifdef __INTEL_COMPILER
         LIBC=gnu
         #else
@@ -1013 +936 @@
         #endif
         #endif
-        #ifdef __dietlibc__
-        LIBC=dietlibc
-        #endif
 EOF
-        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-            /^LIBC/{
-                s: ::g
-                p
-            }'`"
-        test x"${LIBC}" != x && {
-                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-                exit
-        }
-        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
         ;;
     i*86:DYNIX/ptx:4*:*)
@@ -1033 +946 @@
         # sysname and nodename.
         echo i386-sequent-sysv4
-        exit ;;
+        exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
@@ -1041 +954 @@
         # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-        exit ;;
+        exit 0 ;;
     i*86:OS/2:*:*)
         # If we were able to find `uname', then EMX Unix compatibility
         # is probably installed.
         echo ${UNAME_MACHINE}-pc-os2-emx
-        exit ;;
+        exit 0 ;;
     i*86:XTS-300:*:STOP)
         echo ${UNAME_MACHINE}-unknown-stop
-        exit ;;
+        exit 0 ;;
     i*86:atheos:*:*)
         echo ${UNAME_MACHINE}-unknown-atheos
-        exit ;;
-    i*86:syllable:*:*)
-        echo ${UNAME_MACHINE}-pc-syllable
-        exit ;;
+        exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     i*86:*DOS:*:*)
         echo ${UNAME_MACHINE}-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
@@ -1069 +979 @@
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
-        exit ;;
-    i*86:*:5:[678]*)
-        # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        exit 0 ;;
+    i*86:*:5:[78]*)
         case `/bin/uname -X | grep "^Machine"` in
             *486*)           UNAME_MACHINE=i486 ;;
@@ -1078 +987 @@
         esac
         echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-        exit ;;
+        exit 0 ;;
     i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
@@ -1096 +1005 @@
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
-        exit ;;
+        exit 0 ;;
     pc:*:*:*)
         # Left here for compatibility:
@@ -1102 +1011 @@
         # the processor, so we play safe by assuming i386.
         echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
-        exit ;;
+        exit 0 ;;
     paragon:*:*:*)
         echo i860-intel-osf1
-        exit ;;
+        exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
@@ -1115 +1024 @@
           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
         fi
-        exit ;;
+        exit 0 ;;
     mini*:CTIX:SYS*5:*)
         # "miniframe"
         echo m68010-convergent-sysv
-        exit ;;
+        exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
         echo m68k-convergent-sysv
-        exit ;;
+        exit 0 ;;
     M680?0:D-NIX:5.3:*)
         echo m68k-diab-dnix
-        exit ;;
-    M68*:*:R3V[5678]*:*)
-        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+        exit 0 ;;
+    M68*:*:R3V[567]*:*)
+        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
         OS_REL=''
         test -r /etc/.relid \
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+          && echo i486-ncr-sysv4.3${OS_REL} && exit 0
         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+          && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
-        exit ;;
+        exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
         echo sparc-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
         echo powerpc-unknown-lynxos${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
         echo mips-dde-sysv${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
         echo mips-sni-sysv4
-        exit ;;
+        exit 0 ;;
     RM*:SINIX-*:*:*)
         echo mips-sni-sysv4
-        exit ;;
+        exit 0 ;;
     *:SINIX-*:*:*)
         if uname -p 2>/dev/null >/dev/null ; then
@@ -1170 +1079 @@
                 echo ns32k-sni-sysv
         fi
-        exit ;;
+        exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
         # How about differentiating between stratus architectures? -djm
         echo hppa1.1-stratus-sysv4
-        exit ;;
+        exit 0 ;;
     *:*:*:FTX*)
         # From seanf@swdc.stratus.com.
         echo i860-stratus-sysv4
-        exit ;;
-    i*86:VOS:*:*)
-        # From Paul.Green@stratus.com.
-        echo ${UNAME_MACHINE}-stratus-vos
-        exit ;;
+        exit 0 ;;
     *:VOS:*:*)
         # From Paul.Green@stratus.com.
         echo hppa1.1-stratus-vos
-        exit ;;
+        exit 0 ;;
     mc68*:A/UX:*:*)
         echo m68k-apple-aux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     news*:NEWS-OS:6*:*)
         echo mips-sony-newsos6
-        exit ;;
+        exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
@@ -1204 +1109 @@
                 echo mips-unknown-sysv${UNAME_RELEASE}
         fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
         echo powerpc-be-beos
-        exit ;;
+        exit 0 ;;
     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
         echo powerpc-apple-beos
-        exit ;;
+        exit 0 ;;
     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
         echo i586-pc-beos
-        exit ;;
-    BePC:Haiku:*:*)     # Haiku running on Intel PC compatible.
-        echo i586-pc-haiku
-        exit ;;
+        exit 0 ;;
     SX-4:SUPER-UX:*:*)
         echo sx4-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SX-5:SUPER-UX:*:*)
         echo sx5-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     SX-6:SUPER-UX:*:*)
         echo sx6-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-7:SUPER-UX:*:*)
-        echo sx7-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-8:SUPER-UX:*:*)
-        echo sx8-nec-superux${UNAME_RELEASE}
-        exit ;;
-    SX-8R:SUPER-UX:*:*)
-        echo sx8r-nec-superux${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     Power*:Rhapsody:*:*)
         echo powerpc-apple-rhapsody${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Rhapsody:*:*)
         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Darwin:*:*)
-        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        case $UNAME_PROCESSOR in
-            unknown) UNAME_PROCESSOR=powerpc ;;
+        case `uname -p` in
+            *86) UNAME_PROCESSOR=i686 ;;
+            powerpc) UNAME_PROCESSOR=powerpc ;;
         esac
         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
         UNAME_PROCESSOR=`uname -p`
@@ -1255 +1148 @@
         fi
         echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
-        exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk${UNAME_RELEASE}
-        exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+        exit 0 ;;
+    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
         echo nsr-tandem-nsk${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:NonStop-UX:*:*)
         echo mips-compaq-nonstopux
-        exit ;;
+        exit 0 ;;
     BS2000:POSIX*:*:*)
         echo bs2000-siemens-sysv
-        exit ;;
+        exit 0 ;;
     DS/*:UNIX_System_V:*:*)
         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:Plan9:*:*)
         # "uname -m" is not consistent, so use $cputype instead. 386
@@ -1284 +1174 @@
         fi
         echo ${UNAME_MACHINE}-unknown-plan9
-        exit ;;
+        exit 0 ;;
     *:TOPS-10:*:*)
         echo pdp10-unknown-tops10
-        exit ;;
+        exit 0 ;;
     *:TENEX:*:*)
         echo pdp10-unknown-tenex
-        exit ;;
+        exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
         echo pdp10-dec-tops20
-        exit ;;
+        exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
         echo pdp10-xkl-tops20
-        exit ;;
+        exit 0 ;;
     *:TOPS-20:*:*)
         echo pdp10-unknown-tops20
-        exit ;;
+        exit 0 ;;
     *:ITS:*:*)
         echo pdp10-unknown-its
-        exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-        exit ;;
-    *:DragonFly:*:*)
-        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-        exit ;;
-    *:*VMS:*:*)
-        UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "${UNAME_MACHINE}" in
-            A*) echo alpha-dec-vms ; exit ;;
-            I*) echo ia64-dec-vms ; exit ;;
-            V*) echo vax-dec-vms ; exit ;;
-        esac ;;
-    *:XENIX:*:SysV)
-        echo i386-pc-xenix
-        exit ;;
-    i*86:skyos:*:*)
-        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-        exit ;;
-    i*86:rdos:*:*)
-        echo ${UNAME_MACHINE}-pc-rdos
-        exit ;;
+        exit 0 ;;
 esac
 
@@ -1356 +1224 @@
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
@@ -1445 +1313 @@
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-        { echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
@@ -1459 +1326 @@
     c1*)
         echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     c2*)
         if getsysinfo -f scalar_acc
@@ -1465 +1332 @@
         else echo c2-convex-bsd
         fi
-        exit ;;
+        exit 0 ;;
     c34*)
         echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     c38*)
         echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     c4*)
         echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     esac
 fi
@@ -1485 +1352 @@
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please

branches/blt4/gui/cf/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-04-14'
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-02-22'
 
 # This file is (in principle) common to ALL GNU software.
@@ -23 +22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
@@ -73 +71 @@
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -86 +84 @@
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
@@ -102 +100 @@
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
@@ -121 +119 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -149 +145 @@
         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-        -apple | -axis | -knuth | -cray)
+        -apple | -axis)
                 os=
                 basic_machine=$1
@@ -174 +170 @@
                 os=-hiuxwe2
                 ;;
-        -sco6)
-                os=-sco5v6
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-                ;;
         -sco5)
                 os=-sco3.2v5
@@ -191 +183 @@
                 ;;
         -sco3.2v[4-9]*)
-                # Don't forget version if it is 3.2v4 or newer.
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-                ;;
-        -sco5v6*)
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241 +229 @@
         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | bfin \
-        | c4x | clipper \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | fido | fr30 | frv \
+        | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | i370 | i860 | i960 | ia64 \
-        | ip2k | iq2000 \
-        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-        | maxq | mb | microblaze | mcore | mep | metag \
+        | ip2k \
+        | m32r | m68000 | m68k | m88k | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
         | mips64 | mips64el \
-        | mips64octeon | mips64octeonel \
+        | mips64vr | mips64vrel \
         | mips64orion | mips64orionel \
-        | mips64r5900 | mips64r5900el \
-        | mips64vr | mips64vrel \
         | mips64vr4100 | mips64vr4100el \
         | mips64vr4300 | mips64vr4300el \
         | mips64vr5000 | mips64vr5000el \
-        | mips64vr5900 | mips64vr5900el \
         | mipsisa32 | mipsisa32el \
         | mipsisa32r2 | mipsisa32r2el \
         | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
         | mipsisa64sb1 | mipsisa64sb1el \
         | mipsisa64sr71k | mipsisa64sr71kel \
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
-        | mt \
         | msp430 \
-        | nios | nios2 \
         | ns16k | ns32k \
-        | or32 \
+        | openrisc | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | score \
-        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-        | spu | strongarm \
-        | tahoe | thumb | tic4x | tic80 | tron \
+        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+        | strongarm \
+        | tahoe | thumb | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xscale | xstormy16 | xtensa \
         | z8k)
                 basic_machine=$basic_machine-unknown
@@ -298 +275 @@
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-                ;;
-        ms1)
-                basic_machine=mt-unknown
                 ;;
 
@@ -321 +295 @@
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* | avr32-* \
-        | bfin-* | bs2000-* \
+        | avr-* \
+        | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-        | clipper-* | craynv-* | cydra-* \
+        | clipper-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
         | elxsi-* \
-        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | i*86-* | i860-* | i960-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | m32c-* | m32r-* | m32rle-* \
+        | ip2k-* \
+        | m32r-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+        | m88110-* | m88k-* | mcore-* \
         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
         | mips16-* \
         | mips64-* | mips64el-* \
-        | mips64octeon-* | mips64octeonel-* \
+        | mips64vr-* | mips64vrel-* \
         | mips64orion-* | mips64orionel-* \
-        | mips64r5900-* | mips64r5900el-* \
-        | mips64vr-* | mips64vrel-* \
         | mips64vr4100-* | mips64vr4100el-* \
         | mips64vr4300-* | mips64vr4300el-* \
         | mips64vr5000-* | mips64vr5000el-* \
-        | mips64vr5900-* | mips64vr5900el-* \
         | mipsisa32-* | mipsisa32el-* \
         | mipsisa32r2-* | mipsisa32r2el-* \
         | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
         | mipsisa64sb1-* | mipsisa64sb1el-* \
         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
         | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | mt-* \
         | msp430-* \
-        | nios-* | nios2-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
+        | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -363 +330 @@
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-        | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
         | tron-* \
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-        | xstormy16-* | xtensa*-* \
+        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+        | xtensa-* \
         | ymp-* \
         | z8k-*)
-                ;;
-        # Recognize the basic CPU types without company name, with glob match.
-        xtensa*)
-                basic_machine=$basic_machine-unknown
                 ;;
         # Recognize the various machine names and aliases which stand
@@ -398 +360 @@
                 os=-udi
                 ;;
-        abacus)
-                basic_machine=abacus-unknown
-                ;;
         adobe68k)
                 basic_machine=m68010-adobe
@@ -415 +374 @@
                 os=-bsd
                 ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
-        amd64-*)
-                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         amdahl)
                 basic_machine=580-amdahl
@@ -452 +405 @@
                 os=-dynix
                 ;;
-        blackfin)
-                basic_machine=bfin-unknown
-                os=-linux
-                ;;
-        blackfin-*)
-                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         c90)
                 basic_machine=c90-cray
@@ -488 +433 @@
                 os=-unicos
                 ;;
-        craynv)
-                basic_machine=craynv-cray
-                os=-unicosmp
-                ;;
-        cr16)
-                basic_machine=cr16-unknown
-                os=-elf
-                ;;
         crds | unos)
                 basic_machine=m68k-crds
                 ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
         cris | cris-* | etrax*)
                 basic_machine=cris-axis
-                ;;
-        crx)
-                basic_machine=crx-unknown
-                os=-elf
                 ;;
         da30 | da30-*)
@@ -530 +460 @@
                 basic_machine=m88k-motorola
                 os=-sysv3
-                ;;
-        dicos)
-                basic_machine=i686-pc
-                os=-dicos
-                ;;
-        djgpp)
-                basic_machine=i586-pc
-                os=-msdosdjgpp
                 ;;
         dpx20 | dpx20-*)
@@ -689 +611 @@
                 os=-sysv
                 ;;
-        m68knommu)
-                basic_machine=m68k-unknown
-                os=-linux
-                ;;
-        m68knommu-*)
-                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         m88k-omron*)
                 basic_machine=m88k-omron
@@ -709 +623 @@
                 ;;
         mingw32)
-                basic_machine=i386-pc
+                basic_machine=i686-pc
                 os=-mingw32
                 ;;
-        mingw32ce)
-                basic_machine=arm-unknown
-                os=-mingw32ce
+        msys)
+                basic_machine=i686-pc
+                os=-msys
                 ;;
         miniframe)
@@ -729 +643 @@
                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
                 ;;
+        mmix*)
+                basic_machine=mmix-knuth
+                os=-mmixware
+                ;;
         monitor)
                 basic_machine=m68k-rom68k
@@ -740 +658 @@
                 basic_machine=i386-pc
                 os=-msdos
-                ;;
-        ms1-*)
-                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         mvs)
@@ -812 +727 @@
                 basic_machine=np1-gould
                 ;;
+        nv1)
+                basic_machine=nv1-cray
+                os=-unicosmp
+                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
@@ -819 +738 @@
                 os=-proelf
                 ;;
-        openrisc | openrisc-*)
+        or32 | or32-*)
                 basic_machine=or32-unknown
-                ;;
-        os400)
-                basic_machine=powerpc-ibm
-                os=-os400
+                os=-coff
                 ;;
         OSE68000 | ose68000)
@@ -842 +758 @@
                 os=-osf
                 ;;
-        parisc)
-                basic_machine=hppa-unknown
-                os=-linux
-                ;;
-        parisc-*)
-                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-                os=-linux
-                ;;
         pbd)
                 basic_machine=sparc-tti
@@ -859 +767 @@
                 basic_machine=ns32k-pc532
                 ;;
-        pc98)
-                basic_machine=i386-pc
-                ;;
-        pc98-*)
-                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
@@ -871 +773 @@
                 basic_machine=i686-pc
                 ;;
-        pentiumii | pentium2 | pentiumiii | pentium3)
+        pentiumii | pentium2)
                 basic_machine=i686-pc
-                ;;
-        pentium4)
-                basic_machine=i786-pc
                 ;;
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
@@ -883 +782 @@
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
-        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+        pentiumii-* | pentium2-*)
                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        pentium4-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -921 +817 @@
                 os=-pw32
                 ;;
-        rdos)
-                basic_machine=i386-pc
-                os=-rdos
-                ;;
         rom68k)
                 basic_machine=m68k-rom68k
@@ -951 +843 @@
                 basic_machine=mipsisa64sb1el-unknown
                 ;;
-        sde)
-                basic_machine=mipsisa32-sde
-                os=-elf
-                ;;
-        sei)
-                basic_machine=mips-sei
-                os=-seiux
-                ;;
         sequent)
                 basic_machine=i386-sequent
@@ -966 +850 @@
                 os=-hms
                 ;;
-        sh5el)
-                basic_machine=sh5le-unknown
-                ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
         sparclite-wrs | simso-wrs)
                 basic_machine=sparclite-wrs
@@ -1046 +924 @@
                 os=-unicos
                 ;;
+        tic4x | c4x*)
+                basic_machine=tic4x-unknown
+                os=-coff
+                ;;
         tic54x | c54x*)
                 basic_machine=tic54x-unknown
@@ -1058 +940 @@
                 os=-coff
                 ;;
-        tile*)
-                basic_machine=tile-unknown
-                os=-linux-gnu
-                ;;
         tx39)
                 basic_machine=mipstx39-unknown
@@ -1075 +953 @@
                 basic_machine=m68k-ncr
                 ;;
-        tpf)
-                basic_machine=s390x-ibm
-                os=-tpf
-                ;;
         udi29k)
                 basic_machine=a29k-amd
@@ -1121 +995 @@
                 basic_machine=hppa1.1-winbond
                 os=-proelf
-                ;;
-        xbox)
-                basic_machine=i686-pc
-                os=-mingw32
                 ;;
         xps | xps100)
@@ -1156 +1026 @@
                 basic_machine=romp-ibm
                 ;;
-        mmix)
-                basic_machine=mmix-knuth
-                ;;
         rs6000)
                 basic_machine=rs6000-ibm
@@ -1175 +1042 @@
                 basic_machine=we32k-att
                 ;;
-        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                 basic_machine=sh-unknown
                 ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+        sh64)
+                basic_machine=sh64-unknown
+                ;;
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
@@ -1251 +1121 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-              | -openbsd* | -solidbsd* \
-              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+              | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-              | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -msys* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1266 +1133 @@
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+              | -powermax* | -dnix*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1285 +1151 @@
                 ;;
         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
@@ -1291 +1157 @@
                 os=`echo $os | sed -e 's|mac|macos|'`
                 ;;
-        -linux-dietlibc)
-                os=-linux-dietlibc
-                ;;
         -linux*)
                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
@@ -1306 +1169 @@
                 os=-openedition
                 ;;
-        -os400*)
-                os=-os400
-                ;;
         -wince*)
                 os=-wince
@@ -1329 +1189 @@
         -atheos*)
                 os=-atheos
-                ;;
-        -syllable*)
-                os=-syllable
                 ;;
         -386bsd)
@@ -1355 +1212 @@
                 os=-sysv4
                 ;;
-        -tpf*)
-                os=-tpf
-                ;;
         -triton*)
                 os=-sysv3
@@ -1393 +1247 @@
         -kaos*)
                 os=-kaos
-                ;;
-        -zvmoe)
-                os=-zvmoe
-                ;;
-        -dicos*)
-                os=-dicos
                 ;;
         -none)
@@ -1422 +1270 @@
 
 case $basic_machine in
-        score-*)
-                os=-elf
-                ;;
-        spu-*)
-                os=-elf
-                ;;
         *-acorn)
                 os=-riscix1.2
@@ -1436 +1278 @@
         arm*-semi)
                 os=-aout
-                ;;
-        c4x-* | tic4x-*)
-                os=-coff
                 ;;
         # This must come before the *-dec entry.
@@ -1465 +1304 @@
                 os=-aout
                 ;;
-        mep-*)
-                os=-elf
-                ;;
         mips*-cisco)
                 os=-elf
@@ -1486 +1322 @@
                 os=-beos
                 ;;
-        *-haiku)
-                os=-haiku
-                ;;
         *-ibm)
                 os=-aix
-                ;;
-        *-knuth)
-                os=-mmixware
                 ;;
         *-wec)
@@ -1627 +1457 @@
                                 vendor=ibm
                                 ;;
-                        -os400*)
-                                vendor=ibm
-                                ;;
                         -ptx*)
                                 vendor=sequent
                                 ;;
-                        -tpf*)
-                                vendor=ibm
-                                ;;
                         -vxsim* | -vxworks* | -windiss*)
                                 vendor=wrs
@@ -1660 +1484 @@
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:

branches/blt4/gui/cf/install-sh

@@ -1 +1 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+
+scriptversion=2004-01-12.10
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
@@ -24 +43 @@
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
-
 
 # put in absolute paths if you don't have them in your path; or use env. vars.
@@ -42 +59 @@
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
+transformbasename=
+transform_arg=
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-        -c) instcmd=$cpprog
-            shift
-            continue;;
-
-        -d) dir_arg=true
-            shift
-            continue;;
-
-        -m) chmodcmd="$chmodprog $2"
-            shift
-            shift
-            continue;;
-
-        -o) chowncmd="$chownprog $2"
-            shift
-            shift
-            continue;;
-
-        -g) chgrpcmd="$chgrpprog $2"
-            shift
-            shift
-            continue;;
-
-        -s) stripcmd=$stripprog
-            shift
-            continue;;
-
-        -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-            shift
-            continue;;
-
-        -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-            shift
-            continue;;
-
-        *)  if [ x"$src" = x ]
-            then
-                src=$1
-            else
-                # this colon is to work around a 386BSD /bin/sh bug
-                :
-                dst=$1
-            fi
-            shift
-            continue;;
+src=
+dst=
+dir_arg=
+
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 -d DIRECTORIES...
+
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
+In the second, create the directory path DIR.
+
+Options:
+-b=TRANSFORMBASENAME
+-c         copy source (using $cpprog) instead of moving (using $mvprog).
+-d         create directories instead of installing files.
+-g GROUP   $chgrp installed files to GROUP.
+-m MODE    $chmod installed files to MODE.
+-o USER    $chown installed files to USER.
+-s         strip installed files (using $stripprog).
+-t=TRANSFORM
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+        shift
+        continue;;
+
+    -c) instcmd=$cpprog
+        shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+        shift
+        continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+        test -n "$dir_arg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+        for arg
+        do
+          if test -n "$dstarg"; then
+            # $@ is not empty: it contains at least $arg.
+            set fnord "$@" "$dstarg"
+            shift # fnord
+          fi
+          shift # arg
+          dstarg=$arg
+        done
+        break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      instcmd=:
+      chmodcmd=
+    else
+      instcmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
     esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+        '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      test -d "$pathcomp" || $mkdirprog "$pathcomp"
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $instcmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    # If we're going to rename the final executable, determine the name now.
+    if test -z "$transformarg"; then
+      dstfile=`basename "$dst"`
+    else
+      dstfile=`basename "$dst" $transformbasename \
+               | sed $transformarg`$transformbasename
+    fi
+
+    # don't allow the sed command to completely eliminate the filename.
+    test -z "$dstfile" && dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Move or copy the file name to the temp name
+    $doit $instcmd "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now remove or move aside any old file at destination location.  We
+    # try this two ways since rm can't unlink itself on some systems and
+    # the destination file might be busy for other reasons.  In this case,
+    # the final cleanup might fail but the new file should still install
+    # successfully.
+    {
+      if test -f "$dstdir/$dstfile"; then
+        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+        || {
+          echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+          (exit 1); exit
+        }
+      else
+        :
+      fi
+    } &&
+
+    # Now rename the file to the real destination.
+    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+  fi || { (exit 1); exit; }
 done
 
-if [ x"$src" = x ]
-then
-        echo "$0: no input file specified" >&2
-        exit 1
-else
-        :
-fi
-
-if [ x"$dir_arg" != x ]; then
-        dst=$src
-        src=""
-
-        if [ -d "$dst" ]; then
-                instcmd=:
-                chmodcmd=""
-        else
-                instcmd=$mkdirprog
-        fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-        if [ -f "$src" ] || [ -d "$src" ]
-        then
-                :
-        else
-                echo "$0: $src does not exist" >&2
-                exit 1
-        fi
-
-        if [ x"$dst" = x ]
-        then
-                echo "$0: no destination specified" >&2
-                exit 1
-        else
-                :
-        fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-        if [ -d "$dst" ]
-        then
-                dst=$dst/`basename "$src"`
-        else
-                :
-        fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-        '
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-        pathcomp=$pathcomp$1
-        shift
-
-        if [ ! -d "$pathcomp" ] ;
-        then
-                $mkdirprog "$pathcomp"
-        else
-                :
-        fi
-
-        pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-        $doit $instcmd "$dst" &&
-
-        if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-        if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-        if [ x"$transformarg" = x ]
-        then
-                dstfile=`basename "$dst"`
-        else
-                dstfile=`basename "$dst" $transformbasename |
-                        sed $transformarg`$transformbasename
-        fi
-
-# don't allow the sed command to completely eliminate the filename
-
-        if [ x"$dstfile" = x ]
-        then
-                dstfile=`basename "$dst"`
-        else
-                :
-        fi
-
-# Make a couple of temp file names in the proper directory.
-
-        dsttmp=$dstdir/#inst.$$#
-        rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-        trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-        trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-        $doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-        if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-        if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
+# The final little trick to "correctly" pass the exit status to the exit trap.
 {
-        if [ -f "$dstdir/$dstfile" ]
-        then
-                $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-                $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-                {
-                  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-                  (exit 1); exit
-                }
-        else
-                :
-        fi
-} &&
-
-# Now rename the file to the real destination.
-
-        $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-        (exit 0); exit
+  (exit 0); exit
 }
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

branches/blt4/gui/configure

@@ -605 +605 @@
 LIBOBJS
 TK_VERSION
-TK_XLIBSW
-TK_LIB_SPEC
-TK_INC_SPEC
-TCL_VERSION
 TCL_LIB_SPEC
 TCL_INC_SPEC
+TCL_VERSION
 TCLSH
+ENABLE_GUI
+MAKE
 SHLIB_LDFLAGS
-MAKE
-LIB_SEARCH_DIRS
-ENABLE_GUI
 INSTALL_STUB_LIB
 INSTALL_LIB
@@ -656 +652 @@
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+LIB_SEARCH_DIRS
 target_os
 target_vendor
@@ -716 +713 @@
 enable_gui
 with_tclsh
-with_tk
 '
       ac_precious_vars='build_alias
@@ -1355 +1351 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-tclsh=DIR        location of tclsh [default=yes]
-  --with-tcl=DIR          path of tclConfig.sh [default=yes]
-  --with-tk=DIR           path of tkConfig.sh [default=yes]
 
 Some influential environment variables:
@@ -2113 +2107 @@
 
 
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -2240 +2233 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
+
 
 # Find a good install program.  We prefer a C program (faster),
@@ -5544 +5538 @@
 
 
-with_tcl=""
-with_tk=""
+
+
+
+
+
+
+
+
+gui_with_tcl=""
 
 make_command=""
@@ -5558 +5559 @@
   as_fn_error $? "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5
 fi
+MAKE=${make_command}
+
 
 # Check whether --enable-gui was given.
@@ -5572 +5575 @@
 fi
 
+
 with_tclsh="yes"
 
@@ -5582 +5586 @@
 
 
-with_tcl="yes"
-
-# Check whether --with-tk was given.
-if test "${with_tk+set}" = set; then :
-  withval=$with_tk;
-else
-  with_tcl="yes"
-fi
-
-
-with_tk="yes"
-
-# Check whether --with-tk was given.
-if test "${with_tk+set}" = set; then :
-  withval=$with_tk;
-else
-  with_tk=yes
-fi
-
 TCLSH=
-
 # -----------------------------------------------------------------------
 #
@@ -5608 +5592 @@
 #
 # -----------------------------------------------------------------------
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclConfig.sh" >&5
 $as_echo_n "checking for tclConfig.sh... " >&6; }
 tcl_config_sh=""
-if test "$with_tcl" != "yes" ; then
+if test "x$gui_with_tcl" != "x" ; then
 
   # Verify that a tclConfig.sh file exists in the directory specified
   # by --with-tcl.
 
-  for dir in $with_tcl ; do
+  for dir in \
+   $gui_with_tcl
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -5631 +5618 @@
   #  1. Search previously named locations.
 
-  for dir in $prefix $exec_prefix $gui_cv_tcl_lib ; do
+  for dir in \
+   $prefix \
+   $exec_prefix \
+   $gui_cv_tcl_lib
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -5650 +5641 @@
 fi
 . ${tcl_config_sh}
-
-
-# -----------------------------------------------------------------------
-#
-#       Find the Tcl build configuration file "tclConfig.sh"
-#
-# -----------------------------------------------------------------------
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkConfig.sh" >&5
-$as_echo_n "checking for tkConfig.sh... " >&6; }
-tk_config_sh=""
-if test "$with_tk" != "yes" ; then
-
-  # Verify that a tclConfig.sh file exists in the directory specified
-  # by --with-tk.
-
-  for dir in $with_tk $with_tcl  ; do
-    if test -r "$dir/tkConfig.sh" ; then
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_config_sh="$dir/lib/tkConfig.sh"
-      break
-    fi
-  done
-else
-
-  # Otherwise, search for Tcl configuration file.
-
-  #  1. Search previously named locations.
-
-  for dir in $prefix $exec_prefix ; do
-    if test -r "$dir/tkConfig.sh" ; then
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_config_sh="$dir/lib/tkConfig.sh"
-      break
-    fi
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tk_config_sh}" >&5
-$as_echo "${tk_config_sh}" >&6; }
-
-if test "x$tk_config_sh" = "x" ; then
-  echo "can't find Tk configuration script \"tkConfig.sh\""
-  exit 1
-fi
-. ${tk_config_sh}
+TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
 case $target in
@@ -5723 +5665 @@
 
 
-MAKE=${make_command}
-
-SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
-
-SHLIB_LD=${TCL_SHLIB_LD}
-
-SHLIB_LDFLAGS=${TCL_SHLIB_LDFLAGS}
-
-SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
-
-STLIB_LD=${TCL_STLIB_LD}
-
-
-
-
-
-
-
-
+
+if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
+  . ${exec_prefix}/lib/tclConfig.sh
+fi
+if test -f "${exec_prefix}/lib/tkConfig.sh" ; then
+  . ${exec_prefix}/lib/tkConfig.sh
+fi
 
 

branches/blt4/gui/configure.in

@@ -2 +2 @@
 AC_INIT([RapptureGUI],[1.1],[rappture@nanohub.org])
 AC_CONFIG_AUX_DIR(cf)
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -20 +19 @@
 fi
 AC_CANONICAL_TARGET
+AC_SUBST(LIB_SEARCH_DIRS)
 
 AC_PROG_INSTALL
@@ -32 +32 @@
 SC_ENABLE_SHARED
 
-with_tcl=""
-with_tk=""
+AC_SUBST(CFLAGS_DEBUG)
+AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(STLIB_LD)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LDFLAGS)
+AC_SUBST(SHLIB_SUFFIX)
+
+gui_with_tcl=""
 
 make_command=""
@@ -46 +53 @@
   AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE])
 fi
+AC_SUBST(MAKE, ${make_command})
 
 AC_ARG_ENABLE(
@@ -57 +65 @@
     ENABLE_GUI="yes"
 fi
+AC_SUBST(ENABLE_GUI)
 
 with_tclsh="yes"
@@ -66 +75 @@
     [with_tclsh=yes])
 
-with_tcl="yes"
-AC_ARG_WITH(
-    [tk],
-    [AS_HELP_STRING([--with-tcl[=DIR]],
-        [path of tclConfig.sh @<:@default=yes@:>@])],
-    [],
-    [with_tcl="yes"])
-
-with_tk="yes"
-AC_ARG_WITH(
-    [tk],
-    [AS_HELP_STRING([--with-tk[=DIR]],
-        [path of tkConfig.sh @<:@default=yes@:>@])],
-    [],
-    [with_tk=yes])
 TCLSH=
-
 # -----------------------------------------------------------------------
 #
@@ -88 +81 @@
 #
 # -----------------------------------------------------------------------
+
 AC_MSG_CHECKING([for tclConfig.sh])
 tcl_config_sh=""
-if test "$with_tcl" != "yes" ; then
+if test "x$gui_with_tcl" != "x" ; then
 
   # Verify that a tclConfig.sh file exists in the directory specified 
   # by --with-tcl. 
 
-  for dir in $with_tcl ; do
+  for dir in \
+   $gui_with_tcl 
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -110 +106 @@
   #  1. Search previously named locations.
 
-  for dir in $prefix $exec_prefix $gui_cv_tcl_lib ; do
+  for dir in \
+   $prefix \
+   $exec_prefix \
+   $gui_cv_tcl_lib 
+  do
     if test -r "$dir/tclConfig.sh" ; then
       tcl_config_sh="$dir/tclConfig.sh"
@@ -128 +128 @@
 fi
 . ${tcl_config_sh}
-
-
-# -----------------------------------------------------------------------
-#
-#       Find the Tcl build configuration file "tclConfig.sh"
-#
-# -----------------------------------------------------------------------
-
-AC_MSG_CHECKING([for tkConfig.sh])
-tk_config_sh=""
-if test "$with_tk" != "yes" ; then
-
-  # Verify that a tclConfig.sh file exists in the directory specified 
-  # by --with-tk. 
-
-  for dir in $with_tk $with_tcl  ; do
-    if test -r "$dir/tkConfig.sh" ; then
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_config_sh="$dir/lib/tkConfig.sh"
-      break
-    fi
-  done
-else 
-
-  # Otherwise, search for Tcl configuration file.  
-
-  #  1. Search previously named locations.
-
-  for dir in $prefix $exec_prefix ; do
-    if test -r "$dir/tkConfig.sh" ; then
-      tk_config_sh="$dir/tkConfig.sh"
-      break
-    elif test -r "$dir/lib/tkConfig.sh" ; then
-      tk_config_sh="$dir/lib/tkConfig.sh"
-      break
-    fi
-  done
-fi
-
-AC_MSG_RESULT([${tk_config_sh}])
-
-if test "x$tk_config_sh" = "x" ; then
-  echo "can't find Tk configuration script \"tkConfig.sh\""
-  exit 1
-fi
-. ${tk_config_sh}
+TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
 case $target in
@@ -193 +146 @@
 
 AC_MSG_RESULT([${TCLSH}])
+AC_SUBST(TCLSH)
 
-AC_SUBST(CFLAGS_DEBUG)
-AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(ENABLE_GUI)
-AC_SUBST(LIB_SEARCH_DIRS)
-AC_SUBST(MAKE, ${make_command})
-AC_SUBST(SHLIB_CFLAGS, ${TCL_SHLIB_CFLAGS})
-AC_SUBST(SHLIB_LD, ${TCL_SHLIB_LD})
-AC_SUBST(SHLIB_LDFLAGS, ${TCL_SHLIB_LDFLAGS})
-AC_SUBST(SHLIB_SUFFIX, ${TCL_SHLIB_SUFFIX})
-AC_SUBST(STLIB_LD, ${TCL_STLIB_LD})
-AC_SUBST(TCLSH)
+AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
+
+if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 
+  . ${exec_prefix}/lib/tclConfig.sh
+fi
+if test -f "${exec_prefix}/lib/tkConfig.sh" ; then 
+  . ${exec_prefix}/lib/tkConfig.sh      
+fi
 AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TK_INC_SPEC)
-AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)
 

branches/blt4/gui/scripts/Makefile.in

@@ -143 +143 @@
 
 tclIndex: $(FILES)
-        $(TCLSH) $(srcdir)/../tclconfig/mkindex.tcl --srcdir $(srcdir) \
+        $(TCLSH) $(srcdir)/../cf/mkindex.tcl --srcdir $(srcdir) \
                 --outfile tclIndex
 

branches/blt4/gui/scripts/analyzer.tcl

@@ -443 +443 @@
         # It may be a real problem.
         if {[Rappture::bugreport::shouldReport for jobs]} {
-            set ::errorInfo "== RAPPTURE INPUT ==\n[$_tool xml xml]"
+            set ::errorInfo "\n\n== RAPPTURE INPUT ==\n[$_tool xml xml]"
             Rappture::bugreport::register "Problem launching job:\n$result"
+            Rappture::bugreport::attachment [$_tool xml xml]
             Rappture::bugreport::send
         }

branches/blt4/gui/scripts/bugreport.tcl

@@ -678 +678 @@
 set btags [bindtags .bugreport]
 bindtags .bugreport [linsert $btags 0 BugReportOnTop]
+

branches/blt4/gui/scripts/field.tcl

@@ -39 +39 @@
     protected method _getValue {expr}
 
-    private variable _xmlobj ""  ;# ref to XML obj with device data
-
-    private variable _units ""   ;# system of units for this field
+    private variable _xmlobj ""  ;      # ref to XML obj with device data
+    private variable _path "";          # Path of this object in the XML 
+    private variable _units ""   ;      # system of units for this field
     private variable _limits     ;# maps box name => {z0 z1} limits
     private variable _zmax 0     ;# length of the device
@@ -69 +69 @@
     }
     set _xmlobj $xmlobj
+    set _path $path
     set _field [$xmlobj element -as object $path]
     set _units [$_field get units]
@@ -502 +503 @@
 itcl::body Rappture::Field::hints {{keyword ""}} {
     foreach {key path} {
-        group   about.group
-        label   about.label
-        color   about.color
-        style   about.style
-        scale   about.scale
-        seeds   about.seeds
-        units   units
-        updir   updir
-        camera  camera.position
-        type    about.type
+        camera          camera.position
+        color           about.color
+        default         about.default
+        group           about.group
+        label           about.label
+        scalars         about.scalars
+        scale           about.scale
+        seeds           about.seeds
+        style           about.style
+        toolId          tool.id
+        toolName        tool.name
+        toolRevision    tool.version.application.revision
+        type            about.type
+        units           units
+        updir           updir
+        vectors         about.vectors
     } {
         set str [$_field get $path]
@@ -518 +525 @@
         }
     }
-
-    # to be compatible with curve objects
-    set hints(xlabel) "Position"
-
+    # Set tool and path hints
+    set hints(tool) [$_xmlobj get tool.name]
+    set hints(path) $_path
+    if 0 {
+        # to be compatible with curve objects
+        set hints(xlabel) "Position"
+    }
     if {[info exists hints(group)] && [info exists hints(label)]} {
         # pop-up help for each curve
@@ -768 +778 @@
         } elseif {$type == "vtkstreamlines"} {
             set _comp2dims($cname) "3D"
+            # Allow redirects to another element.
+            set vtkdata [$_field get $cname.vtk]
+            if { ![string match "!*" $vtkdata] } {
+                set _comp2vtkstreamlines($cname) $vtkdata
+            } else {
+                set path [string range $vtkdata 1 end]
+                if { [$_xmlobj element $path] == "" } {
+                    error "bad redirection path \"$path\""
+                }
+                puts stderr path=$path
+                set element [$_xmlobj element -as type $path]
+                if { $element != "vtk" } {
+                    error "bad path \"$path\": must redirect to a vtk element"
+                }
+                set _comp2vtkstreamlines($cname) [$_xmlobj get $path]
+            }
+            set _comp2style($cname) [$_field get $cname.style]
+            incr _counter
+        } elseif {$type == "vtkstreamlines2"} {
+            set _comp2dims($cname) "3D"
             set _comp2vtkstreamlines($cname) [$_field get $cname.vtk]
             set _comp2style($cname) [$_field get $cname.style]

branches/blt4/gui/scripts/flowvisviewer.tcl

@@ -176 +176 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::constructor { hostlist args } {
+    set _serverType "nanovis"
 
     # Draw legend event
@@ -260 +261 @@
 
     itk_component add 3dview {
-        label $itk_component(plotarea).vol -image $_image(plot) \
+        label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
     } {
@@ -2855 +2856 @@
     $_dispatcher event -after 60000 !pngtimeout
     WaitIcon start $inner.icon
-    grab set -local $inner
+    grab set $inner
     focus $inner.cancel
 
@@ -2913 +2914 @@
     $_dispatcher event -after 600000 !movietimeout
     WaitIcon start $inner.icon
-    grab set -local $inner
+    grab set $inner
     focus $inner.cancel
     

branches/blt4/gui/scripts/heightmapviewer.tcl

@@ -61 +61 @@
     }
     public method camera {option args}
+
     protected method Connect {}
     protected method Disconnect {}
@@ -132 +133 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HeightmapViewer::constructor {hostlist args} {
+    set _serverType "nanovis"
+
     # Draw legend event
     $_dispatcher register !legend
@@ -186 +189 @@
 
     itk_component add 3dview {
-        canvas $itk_component(plotarea).vol \
+        canvas $itk_component(plotarea).view \
             -highlightthickness 0 -borderwidth 0 
     } {
@@ -664 +667 @@
     array set info $args
     set bytes [ReceiveBytes $info(-bytes)]
-    ReceiveEcho <<line "<read $info(-bytes) bytes args=$args"
- puts stderr "<read $info(-bytes) bytes"
+    ReceiveEcho <<line "<read $info(-bytes) bytes"
     if { $info(-type) == "image" } {
         $_image(plot) configure -data $bytes
         ReceiveEcho <<line "<read for [image width $_image(plot)]x[image height $_image(plot)] image>"
- puts stderr "<read for [image width $_image(plot)]x[image height $_image(plot)] image>"
     } elseif { $info(type) == "print" } {
         set tag $this-print-$info(-token)

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -42 +42 @@
 
     private variable _icon 0
-
+    private variable _getimage 0
     private variable _mevent;           # info used for mouse event operations
     private variable _rocker;           # info used for rock operations
@@ -65 +65 @@
     private variable _cacheid ""
     private variable _cacheimage ""
-
-    private variable _delta1 10
-    private variable _delta2 2
 
     private common _settings  ;         # Array of settings for all known 
@@ -80 +77 @@
     private variable _buffering 0;
     private variable _resizePending 0;
+    private variable _updatePending 0;
+    private variable _rotatePending 0;
     private variable _width
     private variable _height
-    private variable _restore 1;        # Restore camera settings
+    private variable _reset 1;  # Restore camera settings
     private variable _cell 0;           # Restore camera settings
-    private variable _getimage 0;
+    private variable _flush 1
 
     constructor { hostlist args } {
@@ -99 +98 @@
     private method BuildSettingsTab {}
     private method DoResize {} 
+    private method DoRotate {} 
+    private method DoUpdate {} 
     private method EventuallyResize { w h } 
+    private method EventuallyRotate { a b c } 
+    private method EventuallyChangeSettings { args } 
     private method GetImage { widget }
     private method ReceiveImage { size cacheid frame rock }
     private method WaitIcon { option widget }
-    private method DownloadPopup { popup command } 
     private method AddImageControls { frame widget }
     private method SetWaitVariable { value } {
         set _getimage $value 
-    }
-    private method GetWaitVariable {} {
-        return $_getimage 
     }
     private method WaitForImage {} {
@@ -143 +142 @@
     private method StickRadius {option {models "all"} }
     private method OrthoProjection {option}
-    private method Representation {option {model "all"} }
+    private method Representation { {option ""} }
     private method CartoonTrace {option {model "all"}}
     private method ComputeParallelepipedVertices { dataobj }
@@ -160 +159 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::constructor {hostlist args} {
+    set _serverType "pymol"
+
     # Register events to the dispatcher.  Base class expects !rebuild
     # event to be registered.
@@ -170 +171 @@
     $_dispatcher register !resize
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Update event
+    $_dispatcher register !update
+    $_dispatcher dispatch $this !update "[itcl::code $this DoUpdate]; list"
+
+    # Rotate event
+    $_dispatcher register !rotate
+    $_dispatcher dispatch $this !rotate "[itcl::code $this DoRotate]; list"
 
     # Rocker
@@ -195 +204 @@
     set _state(client) 1
     set _hostlist $hostlist
-    set _restore 1
+    set _reset 1
 
     array set _view {
@@ -231 +240 @@
     
     itk_component add 3dview {
-        label $itk_component(plotarea).vol -image $_image(plot) \
+        label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
     } {
@@ -413 +422 @@
 }
 
-itcl::body Rappture::MolvisViewer::BuildSettingsTab {} {
-    set fg [option get $itk_component(hull) font Font]
-
-    set tab [$itk_component(main) insert end \
-        -title "Settings" \
-        -icon [Rappture::icon wrench]]
-    blt::scrollset $tab.ss \
-        -xscrollbar $tab.ss.xs \
-        -yscrollbar $tab.ss.ys \
-        -window $tab.ss.frame
-    pack $tab.ss -fill both -expand yes 
-    blt::tk::scrollbar $tab.ss.xs               
-    blt::tk::scrollbar $tab.ss.ys               
-    set inner [blt::tk::frame $tab.ss.frame]
-
-    $inner configure -borderwidth 4
-
-    label $inner.drawinglabel -text "Molecule Representation" \
-        -font "Arial 9 bold"
-
-    label $inner.pict -image $_settings($this-modelimg)
-
-    radiobutton $inner.bstick -text "balls and sticks" \
-        -command [itcl::code $this Representation ballnstick all] \
-        -variable Rappture::MolvisViewer::_settings($this-model) \
-        -value ballnstick -font "Arial 9" -pady 0 
-    Rappture::Tooltip::for $inner.bstick \
-        "Display atoms (balls) and connections (sticks) "
-
-    radiobutton $inner.spheres -text "spheres" \
-        -command [itcl::code $this Representation spheres all] \
-        -variable Rappture::MolvisViewer::_settings($this-model) \
-        -value spheres -font "Arial 9" -pady 0
-    Rappture::Tooltip::for $inner.spheres \
-        "Display atoms as spheres. Do not display bonds."
-
-    radiobutton $inner.sticks -text "sticks" \
-        -command [itcl::code $this Representation sticks all] \
-        -variable Rappture::MolvisViewer::_settings($this-model) \
-        -value sticks -font "Arial 9" -pady 0
-    Rappture::Tooltip::for $inner.sticks \
-        "Display bonds as sticks. Do not display atoms."
-
-    radiobutton $inner.lines -text "lines" \
-        -command [itcl::code $this Representation lines all] \
-        -variable [itcl::scope _settings($this-model)] \
-        -value lines -font "Arial 9" -pady 0
-    Rappture::Tooltip::for $inner.lines \
-        "Display bonds as lines. Do not display atoms."
-
-    radiobutton $inner.cartoon -text "cartoon" \
-        -command [itcl::code $this Representation cartoon all] \
-        -variable [itcl::scope _settings($this-model)] \
-        -value cartoon -font "Arial 9" -pady 0
-    Rappture::Tooltip::for $inner.cartoon \
-        "Display cartoon representation of bonds (sticks)."
-
-    scale $inner.spherescale -width 10 -font "Arial 9 bold" \
-        -from 0.1 -to 2.0 -resolution 0.05 -label "Sphere Scale" \
-        -showvalue true -orient horizontal \
-        -command [itcl::code $this SphereScale] \
-        -variable Rappture::MolvisViewer::_settings($this-spherescale)
-    $inner.spherescale set $_settings($this-spherescale)
-    Rappture::Tooltip::for $inner.spherescale \
-        "Adjust scale of atoms (spheres or balls). 1.0 is the full VDW radius."
-
-    scale $inner.stickradius -width 10 -font "Arial 9 bold" \
-        -from 0.1 -to 1.0 -resolution 0.025 -label "Stick Radius" \
-        -showvalue true -orient horizontal \
-        -command [itcl::code $this StickRadius] \
-        -variable Rappture::MolvisViewer::_settings($this-stickradius)
-    Rappture::Tooltip::for $inner.stickradius \
-        "Adjust scale of bonds (sticks)."
-    $inner.stickradius set $_settings($this-stickradius)
-
-    checkbutton $inner.labels -text "Show labels on atoms" \
-        -command [itcl::code $this labels update] \
-        -variable [itcl::scope _settings($this-showlabels)] \
-        -font "Arial 9 bold"
-    Rappture::Tooltip::for $inner.labels \
-        "Display atom symbol and serial number."
-
-    checkbutton $inner.rock -text "Rock model back and forth" \
-        -command [itcl::code $this Rock toggle] \
-        -variable Rappture::MolvisViewer::_settings($this-rock) \
-        -font "Arial 9 bold"
-    Rappture::Tooltip::for $inner.rock \
-        "Rotate the object back and forth around the y-axis."
-
-    checkbutton $inner.ortho -text "Orthoscopic projection" \
-        -command [itcl::code $this OrthoProjection update] \
-        -variable Rappture::MolvisViewer::_settings($this-ortho) \
-         -font "Arial 9 bold"
-    Rappture::Tooltip::for $inner.ortho \
-        "Toggle between orthoscopic/perspective projection modes."
-
-    checkbutton $inner.cartoontrace -text "Cartoon Trace" \
-        -command [itcl::code $this CartoonTrace update] \
-        -variable [itcl::scope _settings($this-cartoontrace)] \
-        -font "Arial 9 bold"
-    Rappture::Tooltip::for $inner.cartoontrace \
-        "Set cartoon representation of bonds (sticks)."
-
-    checkbutton $inner.cell -text "Parallelepiped" \
-        -command [itcl::code $this Cell toggle] \
-        -font "Arial 9 bold"
-    $inner.cell select
-
-    label $inner.spacer
-    blt::table $inner \
-        0,0 $inner.drawinglabel -anchor w -columnspan 4 \
-        1,1 $inner.pict -anchor w -rowspan 5 \
-        1,2 $inner.bstick -anchor w -columnspan 2 \
-        2,2 $inner.spheres -anchor w -columnspan 2 \
-        3,2 $inner.sticks -anchor w -columnspan 2 \
-        4,2 $inner.lines -anchor w -columnspan 2 \
-        5,2 $inner.cartoon -anchor w -columnspan 2 \
-        6,0 $inner.labels -anchor w -columnspan 4 -pady {1 0} \
-        7,0 $inner.rock -anchor w -columnspan 4 -pady {1 0} \
-        8,0 $inner.ortho -anchor w -columnspan 4 -pady {1 0} \
-        9,0 $inner.cartoontrace -anchor w -columnspan 4 -pady {1 0} \
-        10,0 $inner.cell -anchor w -columnspan 4 -pady {1 0} \
-        11,1 $inner.spherescale -fill x -columnspan 4 -pady {1 0} \
-        12,1 $inner.stickradius -fill x -columnspan 4 -pady {1 0} \
-
-    blt::table configure $inner c0 -resize expand -width 2
-    blt::table configure $inner c1 c2 -resize none
-    blt::table configure $inner c3 -resize expand
-    blt::table configure $inner r* -resize none
-    blt::table configure $inner r13 -resize expand
-}
-
 # ----------------------------------------------------------------------
 # DESTRUCTOR
@@ -553 +430 @@
     image delete $_image(plot)
     array unset _settings $this-*
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: add <dataobj> ?<settings>?
+#
+# Clients use this to add a data object to the plot.  The optional
+# <settings> are used to configure the plot.  Allowed settings are
+# -color, -brightness, -width, -linestyle, and -raise. Only
+# -brightness and -raise do anything.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MolvisViewer::add { dataobj {options ""}} {
+    array set params {
+        -color          auto
+        -brightness     0
+        -width          1
+        -raise          0
+        -linestyle      solid
+        -description    ""
+        -param          ""
+    }
+
+    foreach {opt val} $options {
+        if {![info exists params($opt)]} {
+            error "bad settings \"$opt\": should be [join [lsort [array names params]] {, }]"
+        }
+        set params($opt) $val
+    }
+
+    set pos [lsearch -exact $dataobj $_dlist]
+
+    if {$pos < 0} {
+        if {![Rappture::library isvalid $dataobj]} {
+            error "bad value \"$dataobj\": should be Rappture::library object"
+        }
+
+        if { !$_settings($this-showlabels-initialized) } {
+            set showlabels [$dataobj get components.molecule.about.emblems]
+            if { $showlabels != "" && [string is boolean $showlabels] } {
+                set _settings($this-showlabels) $showlabels
+            } 
+        }
+
+        lappend _dlist $dataobj
+        if { $params(-brightness) >= 0.5 } {
+            set _dobj2transparency($dataobj) "ghost"
+        } else {
+            set _dobj2transparency($dataobj) "normal"
+        }
+        set _dobj2raise($dataobj) $params(-raise)
+        debug "setting parameters for $dataobj\n"
+
+        if { [isconnected] } {
+            $_dispatcher event -idle !rebuild
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: delete ?<dataobj> <dataobj> ...?
+#
+# Clients use this to delete a dataobj from the plot. If no dataobjs
+# are specified, then all dataobjs are deleted.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MolvisViewer::delete { args } {
+    if {[llength $args] == 0} {
+        set args $_dlist
+    }
+
+    # delete all specified dataobjs
+    set changed 0
+    set _flush 1
+    foreach dataobj $args {
+        set pos [lsearch -exact $_dlist $dataobj]
+        if {$pos >= 0} {
+            set _dlist [lreplace $_dlist $pos $pos]
+            if { [info exists _obj2models($dataobj)] } {
+                foreach model $_obj2models($dataobj) {
+                    array unset _active $model
+                }
+            }
+            array unset _obj2models $dataobj
+            array unset _dobj2transparency $dataobj
+            array unset _dobj2color $dataobj
+            array unset _dobj2width $dataobj
+            array unset _dobj2dashes $dataobj
+            array unset _dobj2raise $dataobj
+            set changed 1
+        }
+    }
+
+    # if anything changed, then rebuild the plot
+    if {$changed} {
+        if { [isconnected] } {
+            $_dispatcher event -idle !rebuild
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: get
+#
+# Clients use this to query the list of objects being plotted, in
+# order from bottom to top of this result.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MolvisViewer::get {} {
+    # put the dataobj list in order according to -raise options
+    set dlist $_dlist
+    foreach obj $dlist {
+        if {[info exists _dobj2raise($obj)] && $_dobj2raise($obj)} {
+            set i [lsearch -exact $dlist $obj]
+            if {$i >= 0} {
+                set dlist [lreplace $dlist $i $i]
+                lappend dlist $obj
+            }
+        }
+    }
+    return $dlist
 }
 
@@ -673 +668 @@
         return 0
     }
-    set _restore 1 
+    set _reset 1 
     set result [VisViewer::Connect $hosts]
     if { $result } {
@@ -766 +761 @@
 }
 
+itcl::body Rappture::MolvisViewer::BuildSettingsTab {} {
+    set fg [option get $itk_component(hull) font Font]
+
+    set tab [$itk_component(main) insert end \
+        -title "Settings" \
+        -icon [Rappture::icon wrench]]
+    blt::scrollset $tab.ss \
+        -xscrollbar $tab.ss.xs \
+        -yscrollbar $tab.ss.ys \
+        -window $tab.ss.frame
+    pack $tab.ss -fill both -expand yes 
+    blt::tk::scrollbar $tab.ss.xs               
+    blt::tk::scrollbar $tab.ss.ys               
+    set inner [blt::tk::frame $tab.ss.frame]
+
+    $inner configure -borderwidth 4
+
+    label $inner.rep_l -text "Molecule Representation" \
+        -font "Arial 9"
+
+    label $inner.pict -image $_settings($this-modelimg)
+
+    radiobutton $inner.bstick -text "balls and sticks" \
+        -command [itcl::code $this Representation ballnstick] \
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value ballnstick -font "Arial 9" -pady 0 
+    Rappture::Tooltip::for $inner.bstick \
+        "Display atoms (balls) and connections (sticks) "
+
+    radiobutton $inner.spheres -text "spheres" \
+        -command [itcl::code $this Representation spheres] \
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value spheres -font "Arial 9" -pady 0
+    Rappture::Tooltip::for $inner.spheres \
+        "Display atoms as spheres. Do not display bonds."
+
+    radiobutton $inner.sticks -text "sticks" \
+        -command [itcl::code $this Representation sticks] \
+        -variable Rappture::MolvisViewer::_settings($this-model) \
+        -value sticks -font "Arial 9" -pady 0
+    Rappture::Tooltip::for $inner.sticks \
+        "Display bonds as sticks. Do not display atoms."
+
+    radiobutton $inner.lines -text "lines" \
+        -command [itcl::code $this Representation lines] \
+        -variable [itcl::scope _settings($this-model)] \
+        -value lines -font "Arial 9" -pady 0
+    Rappture::Tooltip::for $inner.lines \
+        "Display bonds as lines. Do not display atoms."
+
+    radiobutton $inner.cartoon -text "cartoon" \
+        -command [itcl::code $this Representation cartoon] \
+        -variable [itcl::scope _settings($this-model)] \
+        -value cartoon -font "Arial 9" -pady 0
+    Rappture::Tooltip::for $inner.cartoon \
+        "Display cartoon representation of bonds (sticks)."
+
+    scale $inner.spherescale -width 10 -font "Arial 9" \
+        -from 0.1 -to 2.0 -resolution 0.05 -label "Sphere Scale" \
+        -showvalue true -orient horizontal \
+        -command [itcl::code $this EventuallyChangeSettings] \
+        -variable Rappture::MolvisViewer::_settings($this-spherescale)
+    $inner.spherescale set $_settings($this-spherescale)
+    Rappture::Tooltip::for $inner.spherescale \
+        "Adjust scale of atoms (spheres or balls). 1.0 is the full VDW radius."
+
+    scale $inner.stickradius -width 10 -font "Arial 9" \
+        -from 0.1 -to 1.0 -resolution 0.025 -label "Stick Radius" \
+        -showvalue true -orient horizontal \
+        -command [itcl::code $this EventuallyChangeSettings] \
+        -variable Rappture::MolvisViewer::_settings($this-stickradius)
+    Rappture::Tooltip::for $inner.stickradius \
+        "Adjust scale of bonds (sticks)."
+    $inner.stickradius set $_settings($this-stickradius)
+
+    checkbutton $inner.labels -text "Show labels on atoms" \
+        -command [itcl::code $this labels update] \
+        -variable [itcl::scope _settings($this-showlabels)] \
+        -font "Arial 9"
+    Rappture::Tooltip::for $inner.labels \
+        "Display atom symbol and serial number."
+
+    checkbutton $inner.rock -text "Rock model back and forth" \
+        -command [itcl::code $this Rock toggle] \
+        -variable Rappture::MolvisViewer::_settings($this-rock) \
+        -font "Arial 9"
+    Rappture::Tooltip::for $inner.rock \
+        "Rotate the object back and forth around the y-axis."
+
+    checkbutton $inner.ortho -text "Orthoscopic projection" \
+        -command [itcl::code $this OrthoProjection update] \
+        -variable Rappture::MolvisViewer::_settings($this-ortho) \
+         -font "Arial 9"
+    Rappture::Tooltip::for $inner.ortho \
+        "Toggle between orthoscopic/perspective projection modes."
+
+    checkbutton $inner.cartoontrace -text "Cartoon Trace" \
+        -command [itcl::code $this CartoonTrace update] \
+        -variable [itcl::scope _settings($this-cartoontrace)] \
+        -font "Arial 9"
+    Rappture::Tooltip::for $inner.cartoontrace \
+        "Set cartoon representation of bonds (sticks)."
+
+    checkbutton $inner.cell -text "Parallelepiped" \
+        -command [itcl::code $this Cell toggle] \
+        -font "Arial 9"
+    $inner.cell select
+
+    label $inner.spacer
+    blt::table $inner \
+        0,0 $inner.drawinglabel -anchor w -columnspan 4 \
+        1,1 $inner.pict -anchor w -rowspan 5 \
+        1,2 $inner.bstick -anchor w -columnspan 2 \
+        2,2 $inner.spheres -anchor w -columnspan 2 \
+        3,2 $inner.sticks -anchor w -columnspan 2 \
+        4,2 $inner.lines -anchor w -columnspan 2 \
+        5,2 $inner.cartoon -anchor w -columnspan 2 \
+        6,0 $inner.labels -anchor w -columnspan 4 -pady {1 0} \
+        7,0 $inner.rock -anchor w -columnspan 4 -pady {1 0} \
+        8,0 $inner.ortho -anchor w -columnspan 4 -pady {1 0} \
+        9,0 $inner.cartoontrace -anchor w -columnspan 4 -pady {1 0} \
+        10,0 $inner.cell -anchor w -columnspan 4 -pady {1 0} \
+        11,1 $inner.spherescale -fill x -columnspan 4 -pady {1 0} \
+        12,1 $inner.stickradius -fill x -columnspan 4 -pady {1 0} \
+
+    blt::table configure $inner c0 -resize expand -width 2
+    blt::table configure $inner c1 c2 -resize none
+    blt::table configure $inner c3 -resize expand
+    blt::table configure $inner r* -resize none
+    blt::table configure $inner r13 -resize expand
+}
 
 # ----------------------------------------------------------------------
@@ -785 +911 @@
     set _cell 0
 
-    if { $_restore } {
+    if { $_reset } {
         set _rocker(server) 0
         set _cacheid 0
@@ -812 +938 @@
         }
         if { ![info exists _dataobjs($model-$state)] } {
-            set data1 ""
+            set data1      ""
             set serial    1
 
@@ -930 +1056 @@
             set vertices [ComputeParallelepipedVertices $dataobj]
             SendCmd "raw -defer {verts = \[$vertices\]\n}"
-            SendCmd "raw -defer {run \$PYMOL_PATH/rappture/box.py\n}"
+            SendCmd "raw -defer {run \$PYMOL_SITE_PATH/rappture/box.py\n}"
             SendCmd "raw -defer {draw_box(verts)\n}"
             set _cell 1
@@ -993 +1119 @@
         set flush 0
     }
-    if { $_restore } {
+    if { $_reset } {
         # Set or restore viewing parameters.  We do this for the first
         # model and assume this works for everything else.
@@ -1008 +1134 @@
 
         SendCmd "raw -defer {zoom complete=1}"
-        set _restore 0
+        set _reset 0
     }
     if { $changed } {
@@ -1019 +1145 @@
         Cell update
         OrthoProjection update 
-        Representation update 
+        Representation update
     }
     set tab [$itk_component(main) panel "Settings"]
@@ -1032 +1158 @@
         set readyForNextFrame 0;        # Don't advance to the next frame
                                         # until we get an image.
-        SendCmd "bmp";                  # Flush the results.
+        #SendCmd "ppm";                 # Flush the results.
+        set _flush 0
     }
     set _buffering 0;                   # Turn off buffering.
@@ -1082 +1209 @@
     set _height $h
     if { !$_resizePending } {
-        $_dispatcher event -idle !resize
+        $_dispatcher event -after 400 !resize
         set _resizePending 1
+    }
+}
+
+itcl::body Rappture::MolvisViewer::DoRotate {} {
+    SendCmd "rotate $_view(a) $_view(b) $_view(c)"
+    set _rotatePending 0
+}
+    
+itcl::body Rappture::MolvisViewer::EventuallyRotate { a b c } {
+    set _view(a) $a 
+    set _view(b) $b
+    set _view(c) $c 
+    if { !$_rotatePending } {
+        $_dispatcher event -after 50 !rotate
+        set _rotatePending 1
+    }
+}
+
+itcl::body Rappture::MolvisViewer::DoUpdate { } {
+    set scale  $_settings($this-spherescale)
+    set radius $_settings($this-stickradius) 
+    set overridescale [expr $scale * 0.8]
+    set overrideradius [expr $radius * 0.8]
+    SendCmd "spherescale -model all $overridescale"
+    SendCmd "stickradius -model all $overrideradius"
+    set models [array names _mlist]
+    foreach model $models {
+        if { [info exists _active($model)] } {
+            SendCmd "spherescale -model $model $scale"
+            SendCmd "stickradius -model $model $radius"
+        }
+    }
+    set _updatePending 0
+}
+
+itcl::body Rappture::MolvisViewer::EventuallyChangeSettings { args } {
+    if { !$_updatePending } {
+        $_dispatcher event -after 400 !update
+        set _updatePending 1
     }
 }
@@ -1278 +1444 @@
         set _view(my) [expr {$_view(my) + $my}]
         set _view(mz) [expr {$_view(mz) + $mz}]
-        SendCmd "rotate $mx $my $mz"
+        #SendCmd "rotate $mx $my $mz"
+        EventuallyRotate $mx $my $mz
         debug "_vmmouse: rotate $_view(mx) $_view(my) $_view(mz)"
     }
@@ -1374 +1541 @@
                     vz $vz
                 }]
-                SendCmd "rotate $a $b $c"
+                EventuallyRotate $a $b $c
+                #SendCmd "rotate $a $b $c"
                 debug "Rotate $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
                 set _click(x) $x
@@ -1398 +1566 @@
 # our scene.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::Representation {option {model "all"} } {
+itcl::body Rappture::MolvisViewer::Representation { { option "" } } {
+    if { $option == "" } {
+        set value [$itk_component(representation) value]
+        set option [$itk_component(representation) translate $value]
+    }
     if { $option == $_mrep } {
         return 
@@ -1419 +1591 @@
     set _mrep $option
 
-    if { $model == "all" } {
-        set models [array names _mlist]
-    } else {
-        set models $model
-    }
-
-    foreach model $models {
+
+    foreach model [array names _mlist] {
         if { [info exists _model($model-rep)] } {
             if { $_model($model-rep) != $option } {
@@ -1523 +1690 @@
 }
 
-
-# ----------------------------------------------------------------------
-# USAGE: add <dataobj> ?<settings>?
-#
-# Clients use this to add a data object to the plot.  The optional
-# <settings> are used to configure the plot.  Allowed settings are
-# -color, -brightness, -width, -linestyle, and -raise. Only
-# -brightness and -raise do anything.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::add { dataobj {options ""}} {
-    array set params {
-        -color          auto
-        -brightness     0
-        -width          1
-        -raise          0
-        -linestyle      solid
-        -description    ""
-        -param          ""
-    }
-
-    foreach {opt val} $options {
-        if {![info exists params($opt)]} {
-            error "bad settings \"$opt\": should be [join [lsort [array names params]] {, }]"
-        }
-        set params($opt) $val
-    }
-
-    set pos [lsearch -exact $dataobj $_dlist]
-
-    if {$pos < 0} {
-        if {![Rappture::library isvalid $dataobj]} {
-            error "bad value \"$dataobj\": should be Rappture::library object"
-        }
-
-        if { !$_settings($this-showlabels-initialized) } {
-            set showlabels [$dataobj get components.molecule.about.emblems]
-            if { $showlabels != "" && [string is boolean $showlabels] } {
-                set _settings($this-showlabels) $showlabels
-            } 
-        }
-
-        lappend _dlist $dataobj
-        if { $params(-brightness) >= 0.5 } {
-            set _dobj2transparency($dataobj) "ghost"
-        } else {
-            set _dobj2transparency($dataobj) "normal"
-        }
-        set _dobj2raise($dataobj) $params(-raise)
-        debug "setting parameters for $dataobj\n"
-
-        if { [isconnected] } {
-            $_dispatcher event -idle !rebuild
-        }
-    }
-}
 
 #
@@ -1598 +1710 @@
     }
     SendCmd "reset"
+    DoResize
     SendCmd "rotate $_view(mx) $_view(my) $_view(mz)"
     debug "ResetView: rotate $_view(mx) $_view(my) $_view(mz)"
@@ -1603 +1716 @@
     SendCmd "zoom $_view(zoom)"
 }
-
-# ----------------------------------------------------------------------
-# USAGE: get
-#
-# Clients use this to query the list of objects being plotted, in
-# order from bottom to top of this result.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::get {} {
-    # put the dataobj list in order according to -raise options
-    set dlist $_dlist
-    foreach obj $dlist {
-        if {[info exists _dobj2raise($obj)] && $_dobj2raise($obj)} {
-            set i [lsearch -exact $dlist $obj]
-            if {$i >= 0} {
-                set dlist [lreplace $dlist $i $i]
-                lappend dlist $obj
-            }
-        }
-    }
-    return $dlist
-}
-
-# ----------------------------------------------------------------------
-# USAGE: delete ?<dataobj> <dataobj> ...?
-#
-# Clients use this to delete a dataobj from the plot. If no dataobjs
-# are specified, then all dataobjs are deleted.
-# ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::delete { args } {
-    if {[llength $args] == 0} {
-        set args $_dlist
-    }
-
-    # delete all specified dataobjs
-    set changed 0
-    foreach dataobj $args {
-        set pos [lsearch -exact $_dlist $dataobj]
-        if {$pos >= 0} {
-            set _dlist [lreplace $_dlist $pos $pos]
-            if { [info exists _obj2models($dataobj)] } {
-                foreach model $_obj2models($dataobj) {
-                    array unset _active $model
-                }
-            }
-            array unset _obj2models $dataobj
-            array unset _dobj2transparency $dataobj
-            array unset _dobj2color $dataobj
-            array unset _dobj2width $dataobj
-            array unset _dobj2dashes $dataobj
-            array unset _dobj2raise $dataobj
-            set changed 1
-        }
-    }
-
-    # if anything changed, then rebuild the plot
-    if {$changed} {
-        if { [isconnected] } {
-            $_dispatcher event -idle !rebuild
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# OPTION: -device
-# ----------------------------------------------------------------------
-itcl::configbody Rappture::MolvisViewer::device {
-    if {$itk_option(-device) != "" } {
-
-        if {![Rappture::library isvalid $itk_option(-device)]} {
-            error "bad value \"$itk_option(-device)\": should be Rappture::library object"
-        }
-        $this delete
-        $this add $itk_option(-device)
-    } else {
-        $this delete
-    }
-
-    if { [isconnected] } {
-        $_dispatcher event -idle !rebuild
-    }
-}
-
 
 
@@ -1764 +1795 @@
     $_dispatcher event -after 60000 !pngtimeout
     WaitIcon start $inner.icon
-    grab set -local $inner
+    grab set $inner
     focus $inner.cancel
     
@@ -2105 +2136 @@
     return $vertices
 }
+
+
+# ----------------------------------------------------------------------
+# OPTION: -device
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::MolvisViewer::device {
+    if {$itk_option(-device) != "" } {
+        if {![Rappture::library isvalid $itk_option(-device)]} {
+            error "bad value \"$itk_option(-device)\": should be Rappture::library object"
+        }
+        $this delete
+        $this add $itk_option(-device)
+    } else {
+        $this delete
+    }
+
+    if { [isconnected] } {
+        $_dispatcher event -idle !rebuild
+    }
+}
+