Commits

Anonymous committed 538048a

Import from CVS: tag r20-3b1

  • Participants
  • Parent commits f659db2
  • Tags r20-3b1

Comments (0)

Files changed (134)

File CHANGES-beta

 							-*- indented-text -*-
-to 20.2
--- tm-vm-8.12 + manual
--- VM-6.31
--- b2m.c/rcs-checking synch with Emacs/Mule zeta.
-
-to 20.2 beta6
--- ediff-2.65 Courtesy of Michael Kifer
--- Gnus-5.4.52
--- Miscellaneous bug fixes
--- W3-3.0.86
-
-to 20.2 beta5
--- Interface Changes:
-   `allow-deletion-of-last-visible-frame' becomes a boolean
-   `delete-auto-save-files' becomes a boolean
--- Miscellaneous Customization cleanup from Hrvoje Niksic
--- Miscellaneous Egg fixes from Jareth Hein
--- Gnus-5.4.51
--- etags.c-11.86
--- Byte compiler optimization backed out for release
--- Miscellaneous bug fixes
-
-to 20.2 beta4
--- 1+ Byte compiler optimization courtesy of Jamie Zawinski
--- Miscellaneous Mule/ Egg/Quail patches courtesy of Jareth Hein
--- featurep reader macro code introduced and enabled for this beta only.
--- Do not default with-xim to Motif if Motif libraries are availble
--- Delete/Backspace correction from Gary Foster
--- Gnus-5.4.50
--- VM-6.30
--- miscellaneous bug fixes
-
-to 20.2 beta3
--- Miscellaneous Mule/ Egg/Quail patches courtesy of Jareth Hein
--- Various hyperbole fixes courtesy of Bob Weiner
--- Restoration of obsolete symbol overriding-file-coding-system
--- MULE-ization of lib-complete.el
--- W3-3.0.85
--- xmine-1.8 coutesy of Jens Lautenbacher
--- efs-1.15-x5 Courtesy of Michael Sperber
--- miscellaneous bug fixes
--- balloon-help.el-1.06 Courtesy of Kyle Jones
-
-to 20.2 beta2
--- sundry psgml fixes
--- VM-6.29
--- Gnus-5.4.46
--- W3-3.0.84
--- miscellaneous bug fixes
--- edmacro.el-3.10
--- Reverted to custom-1.84
--- Make use of DECnet support a configure time option.
-
-to 20.2 beta1
--- W3-3.0.83 courtesy of William Perry
--- edmacro.el-3.09 courtesy of Hrvoje Niksic
--- live-icon.el-1.3 courtesy of Karl Hegbloom
--- values setf method
--- miscellaneous bug fixes
--- verilog.el-2.25 courtesy of Michael McNamara
--- tpu-edt.el modifications for zmacs region compatibility courtesy of
-   Kevin Oberman.
--- custom-1.89 courtesy of Per Abrahamsen
--- etags.c-11.83 courtesy of F. Potorti`
--- Mega Customizations courtesy of Hrvoje Niksic
--- "C" balloon help courtesy of Douglas Keller (experimental - placeholder)
--- update version numbers
-
-[XEmacs 20.1 was never released to the net]
-
-to 20.1
--- facemenu.el boo boo.
--- VM-6.27
--- README.htmlpro left as reference for htmlpro.dtd
-
--- Commercial sound driver fix
--- Wnn6 corrections
--- Filling corrections
--- Animated GIF boo boo.
-
--- time.el-1.15
--- itimer.el-1.06
--- facemenu-keymap moved to `C-x F'
--- MULE anchored beginning regexp bug fix courtesy of David Moore
--- VM-6.26
--- miscellaneous bug fixes
-
-to 20.1 beta15
--- tm-vm.el-8.11 -- Courtesy of Oscar Figuerido
--- Restoration of zawinski features in telnet.el.
--- paren.el & ps-print.el customized
--- Gnus-5.4.45
--- W3-3.0.82
--- xmine.el-1.7
--- Crisp.el-1.17
--- miscellaneous bug fixes
--- Custom-1.84
-
-to 20.1 beta14
--- about.el hacking
--- W3-3.0.81
--- autodetect restored for use with Glyphs
--- Gnus-5.4.43
--- miscellaneous bug fixes
-
-[beta13 was skipped]
-
-to 20.1 beta12
--- Synch to Emacs/MULE patches courtesy of MORIOKA Tomohiko
--- VM-6.24
--- miscellaneous documentation fixes/updates
--- etc/GNUS-NEWS added from Gnus-5.4.42 distribution
--- xemacs-version.h version in C stack backtrace hack
--- More unimplemented NeXTstep cruft removed
--- W3-3.0.80
--- Lots and lots of Custom-ization by Hrvoje Niksic
--- temp-buffer-shrink-to-fit (still needs a better name) defaults to nil.
--- Gnus-5.4.42
--- Cleanup -- vms C files removed, dummy NeXTStep C files removed.  They're
-   in the CVS attic if anyone wishes to revive this code.
--- Custom-1.74
--- miscellaneous bug fixes
-
-to 20.1 beta11
--- Move lisp/auctex/style/*.el to etc/auctex/style/.
--- regenerated finder database (every lisp file should have a Keywords: line)
--- VM-6.23
--- dired-1.15-x4
--- time-1.13
--- xmine-1.2
--- More MS Windows NT patches Courtesy of Marc Paquette
--- webster-www.el Courtesy of Tomasz Cholewo
--- webster.el, webster-ucb.el removed from distribution
--- movemail imported from Emacs 19.34 (With POP/Hesiod/Kerberos support)
--- Custom-1.69
--- miscellaneous bug fixes
--- W3-3.0.79
--- Gnus-5.4.40
--- GNATS/send-pr fixes, should work now
--- edmacro-3.07
--- configure fixes
--- cc-mode-4.390
--- restore inline.c
-
-to 20.1 beta10
--- custom-1.68 [Beyond 19.15]
--- W3-3.0.75
--- Documentation updates
--- cc-mode-4.388
--- Custom-1.67
--- EFS fixes courtesy of Michael Sperber
--- time.el-1.11
--- Various cursor glitch patches courtesy of Darrell Kindred
--- Irix -rpath support courtesy of Darrell Kindred
--- Miscellaneous bug fixes
--- EFS synch to 19.15 for default-dir.el
--- hm--html-mode-5.5
--- VM-6.22
--- Gnus-5.4.37
-
-to 20.1 beta9
--- VM-6.21
--- tm-7.106
--- Garbage Collection patches courtesy of David Moore
--- time.el update
--- minor build tweaks
--- EFS integration/bug fix patches courtesy of Michael Sperber
--- MULE safe char-before added
--- preceding-char, following-char are obsolete and broken, do not use them
--- user-mail-address now uses the function
--- miscellaneous bug fixes
--- Egg patches courtesy of Jareth Hein
--- corrections to lib-src script setup in --srcdir configuration
--- itimer.el-1.05
--- hyperbole-4.023
--- cc-mode.el-4.387
--- floating-toolbar.el-1.02
--- balloon-help.el-1.05
--- W3-3.0.71
--- Custom-1.65
--- Gnus-5.4.33
--- strip unimplemented subwindows subr code
--- GIF correction courtesy Darrell Kindred
-
-to 20.1 beta8
--- GIF crash fix courtesy of David Moore
--- Fix for problem dumping comint with sparcworks
--- Fixes for problems during build with dynamic puresize
--- xpm background color patch courtesy of Darrell Kindred
--- Custom-1.64
--- Gnus-5.4.28
--- miscellaneous bug fixes
--- timer.el backed out, we're not ready for it.
--- GNATS-3.101 info documentation added, further integration of send-pr.el.
-
-to 20.1 beta7
--- Update to time.el.
--- htmlpro DTD, IE3 DTDs added to etc/sgml.
--- I18N patches and more courtesy of Jareth Hein
--- Invisibility to visibility extent patch courtesy of David Moore
-   (fixes long-standing Gnus annoyance when unhiding .signature).
--- cperl-mode-1.31+
--- Synch to Emacs/mule API
--- Configure gets --canna-libs and --canna-includes courtesy of YAMAMOTO Toru
--- w3-3.0.68
--- Custom-1.63
--- Define BROKEN_SIGIO for SunOS 4.1
--- timer.el courtesy of Kyle Jones
--- itimer.el-1.04
--- cperl-mode.el-1.31
--- tm-7.105.2
--- cc-mode-4.379 courtesy of Barry Warsaw
--- more about.el hacking
--- Logo adjusted to be more colormap friendly
--- efs/dired updates courtesy of Michael Sperber [on hold]
--- miscellaneous bug fixes
--- hyperbole fix
--- Gnus-5.4.26
--- sit-for, etc.  The Final Solution courtesy of David Moore
-
-to 20.1 beta6
--- filladapt.el-2.09 courtesy of Kyle Jones
--- itimer.el-1.03
--- more work on sit-for, etc. courtesy of David Moore
--- describe-beta command added, etc/BETA, C-h B
--- updates to hyper-apropos.el courtesy of Christoph Wedler
--- texinfo manual updated to 2.23
--- texinfo.tex update to 3.9
--- Gnus-5.4.23
--- tm-7.105.1
--- W3-3.0.65
--- Custom-1.59
--- AUCTeX-9.7l
--- VM-6.19
--- Build fixes from Martin Buchholz
--- More work on Linux libc-5/libc-6 portability, it works out of the box now?
--- more frame visibility patches courtesy of Jan Vroonhof
--- Synch to MULE patches courtesy of MORIOKA Tomohiko
--- graphical updates to time.el
--- gnuattach fixes courtesy of Hunter Kelly
--- dynamic PURESIZE fixes
--- miscellaneous bug fixes
-
-to 20.1 beta5
--- bug fix to gnus-mime.el
--- custom-1.50
-
-to 20.1 beta4
--- mine.el (almost) fully ported to XEmacs
--- time.el updated for XEmacs Courtesy of Jens Lautenbacher
--- Gnus-5.4.17
--- some historical files removed from etc for space
--- id-select.el-1.4.5
--- M-: (eval-expression) is now enabled by default
--- Freeze frame fixes Courtesy of Jan Vroonhof and Darrell Kindred
--- mule categories implemented Courtesy of Jareth Hein
--- mic-paren.el-1.3.1
--- builds with dynamic PURESIZE should work better
--- hyperbole-4.022
-
-to 20.1 beta3
--- Customized edit-faces Courtesy of Jens Lautenbacher
--- W3-3.0.62
--- AUCTeX-9.7k
--- mic-paren.el-1.3 Courtesy of Mikael Sj�din
--- hm--html-menus-5.3
--- custom-1.46
--- site-load.el preconfigured to work with DOC string generation
--- regex.c MULE bugfix Courtesy of David Moore
--- python-mode.el-2.90
--- balloon-help-1.04
--- xrdb-mode.el-1.21
--- itimer.el-1.01 Courtesy of Kyle Jones
--- Miscellaneous bug fixes.
--- Dynamic computation of PURESIZE during build
-
-to 20.1 beta2
--- First cut at MS Windows NT support Courtesy of David Hobley
--- itimer.el-1.01 Courtesy of Kyle Jones
--- hm--html-menus-5.2
--- redo.el-1.01
--- VM-6.15
--- miscellaneous efs/dired fixes
--- OO-Browser-2.10 Courtesy of Bob Weiner
--- Yet another man.el Courtesy of jwz
--- Addition to sample.emacs Courtesy of jwz
--- additions/corrections to about.el
--- hyperbole-4.021 Courtesy of Bob Weiner
--- Restoration of reportmail.el Courtesy of jwz
--- Restoration of passwd.el Courtesy of jwz
--- AUC TeX-9.7i Courtesy of Per Abrahamsen (Contributed code integrated
-       courtesy of Soren Dayton)
--- viper-2.93 Courtesy of Michael Kifer
--- ediff-2.64 Courtesy of Michael Kifer
--- edmacro.el-3.05
--- detached-minibuf.el Courtesy of Alvin Shelton
--- whitespace-mode.el Courtesy of Heiko Muenkel
--- winmgr-mode.el Courtesy of David Konerding, Stefan Strobel & Barry Warsaw
--- Gnus-5.4.15
--- custom-1.44
--- error-message-string ported from Emacs 19.34.
--- fast-lock.el-3.11.01 Courtesy of Simon Marshall
--- lazy-lock.el-1.16 Courtesy of Simon Marshall
--- speedbar.el Courtesy of Eric Ludlam and Jens Lautenbacher
--- W3-3.0.60
--- Miscellaneous bug fixes
--- igrep.el-2.56 Courtesy of Kevin Rodgers
--- frame-icon.el Courtesy of Michael Lamoureux and Bob Weiner
--- xrdb-mode.el-1.17 Courtesy of Barry Warsaw
-
-to 20.1 beta1
--- New symbol `signal-error-on-buffer-boundary'.  Set to nil to avoid
-    lossage of zmacs region when moving against buffer boundaries.
--- python-mode.el-2.89 Courtesy of Barry Warsaw
--- added mouse-[123] and down-mouse-[123] Emacs-compatible keysyms
--- Clicking on `**' buffer modified status in mode-line now works the same
-    way as C-x C-q.
--- Miscellanous bug fixes from a number of people
--- mine.el-1.17 Courtesy of Jacques Duthen [New]
--- fast-lock.el-3.10.2 Courtesy of Simon Marshall
--- browse-cltl2.el-1.1 Courtesy of Holger Schauer [New]
--- eldoc.el-1.8 Courtesy of Noah Friedman [New]
--- webjump.el-1.4 Courtesy of Neil W. Van Dyke [New]
--- mime-setup is no longer dumped on SunPro/MULE.
--- Canna coredump fixed
--- verilog-mode.el Courtesy of Michael McNamara & Adrian Aichner [New]
--- overlay.el Courtesy of Joseph Nuspl [New]
--- hm--html-menus-5.1 Courtesy of Heiko Muenkel
--- tm-7.105 Courtesy of MORIOKA Tomohiko
--- Initial port of edmacro.el courtesy of Hrvoje Niksic [New]
--- Native sound support for FreeBSD Courtesy Dick van den Burg
--- Correct detection of GIF89, and implement detection of PNG
--- efs-1.15 courtesy of Andy Norman and Michael Sperber [New]
--- Easy customization of toolbar support courtesy of Hrvoje Niksic
--- balloon-help-1.03 courtesy of Kyle Jones [New]
--- 'compatible byte compiler warning type added and turned off by default
--- redo.el-1.00 courtesy of Kyle Jones [New]
--- floating-toolbar.el courtesy of Kyle Jones [New]
--- Initial Wnn/egg support and bug fixes courtesy of Jareth Hein [New]
--- Gnus-5.4.12 Courtesy of Lars Magne Ingebrigtsen [Upgrade]
--- custom-1.40 Courtesy of Per Abrahamsen [New]
--- W3-3.0.59 Courtesy of William Perry
--- VM-6.13 Courtesy of Kyle Jones [Upgrade]
+to 20.3 beta1.
+-- Custom-1.97 courtesy of Per Abraham
+-- Obsolete files emacstool.c, emacsclient.c, emacsserver.c removed
+-- etags.c-11.90 courtesy of Francesco Potorti`
+-- Dragable modeline courtesy of Kyle Jones
+-- Gnuserv.el 3.1 & upgrade of gnuclient courtesy of Hrvoje Niksic
+-- Upgrade to configure 2.12 courtesy of Martin Buchholz
+-- New variable `Info-button1-follows-hyperlink' to allow disabling the
+   feature.
+-- Restore Gosling Emacs transpose-chars implementation as an option
+-- Bytecompiler optimization hacking courtesy of Jamie Zawinski
+Sat May 17 20:30:54 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-b1 is released.
+
+Fri May 16 20:38:19 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* info/dir (Packages): Update minor version number.
+
+	* etc/README: Update minor version number.
+
+	* README: Update minor version number.
+
 Tue May 13 20:35:52 1997  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs-20.2 is released.
 BUILDING AND INSTALLATION:
 
 1) Make sure your system has enough swapping space allocated to handle
-a program whose pure code is 900k bytes and whose data area is at
-least 400k and can reach 8Mb or more.  If the swapping space is
-insufficient, you will get an error in the command `temacs -batch -l
-loadup dump', found in `./src/Makefile.in.in', or possibly when
-running the final dumped XEmacs.
+   a program whose pure code is 900k bytes and whose data area is at
+   least 400k and can reach 8Mb or more.  If the swapping space is
+   insufficient, you will get an error in the command `temacs -batch
+   -l loadup dump', found in `./src/Makefile.in.in', or possibly when
+   running the final dumped XEmacs.
  
-Building XEmacs requires about 88 Mb of disk space (including the XEmacs
-sources).  Once installed, XEmacs occupies about 50 Mb in the file system
-where it is installed; this includes the executable files, Lisp libraries,
-miscellaneous data files, and on-line documentation. The amount of storage
-of the Lisp directories may be reduced by compressing the .el files. If
-the building and installation take place in different directories, then
-the installation procedure momentarily requires 88+50 Mb.
+Building XEmacs requires about 88 Mb of disk space (including the
+XEmacs sources).  Once installed, XEmacs occupies about 50 Mb in the
+file system where it is installed; this includes the executable files,
+Lisp libraries, miscellaneous data files, and on-line documentation. 
+The amount of storage of the Lisp directories may be reduced by
+compressing the .el files. If the building and installation take place
+in different directories, then the installation procedure temporarily
+requires 88+50 Mb.
 
-XEmacs requires an ANSI C compiler, such as LCC or GCC.
+XEmacs requires an ANSI C compiler, such as GCC.
 
-2) Consult `./etc/MACHINES' to see what configuration name you should
-give to the `configure' program.  That file offers hints for
-getting around some possible installation problems.
 
-3) In the top directory of the XEmacs distribution, run the program
-`configure' as follows:
+2) Decide on what other software packages you would like to use with
+XEmacs, but are not yet available on your system.  On some systems,
+Motif and CDE are optional additions.  On Solaris, the SUNWaudmo
+package enables native sound support.  There are also a number of free
+software packages that XEmacs can use.  If these are not yet available
+on your system, obtain, build and install those external packages
+before building XEmacs.  The packages XEmacs can use are:
 
-    ./configure CONFIGURATION-NAME [--OPTION[=VALUE]] ...
+   Xaw3d, XPM, JPEG, compface, PNG, zlib, OffiX, GNU DBM, Berkeley DB,
+   socks, term, NAS, Canna, Wnn.
 
-The CONFIGURATION-NAME argument should be a configuration name given
-in `./etc/MACHINES'.  If omitted, `configure' will try to guess your
-system type; if it cannot, you must find the appropriate configuration
-name in `./etc/MACHINES' and specify it explicitly.
+You can get (most of) them from the XEmacs ftp site at
+ftp://ftp.xemacs.org/pub/aux
+
+If you want users on other systems to be able to use the XEmacs you
+have built, try to build those packages so that the generated
+libraries are statically linked.
+
+Use the --site-includes and --site-libraries options when building
+XEmacs to allow configure to find the external software packages.
+
+
+3) In the top level directory of the XEmacs distribution, run the
+   program `configure' as follows:
+
+    ./configure [CONFIGURATION-NAME] [--OPTION[=VALUE]] ...
+
+Usually, you should let `configure' (actually the shell script
+`config.guess') guess your system type, by omitting the
+CONFIGURATION-NAME argument.  If you like to experiment, specify a
+configuration name in the form MACHINE-VENDOR-OPSYS, for example:
+
+sparc-sun-solaris2.6
+
+See config.guess and configure.in for valid values for MACHINE,
+VENDOR, and OPSYS.  Also check `./etc/MACHINES' for advice on building
+on particular machines.
 
 If you don't want X support, specify `--with-x=no'.  If you omit this
-option, `configure' will try to figure out for itself whether your
-system has X, and arrange to use it if present.
-
-Additional support can be included for the NeXTstep system by
-specifying the flag `--with-ns'.  This is not yet fully supported.
+option, `configure' will try to autodetect whether your system has X,
+and arrange to use it if present.
 
 The `--x-includes=DIR' and `--x-libraries=DIR' options tell the build
 process where the compiler should look for the include files and
 The `--site-includes=DIR' and `--site-libraries=DIR' options allow you
 to specify additional places the compiler should look for include
 files and object libraries.  You may specify multiple DIR's by
-enclosing the list in quotes.  On some systems (noticeably Solaris) you
-may need to use `--site-runtime-libraries=DIR'.  This will add -R
-versions of each path in addition to the -L versions.
+enclosing the list in quotes.  All the external packages you want to
+use with XEmacs (e.g. xpm, wnn, ...) described later should have their 
+include and library directories defined using these options.
+
+The `--site-runtime-libraries=DIR' option specifies additional
+directories to search for shared libraries at run time.  This may be
+necessary on some systems, or if you expect some of the libraries used 
+to build XEmacs to be in a different directory at run time than at
+build time.  Usually this will add a `-R' to each directory specified
+and use that when linking XEmacs.
 
 The `--with-gcc' option specifies that the build process should
-compile XEmacs using GCC.  The `--with-lcc' option specifies that the
-build process should compile XEmacs using Lucid C.  The `--compiler'
-option allows you to specify some other compiler to be used to compile
-XEmacs.  It is compatible with both the `--with-gcc' and `--with-lcc'
-options, so if the compiler that you specify is a special version of
-either gcc or lcc, then use the appropriate --with-gcc or --with-lcc
-flag as well as the --compiler flag.  If none of these flags is
-specified, `configure' will search for GCC in your load path, and use
-it if present.  If you don't want to use GCC, specify `--with-gcc=no'
-and the compiler will then default to 'cc'.
+compile XEmacs using GCC.  The `--compiler' option allows you to
+specify some other compiler to be used to compile XEmacs.  If neither
+option is specified, the environment variable CC is used instead.
+Otherwise the compiler will then default to 'cc'.
 
 The `--cflags' option specifies the CFLAGS the build process should
-use when compiling XEmacs.  If not used CFLAGS defaults to "-g -O" for
-gcc and "-g" for all other compilers.
+use when compiling XEmacs.  Otherwise the value of the environment
+variable CFLAGS is consulted.  If that is also undefined, CFLAGS
+defaults to "-g -O" for gcc and "-g" for all other compilers.
 
 The `--with-gnu-make' option specifies that Makefiles should be
 written to take advantage of special features of GNU Make.  GNU Make
 - XEmacs (and the other utilities users run) go in PREFIXDIR/bin
   (unless the `--exec-prefix' option says otherwise).
 - The architecture-independent files go in PREFIXDIR/lib/xemacs-VERSION
-  (where VERSION is the version number of XEmacs, like `19.14').
+  (where VERSION is the version number of XEmacs, like `20.3').
 - The architecture-dependent files go in
   PREFIXDIR/lib/xemacs-VERSION/CONFIGURATION
   (where CONFIGURATION is the configuration name, like mips-dec-ultrix4.2),
 
 For example, the command
 
-    ./configure mips-dec-ultrix --with-x
+    ./configure mips-dec-ultrix --with-x11=yes
 
 configures XEmacs to build for a DECstation running Ultrix, with
 support for the X11 window system.
 
-The `--run-in-place' option will make the installed binaries reference
-the source tree for the elisp files.
-
 The `--with-menubars=TYPE' option allows you to specify which X
 toolkit you wish to use for the menubar.  The valid options are
-`lucid', `motif' and `none'.  The default is `lucid' which is a
+`lucid', `motif' and `no'.  The default is `lucid' which is a
 Motif-lookalike menubar.  We highly recommend its usage over the real
 Motif menubar. (In fact, the Motif menubar is currently broken.)  If
-`none' is specified then support for menubars will not be compiled in.
+`no' is specified then support for menubars will not be compiled in.
 
 The `--with-scrollbars=TYPE' option allows you to specify which X
 toolkit you wish to use for the scrollbars.  The valid options are
-`lucid', `motif', `athena', `athena3d', and `none'.  The default is
-`lucid' which is a Motif-lookalike scrollbar.  If `none' is specified
+`lucid', `motif', `athena', `athena3d', and `no'.  The default is
+`lucid' which is a Motif-lookalike scrollbar.  If `no' is specified
 then support for scrollbars will not be compiled in.
 
 The `--with-dialogs=TYPE' option allows you to specify which X toolkit
 you wish to use for the scrollbars.  The valid options are `athena',
-`motif, and `none.  The `lucid' option is accepted and will result in
+`motif, and `no.  The `lucid' option is accepted and will result in
 the `athena' toolkit being used.  If the Motif toolkit can be found
 the default is `motif'.  Otherwise, the default is `athena'.  If
-`none' is specified then support for dialog boxes will not be compiled
+`no' is specified then support for dialog boxes will not be compiled
 in.
 
 The `--with-toolbars' option allows you to enable or disable toolbar
 support.  The default is `yes' as long as support for a windowing
 system is included.
 
-The `--with-xpm' option specifies that XEmacs should support X
+The `--with-gif' option specifies that XEmacs should support GIF image
+conversion.  No extra libraries are required.  This options defaults
+to `yes'.
+
+The `--with-xpm' option specifies that XEmacs should support X11
 Pixmaps.  `configure' will attempt to detect if you have the Xpm
 libraries and define `--with-xpm' for you.
 
 X-Faces.  `configure' will attempt to detect if you have the compface
 library and define `--with-xface' for you.
 
-The `--with-gif' option specifies that XEmacs should support GIF image
-conversion.  No extra libraries are required.  This options defaults
-to `yes'.
-
 The `--with-jpeg' option specifies that XEmacs should support JPEG
 image conversion.  This option requires libjpeg from the Independent
 JPEG Group which is available on the XEmacs ftp site.  `configure'
 will attempt to detect if you have libjpeg and define `--with-jpeg'
 for you.
 
-The `--with-png option specifies that XEmacs should support PNG image
-conversion.  The valid options at `yes', `no' and `gnuz'.  This option
+The `--with-png' option specifies that XEmacs should support PNG image
+conversion.  The valid options are `yes' and `no'.  This option
 requires libpng which is available on the XEmacs ftp site.  This
-option also requires a decompression library, either libz or libgz.
-The default is to use libz.  Specify `gnuz' as the option to use libgz
-instead.  `configure' will attempt to detect if you have libpng and
-define `--with-png' for you.
+option also requires a decompression library, either libz or
+libgz.  XEmacs will detect whether libz is available, and use that,
+else it will use libgz.
 
 The `--with-database' option specifies that XEmacs should be built
 with additional database support.  The valid options are `no' or a
 files and define `--with-database' for you.
 
 The `--with-socks' option specifies that XEmacs should be built with
-SOCKS support.
+SOCKS support.  This requires the libsocks library.
 
 The `--with-term' option specifies that XEmacs should be built with
 TERM support.  TERM is a way to multiplex serial lines over a simple
 ToolTalk is not yet supported on all architectures.
 
 The `--with-sparcworks' option specifies that XEmacs should be built
-with support for Sun Sparcworks 3.0.1 and up.  This functionality is
-only of use on SunOS 4.1.x and Solaris 2.x systems.
+with support for Sun Sparcworks 3.0.1 and up (including Sun WorkShop).
+This functionality is only of use on SunOS 4.1.x and Solaris 2.x
+systems.
 
-The `--with-cde option allows you to enable or disable CDE drag and
+The `--with-cde' option allows you to enable or disable CDE drag and
 drop support.  `configure' will attempt to detect this option and
 define `--with-cde' for you.
 
-The `--with-offix option allows you to enable or disable OffiX drag and
+The `--with-offix' option allows you to enable or disable OffiX drag and
 drop support.  `configure' will attempt to detect this option and
 define `--with-offix' for you.
 
 Currently this doesn't work.
 
 The `--external-widget' option specifies that XEmacs should be built
-with support for being used as a widget.  This functionality should be
-considered beta.
+with support for being used as a widget by other X11 applications.
+This functionality should be considered beta.
 
 The `--with-mocklisp' option specifies that XEmacs should be built
 with support for Mocklisp.  Do not use this option unless you have a
 The `--with-sound=TYPE' option specifies that XEmacs should be built
 with sound support.  Native (`--with-sound=native') sound support is
 currently available only on Sun SparcStations, SGI's, HP9000s, and
-Linux.  Network Audio Support (NAS) (`--with-sound=nas' or
-`--with-sound=both') is an extension to X that you may or may not have
-for your system.  For NAS, you will probably need to provide the paths
-to the nas include and library directories to configure.  `configure'
-will attempt to determine if your configuration supports sound and
+systems (such as Linux) with soundcard.h.  Network Audio Support (NAS)
+(`--with-sound=nas' or `--with-sound=both') is an extension to X that
+you may or may not have for your system.  For NAS, you will probably
+need to provide the paths to the nas include and library directories
+to configure.  If `--with-sound' is not specified, `configure' will
+attempt to determine if your configuration supports native sound and
 define --with-sound for you.  If your native sound library is not in a
-standard location you can specify where it is with the
-`--native-sound-lib=LIB' flag.  For Linux, `/dev/audio' is required
-for SunAudio files and `/dev/dsp' is required for raw data and WAVE
-format files.
+standard location you can specify it with the `--native-sound-lib=LIB'
+flag.  For Linux, `/dev/audio' is required for SunAudio files and
+`/dev/dsp' is required for raw data and WAVE format files.
 
 The `--rel-alloc' option can be used to either enable or disable use
 of the relocating allocator.  Generally, it's best to go with the
 default configuration for your system.
 
 The `--use-system-malloc' option can be use to either enable or
-disable use of the relocating allocator.  Generally, it's best to go
-with the default configuration for your system.  Note that on many
-systems using the system malloc disables the use of the relocating
-allocator.
-
-The `--with-epoch' option enables functionality taken from Epoch.
-Currently this doesn't work.
+disable use of the system malloc.  Generally, it's best to go with the
+default configuration for your system.  Note that on many systems
+using the system malloc disables the use of the relocating allocator.
 
 The `--debug' and `--error-checking' options are intended for use only
 by the developers.  `--debug' adds code to be compiled in for
 
 The `--verbose' and `--extra-verbose' options are intended for use
 only by the developers.  `--verbose' causes the results of all
-configure tests to be displayed.  `--extra-verbose' also displays the
-output of any compiler invocations done by configure.
+configure tests to be displayed.  `--extra-verbose' displays
+additional information, useful for debugging.  Another help for
+determining configure failures is the file `config.log', which
+contains the results of the compile and link tests used by configure.
+
+The `--with-mule' option enables (MUlti-Lingual Emacs) support, needed
+to suport non-Latin-1 (including Asian) languages.  The Mule support
+is not yet as stable or efficient as the `Latin1' support.   The
+following options require Mule support:
+
+The `--with-xim' option enables use of the X11 XIM mechanism to allow
+an input method to input text into XEmacs.  The input method is shared
+among all the X applications sharing an X display and using the same
+language.  The XIM support comes in 2 flavors: motif, and xlib.  If
+Motif support (the XmIm* set of functions) is available, it is
+preferred when available.  The xlib XIM support does not work quite as
+well, so by default if the XmIm* routines are autodetected, then the
+default is `--with-xim=motif', else `--with-xim=no'.
+
+The `--with-canna' option enables the use of the Canna Japanese input
+method.
 
 The `--with-wnn' and `--with-wnn6' options are for compiling with the
-Wnn multi-language input method.  `--with-wnn' is for compiling
-against Wnn-4.2 the free version of WNN.  This is beta level code.
-`--with-wnn6' is for compiling against WNN6 the commercial version of
-WNN.  This is alpha level code and very lightly tested at present.
+Wnn multi-language input method.  `--with-wnn' is for compiling with
+Wnn-4.2, the free version of WNN.  This is beta level code. 
+`--with-wnn6' is for compiling against WNN6, the commercial version
+of WNN.  This is alpha level code and very lightly tested at present.
 
-The `--wnn-includes=DIR' and `wnn-libraries=DIR' options are provided
-for specifying information about where to find WNN include directories
-and WNN libraries.  Currently you need to specify wnn-includes in most
-installations of Wnn-4.2.
+`configure' doesn't do any compilation or installation itself.  It
+just creates the files that influence those things: `./src/config.h',
+and all the Makefile's in the build tree.
 
 The `--with-pop', `--with-hesiod', and `--with-kerberos' options are used
 in conjunction with movemail.  As of XEmacs 20.1, movemail is identical
 to the one used in Emacs.
 
-`configure' doesn't do any compilation or installation
-itself.  It just creates the files that influence those things:
-`./Makefile', `src/Makefile', `lwlib/Makefile', `lib-src/Makefile',
-`man/Makefile', `dynodump/Makefile', and `./src/config.h'.  For
-details on exactly what it does, see the section called `CONFIGURATION
-BY HAND', below.
-
 When it is done, `configure' prints a description of what it did and
 creates a shell script `config.status' which, when run, recreates the
 same configuration.  If `configure' exits with an error after
 disturbing the status quo, it removes `config.status'.
 
-The work of `configure' can be done by editing various files in the
-distribution, but using `configure' is supposed to be simpler.  See
-the section called "CONFIGURATION BY HAND" below if you want to do the
-configuration yourself.
-
 4) Look at `./lisp/paths.el'; if some of those values are not right
 for your system, set up the file `./lisp/site-init.el' with XEmacs
 Lisp code to override them; it is not a good idea to edit paths.el
 
 CC=@CC@
 CPP=@CPP@
-C_SWITCH_SYSTEM=@c_switch_system@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
-C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
-LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
 YACC=@YACC@
 
 ### These help us choose version- and architecture-specific directories
 ### for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
 configuration=@configuration@
 
-### Libraries which should be edited into lib-src/Makefile.
-libsrc_libs=@libsrc_libs@
-
 # ==================== Where To Install Things ====================
 
 # The default location for installation.  Everything is placed in
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
 # and you cannot remake them without installing XEmacs first.
-MAKE_SUBDIR = lib-src lwlib dynodump src
+MAKE_SUBDIR = @MAKE_SUBDIR@
 
 # Subdirectories that can be made recursively.
 SUBDIR = ${MAKE_SUBDIR} man
 
-# The makefiles of the directories in $SUBDIR.
-SUBDIR_MAKEFILES = lib-src/Makefile lwlib/Makefile dynodump/Makefile src/Makefile
+# The makefiles of the directories in ${MAKE_SUBDIR}.
+SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
 If your system uses the lock file protocol, and fascist restrictions
 prevent ordinary users from writing the lock files in /usr/spool/mail,
 you may need to make `movemail' setgid to a suitable group such as
-`mail'.  You can use these commands (as root):
-
-	chgrp mail movemail
-	chmod 2755 movemail
-
-If your system uses the lock file protocol, and fascist restrictions
-prevent ordinary users from writing the lock files in /usr/spool/mail,
-you may need to make `movemail' setgid to a suitable group such as
 `mail'.  To do this, use the following commands (as root) after doing
 the make install.
 
-This directory tree holds version 20.2 of XEmacs, the extensible,
+This directory tree holds version 20.3 of XEmacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 See the file `etc/NEWS' for information on new features and other

File config.guess

 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Synched up with: FSF 19.31.
-
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
 #
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:V*.*)
-	# After 1.2, OSF1 uses "V1.3" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
+    alpha:OSF1:*:*)
+	# 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 alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
 	exit 0 ;;
-    alpha:OSF1:*:*)
-	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf${UNAME_RELEASE}
-        exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     amiga:NetBSD:*:*)
       echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
+    amiga:OpenBSD:*:*)
+      echo m68k-cbm-openbsd${UNAME_RELEASE}
+      exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    Pyramid*:OSx*:*:*)
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
 	else
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    sun4*:SunOS:5.*:*)
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     i86pc:SunOS:5.*:*)
-	echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
     atari*:NetBSD:*:*)
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-atari-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-sun-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-apple-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    mips:*:4*:UMIPS)
-	echo mips-mips-riscos4sysv
-	exit 0 ;;
-    mips:*:5*:RISCos)
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy \
+	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
 	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
 	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
 		echo m88k-dg-dgux${UNAME_RELEASE}
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 	exit 0 ;;
-   ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+    ????????: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 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i[3-9]86:AIX:*:*)
+    i?86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
     *:AIX:2:3)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
 	    9000/8?? )            HP_ARCH=hppa1.0 ;;
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
-    CRAY*C90:*:*:*)
-	echo c90-cray-unicos${UNAME_RELEASE}
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
         exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i[3-9]86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+    hp3[0-9][05]:OpenBSD:*:*)
+	echo m68k-hp-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     *:NetBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
     i*:CYGWIN*:*)
-	echo i386-unknown-cygwin32
+	echo i386-pc-cygwin32
 	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin32
 	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
-	# XEmacs changes in this section: add the version number of Linux
-	# (1.1.56 and above has working SIGIO)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us.
 	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[3-9]86"; then
-	  echo "${UNAME_MACHINE}-unknown-linux${UNAME_RELEASE}" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[3-9]86linux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout${UNAME_RELEASE}" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[3-9]86coff"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxcoff${UNAME_RELEASE}" ; exit 0
+	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
+	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux${UNAME_RELEASE}" ; exit 0
+	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linuxaout${UNAME_RELEASE}" ; exit 0
+	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
+	  echo "powerpc-unknown-linux-gnu" ; exit 0
 	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo "alpha-unknown-linux${UNAME_RELEASE}" ; exit 0
+	  echo alpha-unknown-linux-gnu ; exit 0
+	elif test "${UNAME_MACHINE}" = "sparc" ; then
+	  echo sparc-unknown-linux-gnu ; exit 0
 	else
-	  # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linuxoldld and linuxaout.
+	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
+	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
 	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-unknown-linuxoldld${UNAME_RELEASE}" && exit 0
+	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 	  # Determine whether the default compiler is a.out or elf
 	  cat >dummy.c <<EOF
 main(argc, argv)
 char *argv[];
 {
 #ifdef __ELF__
-  printf ("%s-unknown-linux%s\n", argv[1], argv[2]);
+  printf ("%s-pc-linux-gnu\n", argv[1]);
 #else
-  printf ("%s-unknown-linuxaout%s\n", argv[1], argv[2]);
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" "${UNAME_RELEASE}" && rm dummy.c dummy && exit 0
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
 	  rm -f dummy.c dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i[3-9]86:DYNIX/ptx:4*:*)
+    i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i[3-9]86:*:4.*:* | i[3-9]86:SYSTEM_V:4.*:*)
+    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i[3-9]86:*:3.2:*)
+    i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-unknown-sysv32
+		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
     Intel:Mach:3*:*)
-	echo i386-unknown-mach3
+	echo i386-pc-mach3
 	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M680[234]0:*:R3V[567]*:*)
+    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[345]??,*:*:4.0:3.0)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4.3 && exit 0 ;;
-    3[34]??:*:4.0:* | 3[345]??,*:*:4.0:*)
-        uname -p 2>/dev/null | grep 86 >/dev/null \
+    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*: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 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && 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 0 ;;
-    m680[234]0:LynxOS:2.[23]*:*)
-	echo m68k-lynx-lynxos${UNAME_RELEASE}
+    m68*:LynxOS:2.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i[3-9]86:LynxOS:2.[23]*:*)
-	echo i386-lynx-lynxos${UNAME_RELEASE}
+    i?86:LynxOS:2.*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    TSUNAMI:LynxOS:2.[23]*:*)
-	echo sparc-lynx-lynxos${UNAME_RELEASE}
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.[23]*:*)
-	echo rs6000-lynx-lynxos${UNAME_RELEASE}
+    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 		echo ns32k-sni-sysv
 	fi
 	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 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    R3000:*System_V*:*:*)
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #endif
 
 #if defined (NeXT)
-/*#if !defined (__ARCHITECTURE__)
- *#define __ARCHITECTURE__ "m68k"
- *#endif
- * int version;
- * version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- * printf ("%s-next-nextstep%s\n", __ARCHITECTURE__,  version==2 ? "2" : "3");
- * exit (0);
- */
- printf("mab-next-nextstep3\n"); exit(0);
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
 #endif
-
-#if defined (MACH)
-#if defined (vax)
-  printf("vax-dec-mach\n"); exit(0);
-#else
-#if defined (sun3)
-  printf("mc68000-sun-mach\n"); exit(0);
-#else
-#if defined (sparc)
-  printf("sparc-sun-mach\n"); exit(0);
-#else
-#if defined (mips)
-  printf("mips-dec-mach\n"); exit(0);
-#else
-#if defined (ibmrt)
-  printf("romp-ibm-mach\n"); exit(0);
-#else
-#if defined (i386)
-  printf("i386-unknown-mach\n"); exit(0);
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
 #endif
 
 #if defined (MULTIMAX) || defined (n16)
 #endif
 
 #if defined (__386BSD__)
-  printf ("i386-unknown-bsd\n"); exit (0);
+  printf ("i386-pc-bsd\n"); exit (0);
 #endif
 
 #if defined (sequent)