Anonymous avatar Anonymous committed 0132846

Import from CVS: tag r20-3b8

Comments (0)

Files changed (473)

 							-*- indented-text -*-
-to 20.3 beta7.
+to 20.3 beta8 "Copenhagen".
+-- Custom changes now saved in ~/.xemacs-custom and loaded automatically at
+   startup.
+-- oobr support binaries moved from lisp hierarchy to new top level
+   directory `pkg-src'.
+-- Viper-2.94 Courtesy of Michael Kifer
+-- Customizations from Hrvoje Niksic
+-- FAQ update from Andreas Kaempf
+-- New graphic cbx.gif added to etc, courtesy of Jens Lautenbacher,
+   `Created by XEmacs' suitable for adorning a web page.
+-- save-some-buffers now has an option to preview dirty buffers as
+   they are being offered for save.  Courtesy of David Bakhash.
+-- XEmacs compiles in 64 bit SGI environment courtesy of Olivier Galibert.
+-- Hardcoded -I/usr/local/include, -L/usr/local/include removed.
+-- edmacro.el-3.16
+-- mapvector is now a subr courtesy of Hrvoje Niksic
+-- new function archive-quit in arc-mode.el courtesy of Karl Hegbloom
+-- debug-on-error (round 2) courtesy of Hrvoje Niksic
+-- Gnus-5.4.59
+-- Build no longer depends on a list of .elc files listed in src/Makefile.in.in
+   (only important to developers).
+-- If a .xemacs file exists, use it in preference to .emacs.  If no .xemacs
+   use .emacs as usual.  The file loaded is left in `user-init-file'.
+-- Overhaul of XEmacs startup code, Part II.
+-- custom-1.9931
+-- Miscellaneous Ebola fixes
+-- New internal autoload generating function `batch-update-directory'.
+-- New file hippie-exp.el from Emacs/Mule zeta.
+-- Miscellaneous bug fixes
+
+to 20.3 beta7 "Oslo".
 -- Miscellaneous Ebola fixes
 -- hyper-apropos update courtesy of Hrvoje Niksic
 -- Make lib-complete deal with compressed .el files when not using Mule.
    Niksic
 -- Miscellaneous bug fixes
 
-to 20.3 beta6.
+to 20.3 beta6 "Moscow".
 -- Configure updates courtesy of Martin Buchholz
 -- Mule updates courtesy of MORIOKA Tomohiko
 -- Lots of Ebola cleanup, but much remains
 -- Miscellaneous bug fixes
 
-to 20.3 beta5.
+to 20.3 beta5 "Zagreb".
 -- Configure patches continued from Martin Buchholz
 -- Miscellaneous Bug Fixes from various people (see ChangeLogs)
 -- custom-1.9908
 -- Moved mule-doc/demo to etc/HELLO for the mule menu.
 
-to 20.3 beta4.
+to 20.3 beta4 "Warsaw".
 -- miscellaneous bug fixes
 -- various about.el additions & updates
 -- edmacro.el-3.15
+1997-06-21  Steven L Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-beta8 is released.
+
+1997-06-20  Olivier Galibert <Olivier.Galibert@mines.u-nancy.fr>
+
+	* lwlib/lwlib-Xaw.c, lwlib/lwlib-Xlw.c, lwlib/lwlib-Xm.c,
+	lwlib/lwlib.c:  Make 64 bit clean.
+	
+1997-06-20  Steven L Baur  <steve@altair.xemacs.org>
+
+	* etc/gnuserv.1: Updates and cleanup.
+	From Hrvoje Niksic <hniksic@srce.hr>
+
+1997-06-19  Martin Buchholz  <mrb@eng.sun.com>
+
+	* configure.in:
+	- Autodetect X defines using xmkmf.
+	- Compute rpath on *bsd* systems as well.
+	- rewrite PRINT_VAR m4 macro.
+	- detect sizes of void* and long long for future use by unex*.c
+
+1997-06-18  Martin Buchholz  <mrb@eng.sun.com>
+
+	* */Makefile.in.in: Another rewrite
+	Make makefiles immune from being mangled by various cpp
+	implementations by quoting non-preprocessor directive lines. 
+	- random cleanup
+	- Use $(RM) and $(pwd) macros consistently
+	- Add dependencies for balloon-help source files
+	- Use getcwd by default instead of getwd.
+	* lwlib/config.h:  Now includes src/config.h
+	* lwlib/*.c: Use config.h, but DON'T use Xos.h
+	* lib-src/*.c: Fix compiler warnings
+	* lisp/version.el:
+	- Put version information in version.sh instead of version.el
+
+Wed Jun 18 16:41:43 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* configure.in (CPP): Remove hardcoding of -L/usr/local/lib
+	-I/usr/local/include.
+
 1997-06-14  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-beta7 is released.
 	* lisp/gnus/smiley.el (smiley-deformed-regexp-alist): Add Japanese
 	smiley faces.
 
+1997-06-10  Gary D. Foster  <Gary.Foster@corp.sun.com>
+	
+	* lisp/modes/view-less.el: Changed \177 bindings to 'delete
+	* lisp/modes/help.el: Changed \177 bindings to 'delete
+
+1997-06-10  Gary D. Foster  <Gary.Foster@corp.sun.com>
+
+	* lisp/prim/keydefs.el: Changed all 'delete key bindings to point to
+	  the `backward-or-forward-foo' functions.
+	* lisp/prim/simple.el:
+	- Renamed `delete-erases-forward' to `delete-key-deletes-forward'.
+	- Removed `backspace-or-delete-hook'
+	- Renamed `backspace-or-delete' to `backward-or-forward-delete-char'
+	- Added functions: `backward-or-forward-kill-word'
+	 `backward-or-forward-kill-sentence'
+	 `backward-or-forward-kill-sexp'
+	- Removed the zmacs hacks from all the `b-or-f-foo' functions and
+	  began playing nicely with pending-del.
+	* lisp/modes/cc-mode.el:
+	* lisp/modes/cperl-mode.el: Fixed references to delete functions
+	  to use the new names.
+	
 1997-06-09  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-b5 is released.
 	- Sun sound in non-standard dirs now works
 	- --native-sound-lib no longer ignored on HP & SGI
 	- gpm configure tests moved after curses configure tests
+
+1997-06-04  Gary D. Foster  <Gary.Foster@corp.sun.com>
+
+	* lisp/modes/cc-mode.el: Modified `c-electric-delete' to honor the 
+	  desired delete direction in both normal and "hungry" modes.
+	* lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to 
+	  honor the desired delete direction.
 	
 1997-05-30  Martin Buchholz  <mrb@eng.sun.com>
 
 	* configure.in: Automagically compute -R path for gcc
 
+1997-05-30  Gary D. Foster  <Gary.Foster@corp.sun.com>
+
+	* lisp/vm/vm-vars.el: Fixed delete key binding to call
+	  `vm-scroll-down'
+	
 Thu May 29 15:35:07 1997  Martin Buchholz  <mrb@eng.sun.com>
 
 	* configure.in: Add support for Solaris2.6 -z ignore linker flags
 	* configure.in: Replace standard Autoconf MMAP test with Neal
 	Becker's replacement, hacked somewhat.
 
+1997-05-16  Gary D. Foster  <Gary.Foster@corp.sun.com>
+
+	* lisp/prim/simple.el: Created `backspace-or-delete' function and
+	  `backspace-or-delete-hook'
+	* lisp/prim/keydefs.el: Changed \177 bindings to point to new
+	  delete function.
+	* lisp/modes/*.el: Removed conflicting \177 bindings.
+	* lisp/modes/cc-mode.el: Modified `c-electric-delete' to use new
+	  delete bindings.
+	* lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to 
+	  use new delete bindings.
+	
 1997-06-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* lisp/x11/x-menubar.el (default-menubar): Add menu for Mule.
-# DIST: This is the distribution Makefile for XEmacs.  configure can
-# DIST: make most of the changes to this file you might want, so try
-# DIST: that first.
+## DIST: This is the distribution Makefile for XEmacs.  configure can
+## DIST: make most of the changes to this file you might want, so try
+## DIST: that first.
 
-# This file is part of XEmacs.
+## This file is part of XEmacs.
 
-# XEmacs is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
+## XEmacs is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by the
+## Free Software Foundation; either version 2, or (at your option) any
+## later version.
 
-# XEmacs is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+## XEmacs is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+## for more details.
 
-# You should have received a copy of the GNU General Public License
-# along with XEmacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+## You should have received a copy of the GNU General Public License
+## along with XEmacs; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
 
-# make all	to compile and build XEmacs.
-# make install	to build and install it.
-# make install-only	to install after a previous complete build
-# make TAGS	to update tags tables.
-#
-# make clean  or  make mostlyclean
-#      Delete all files from the current directory that are normally
-#      created by building the program.	 Don't delete the files that
-#      record the configuration.  Also preserve files that could be made
-#      by building, but normally aren't because the distribution comes
-#      with them.
-#
-#      Delete `.dvi' files here if they are not part of the distribution.
-#
-# make distclean
-#      Delete all files from the current directory that are created by
-#      configuring or building the program.  If you have unpacked the
-#      source and built the program without creating any other files,
-#      `make distclean' should leave only the files that were in the
-#      distribution.
-#
-# make realclean
-#      Delete everything from the current directory that can be
-#      reconstructed with this Makefile.  This typically includes
-#      everything deleted by distclean, plus more: C source files
-#      produced by Bison, tags tables, info files, and so on.
-#
-# make extraclean
-#      Still more severe - delete backup and autosave files, too.
+## make all	to compile and build XEmacs.
+## make install	to build and install it.
+## make install-only	to install after a previous complete build
+## make TAGS	to update tags tables.
+
+## make clean  or  make mostlyclean
+##      Delete all files from the current directory that are normally
+##      created by building the program.	 Don't delete the files that
+##      record the configuration.  Also preserve files that could be made
+##      by building, but normally aren't because the distribution comes
+##      with them.
+
+##      Delete `.dvi' files here if they are not part of the distribution.
+
+## make distclean
+##      Delete all files from the current directory that are created by
+##      configuring or building the program.  If you have unpacked the
+##      source and built the program without creating any other files,
+##      `make distclean' should leave only the files that were in the
+##      distribution.
+
+## make realclean
+##      Delete everything from the current directory that can be
+##      reconstructed with this Makefile.  This typically includes
+##      everything deleted by distclean, plus more: C source files
+##      produced by Bison, tags tables, info files, and so on.
+
+## make extraclean
+##      Still more severe - delete backup and autosave files, too.
 
 SHELL = /bin/sh
 @SET_MAKE@
 
-# ==================== Things `configure' Might Edit ====================
+## ==================== Things `configure' Might Edit ====================
 
 CC=@CC@
 CPP=@CPP@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 YACC=@YACC@
+pwd=/bin/pwd
+RM=rm -f
 
-### These help us choose version- and architecture-specific directories
-### to install files in.
+## These help us choose version- and architecture-specific directories
+## to install files in.
 
-### This should be the number of the XEmacs version we're building,
-### like `19.12' or `19.13'.
+## This should be the number of the XEmacs version we're building,
+## like `19.12' or `19.13'.
 version=@version@
 
-### This should be the name of the configuration we're building XEmacs
-### for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
+## This should be the name of the configuration we're building XEmacs
+## for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
 configuration=@configuration@
 
-# ==================== Where To Install Things ====================
+## ==================== Where To Install Things ====================
 
-# The default location for installation.  Everything is placed in
-# subdirectories of this directory.  The default values for many of
-# the variables below are expressed in terms of this one, so you may
-# not need to change them.  This defaults to /usr/local.
+## The default location for installation.  Everything is placed in
+## subdirectories of this directory.  The default values for many of
+## the variables below are expressed in terms of this one, so you may
+## not need to change them.  This defaults to /usr/local.
 prefix=@prefix@
 
-# Like `prefix', but used for architecture-specific files.
+## Like `prefix', but used for architecture-specific files.
 exec_prefix=@exec_prefix@
 
-# Where to install XEmacs and other binaries that people will want to
-# run directly (like etags).
+## Where to install XEmacs and other binaries that people will want to
+## run directly (like etags).
 bindir=@bindir@
 
-# Where to install architecture-independent data files.	 ${lispdir}
-# and ${etcdir} are subdirectories of this.
+## Where to install architecture-independent data files.
+## ${lispdir} and ${etcdir} are subdirectories of this.
 datadir=@datadir@
 
 pkgdir=@pkgdir@
 
-# Where to install and expect the files that XEmacs modifies as it
-# runs.	 These files are all architecture-independent. Right now, the
-# only such data is the locking directory; ${lockdir} is a
-# subdirectory of this.
+## Where to install and expect the files that XEmacs modifies as it runs.
+## These files are all architecture-independent. Right now, the
+## only such data is the locking directory;
+## ${lockdir} is a subdirectory of this.
 statedir=@statedir@
 
-# Where to install and expect executable files to be run by XEmacs
-# rather than directly by users, and other architecture-dependent
-# data.	 ${archlibdir} is a subdirectory of this.
+## Where to install and expect executable files to be run by XEmacs
+## rather than directly by users, and other architecture-dependent data
+## ${archlibdir} is a subdirectory of this.
 libdir=@libdir@
 
-# Where to install XEmacs's man pages, and what extension they should have.
+## Where to install XEmacs's man pages, and what extension they should have.
 mandir=@mandir@
 manext=.1
 
-# Where to install and expect the info files describing XEmacs.	In the
-# past, this defaulted to a subdirectory of ${prefix}/lib/xemacs, but
-# since there are now many packages documented with the texinfo
-# system, it is inappropriate to imply that it is part of XEmacs.
+## Where to install and expect the info files describing XEmacs.	In the
+## past, this defaulted to a subdirectory of ${prefix}/lib/xemacs, but
+## since there are now many packages documented with the texinfo
+## system, it is inappropriate to imply that it is part of XEmacs.
 infodir=@infodir@
 
-# This is set to 'yes' if the user specified the --infodir flag at
-# configuration time.
+## This is set to 'yes' if the user specified the --infodir flag at
+## configuration time.
 infodir_user_defined=@infodir_user_defined@
 
-# Where to find the source code.  The source code for XEmacs's C kernel is
-# expected to be in ${srcdir}/src, and the source code for XEmacs's
-# utility programs is expected to be in ${srcdir}/lib-src.  This is
-# set by the configure script's `--srcdir' option.
+## Where to find the source code.  The source code for XEmacs's C kernel is
+## expected to be in ${srcdir}/src, and the source code for XEmacs's
+## utility programs is expected to be in ${srcdir}/lib-src.  This is
+## set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
-# ==================== XEmacs-specific directories ====================
+## ==================== XEmacs-specific directories ====================
 
-# These variables hold the values XEmacs will actually use.  They are
-# based on the values of the standard Make variables above.
+## These variables hold the values XEmacs will actually use.  They are
+## based on the values of the standard Make variables above.
 
-# Where to install the lisp files distributed with
-# XEmacs.  This includes the XEmacs version, so that the
-# lisp files for different versions of XEmacs will install
-# themselves in separate directories.
+## Where to install the lisp files distributed with
+## XEmacs.  This includes the XEmacs version, so that the
+## lisp files for different versions of XEmacs will install
+## themselves in separate directories.
 lispdir=@lispdir@
 
-# This is set to 'yes' if the user specified the --lispdir or
-# --datadir flag at configuration time.
+## This is set to 'yes' if the user specified the --lispdir or
+## --datadir flag at configuration time.
 lispdir_user_defined=@lispdir_user_defined@
 
-# Directories XEmacs should search for lisp files specific
-# to this site (i.e. customizations), before consulting
-# ${lispdir}.  This should be a colon-separated list of
-# directories.
+## Directories XEmacs should search for lisp files specific
+## to this site (i.e. customizations), before consulting
+## ${lispdir}.  This should be a colon-separated list of
+## directories.
 sitelispdir=@sitelispdir@
 
-# Where XEmacs will search for its lisp files while
-# building.  This is only used during the process of
-# compiling XEmacs, to help XEmacs find its lisp files
-# before they've been installed in their final location.
-# It's usually identical to lispdir, except that the
-# entry for the directory containing the installed lisp
-# files has been replaced with ../lisp.  This should be a
-# colon-separated list of directories.
+## Where XEmacs will search for its lisp files while
+## building.  This is only used during the process of
+## compiling XEmacs, to help XEmacs find its lisp files
+## before they've been installed in their final location.
+## It's usually identical to lispdir, except that the
+## entry for the directory containing the installed lisp
+## files has been replaced with ../lisp.  This should be a
+## colon-separated list of directories.
 buildlispdir=${srcdir}/lisp
 
-# Where to install the other architecture-independent
-# data files distributed with XEmacs (like the tutorial,
-# the cookie recipes and the Zippy database). This path
-# usually contains the XEmacs version number, so the data
-# files for multiple versions of XEmacs may be installed
-# at once.
+## Where to install the other architecture-independent
+## data files distributed with XEmacs (like the tutorial,
+## the cookie recipes and the Zippy database). This path
+## usually contains the XEmacs version number, so the data
+## files for multiple versions of XEmacs may be installed
+## at once.
 etcdir=@etcdir@
 
-# This is set to 'yes' if the user specified the --etcdir or
-# --datadir flag at configuration time.
+## This is set to 'yes' if the user specified the --etcdir or
+## --datadir flag at configuration time.
 etcdir_user_defined=@etcdir_user_defined@
 
-# Where to create and expect the locking directory, where
-# the XEmacs locking code keeps track of which files are
-# currently being edited.
+## Where to create and expect the locking directory, where
+## the XEmacs locking code keeps track of which files are
+## currently being edited.
 lockdir=@lockdir@
 
-# This is set to 'yes' if the user specified the --lockdir or
-# --statedir flag at configuration time.
+## This is set to 'yes' if the user specified the --lockdir or
+## --statedir flag at configuration time.
 lockdir_user_defined=@lockdir_user_defined@
 
-# Where to put executables to be run by XEmacs rather than
-# the user.  This path usually includes the XEmacs version
-# and configuration name, so that multiple configurations
-# for multiple versions of XEmacs may be installed at
-# once.
+## Where to put executables to be run by XEmacs rather than
+## the user.  This path usually includes the XEmacs version
+## and configuration name, so that multiple configurations
+## for multiple versions of XEmacs may be installed at
+## once.
 archlibdir=@archlibdir@
 
-# This is set to 'yes' if the user specified any of --exec-prefix,
-# --libdir or --archlibdir at configuration time.
+## This is set to 'yes' if the user specified any of --exec-prefix,
+## --libdir or --archlibdir at configuration time.
 archlibdir_user_defined=@archlibdir_user_defined@
 
-# ==================== Utility Programs for the Build ====================
+## ==================== Utility Programs for the Build ====================
 
-# Allow the user to specify the install program.
+## Allow the user to specify the install program.
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-# ============================= Targets ==============================
+## ============================= Targets ==============================
 
-# 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.
+## 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 = @MAKE_SUBDIR@
 
-# Subdirectories that can be made recursively.
+## Subdirectories that can be made recursively.
 SUBDIR = ${MAKE_SUBDIR} man
 
-# The makefiles of the directories in ${MAKE_SUBDIR}.
+## 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.
-# When installing the info files, we need to do special things to
-# avoid nuking an existing dir file, so we don't do that here;
-# instead, we have written out explicit code in the `install' targets.
+## Subdirectories to install, and where they'll go.
+## lib-src's makefile knows how to install it, so we don't do that here.
+## When installing the info files, we need to do special things to
+## avoid nuking an existing dir file, so we don't do that here;
+## instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
-GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h src/puresize_adjust.h
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize_adjust.h src/config.h lwlib/config.h
 
 all:	${GENERATED_HEADERS} ${MAKE_SUBDIR}
 
-# For performance and consistency, no built-in rules
+## For performance and consistency, no built-in rules
 .SUFFIXES:
 
 .NO_PARALLEL:	${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs
 .PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads
 
-# Convenience target for XEmacs beta testers
+## Convenience target for XEmacs beta testers
 beta:	clean all-elc
 
-# Build XEmacs and recompile out-of-date and missing .elc files along
-# the way.
+## Build XEmacs and recompile out-of-date and missing .elc files along
+## the way.
 all-elc all-elcs:   lib-src lwlib dump-elcs src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-elc.sh
 
-# Sub-target for all-elc.
+## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
 	cd src && $(MAKE) dump-elcs $(MFLAGS) \
 		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
 autoloads:	src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-autoloads.sh
 
-# We force the rebuilding of src/paths.h because the user might give
-# different values for the various directories.  Since we use
-# move-if-change, src/paths.h only actually changes if the user did
-# something notable, so the only unnecessary work we do is in building
-# src/paths.h.tmp, which isn't much.  Note that sed is not in /bin on
-# 386bsd.
+## We force the rebuilding of src/paths.h because the user might give
+## different values for the various directories.  Since we use
+## move-if-change, src/paths.h only actually changes if the user did
+## something notable, so the only unnecessary work we do is in building
+## src/paths.h.tmp, which isn't much.  Note that sed is not in /bin on
+## 386bsd.
 src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
 	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
-	@-rm -f src/paths.h.tmp
+	@$(RM) src/paths.h.tmp
 	@cp ${srcdir}/src/paths.h.in src/paths.h.tmp
 	@-chmod 0644 src/paths.h.tmp
 	@(echo '#define PATH_PREFIX "${prefix}"'; \
 	fi; ) >> src/paths.h.tmp; \
 	sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 
-# We have to force the building of Emacs.ad.h as well in order to get it
-# updated correctly when VPATH is being used.  Since we use move-if-change,
-# it will only actually change if the user modified ${etcdir}/Emacs.ad.
+## We have to force the building of Emacs.ad.h as well in order to get it
+## updated correctly when VPATH is being used.  Since we use move-if-change,
+## it will only actually change if the user modified ${etcdir}/Emacs.ad.
 src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
 	@echo "Producing \`src/Emacs.ad.h' from \`etc/Emacs.ad'."
-	-rm -f src/Emacs.ad.h
+	@$(RM) src/Emacs.ad.h
 	@(echo "/*	Do not edit this file!" ; \
 	  echo "  	Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
 	  echo " */" ; \
 src:	@SRC_SUBDIR_DEPS@ FRC.src
 lib-src: FRC.lib-src
 lwlib:	FRC.lwlib
+dynodump: FRC.dynodump
+FRC.src FRC.lib-src FRC.lwlib FRC.dynodump:
 
 .RECURSIVE: ${SUBDIR}
 
 lwlib/Makefile: ${srcdir}/lwlib/Makefile.in.in config.status
 	./config.status
 
+lwlib/config.h: ${srcdir}/lwlib/config.h.in
+	./config.status && touch $@
+
 src/config.h: ${srcdir}/src/config.h.in
-	./config.status
+	./config.status && touch $@
 
-# ==================== Installation ====================
+## ==================== Installation ====================
 
 ## If we let lib-src do its own installation, that means we
 ## don't have to duplicate the list of utilities to install in
 install: all install-arch-dep install-arch-indep;
 
 install-arch-dep: mkdir
-	(cd lib-src && \
+	cd lib-src && \
 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \
-	    archlibdir=${archlibdir})
-	if [ `(cd ${archlibdir} && /bin/pwd)` != `(cd ./lib-src && /bin/pwd)` ]; \
+	    archlibdir=${archlibdir}
+	if [ `(cd ${archlibdir} && $(pwd))` != `(cd ./lib-src && $(pwd))` ]; \
 	then \
 	   ${INSTALL_DATA} lib-src/DOC ${archlibdir}/DOC ; \
 	   for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
-	     rm -rf $${subdir}/RCS $${subdir}/CVS $${subdir}/SCCS ; \
-	     rm -f  $${subdir}/\#* $${subdir}/*~ ; \
+	     (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ;
 	   done ; \
 	else true; fi
 	${INSTALL_PROGRAM} src/xemacs ${bindir}/xemacs-${version}
 	-chmod 0755 ${bindir}/xemacs-${version}
-	rm -f ${bindir}/xemacs
-	(cd ${bindir} && ${LN_S} xemacs-${version} ./xemacs)
+	$(RM) ${bindir}/xemacs
+	cd ${bindir} && ${LN_S} xemacs-${version} ./xemacs
 
 install-arch-indep: mkdir
-	-set ${COPYDESTS} ; \
+	-@set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
-	   if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \
-	     echo "rm -rf $$1" ; \
+	   if [ `(cd $$1 && $(pwd))` != `(cd $${dir} && $(pwd))` ] ; then \
+	     : do nothing - echo "rm -rf $$1" ; \
 	   fi ; \
 	   shift ; \
 	 done
 	-set ${COPYDESTS} ; \
-	 mkdir ${COPYDESTS} ; \
+	 for dir in ${COPYDESTS} ; do test -d $${dir} || mkdir $${dir} ; done ; \
 	 for dir in ${COPYDIR} ; do \
 	   dest=$$1 ; shift ; \
-	   [ -d $${dir} ] \
-	   && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
+	   test -d $${dir} \
+	     -a `(cd $${dir} && $(pwd))` != `(cd $${dest} && $(pwd))` \
 	   && (echo "Copying $${dir}..." ; \
 	       (cd $${dir} && tar -cf - . ) | \
 		(cd $${dest} && umask 022 && tar -xf - );\
 	       chmod 0755 $${dest}; \
 	       for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
-		 rm -rf $${subdir}/RCS $${subdir}/CVS $${subdir}/SCCS ; \
-		 rm -f  $${subdir}/\#* $${subdir}/*~ ; \
+		 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
 	       done) ; \
 	 done
-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
-	then \
-	  (cd ${srcdir}/info && \
-	   if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
-	     ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
-	   fi ; \
-	   for f in *.info* ; do \
-	     ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f ; \
-	     chmod 0644 ${infodir}/$$f; \
-	   done); \
-	else true; fi
-	cd ${srcdir}/etc && for page in xemacs etags ctags gnuserv \
-				      gnuclient gnuattach gnudoit ; do \
-	  ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
-	  chmod 0644 ${mandir}/$${page}${manext} ; \
-	done
+	if test `(cd ${srcdir}/info && $(pwd))` != `(cd ${infodir} && $(pwd))` && cd ${srcdir}/info; then \
+	  if test ! -f ${infodir}/dir -a -f dir ; then \
+	    ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \
+	  fi ; \
+	  for file in *.info* ; do \
+	    ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \
+	    chmod 0644 ${infodir}/$${file}; \
+	  done ; \
+	fi
+	cd ${srcdir}/etc && \
+	  for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
+	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
+	    chmod 0644 ${mandir}/$${page}${manext} ; \
+	  done
 	@echo "If you would like to save approximately 15M of disk space, do"
 	@echo "make gzip-el"
 	@echo "or you may run "
 	lib-src/gzip-el.sh ${lispdir}
 
 MAKEPATH=./lib-src/make-path
-### Build all the directories we're going to install XEmacs in.	Since
-### we may be creating several layers of directories (for example,
-### /usr/local/lib/xemacs-19.13/mips-dec-ultrix4.2), we use make-path
-### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
+## Build all the directories we're going to install XEmacs in.	Since
+## we may be creating several layers of directories (for example,
+## /usr/local/lib/xemacs-19.13/mips-dec-ultrix4.2), we use make-path
+## instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
 	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
 	  ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkdir}
 	-chmod 0777 ${lockdir}
 
-### Delete all the installed files that the `install' target would
-### create (but not the noninstalled files such as `make all' would
-### create).
-###
-### Don't delete the lisp and etc directories if they're in the source tree.
+## Delete all the installed files that the `install' target would
+## create (but not the noninstalled files such as `make all' would
+## create).
+
+#### Don't delete the lisp and etc directories if they're in the source tree.
 #### This target has not been updated in sometime and until it is it
 #### would be extremely dangerous for anyone to use it.
 #uninstall:
 #	    prefix=${prefix} exec_prefix=${exec_prefix}	\
 #	    bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
 #	for dir in ${lispdir} ${etcdir} ; do 		\
-#	  case `(cd $${dir} ; pwd)` in			\
-#	    `(cd ${srcdir} ; pwd)`* ) ;;		\
-#	    * ) rm -rf $${dir} ;;			\
+#	  case `(cd $${dir} ; $(pwd))` in			\
+#	    `(cd ${srcdir} ; $(pwd))`* ) ;;		\
+#	    * ) $(RM) $${dir} ;;			\
 #	  esac ;					\
 #	  case $${dir} in				\
 #	    ${datadir}/xemacs/${version}/* )		\
-#	      rm -rf ${datadir}/xemacs/${version}	\
+#	      $(RM) -r ${datadir}/xemacs/${version}	\
 #	    ;;						\
 #	  esac ;					\
 #	done
-#	(cd ${infodir} && rm -f cl* xemacs* forms* info* vip*)
-#	(cd ${mandir} && rm -f xemacs.1 etags.1 ctags.1 gnuserv.1)
-#	(cd ${bindir} && rm -f xemacs-${version} xemacs)
+#	cd ${infodir} && $(RM) cl* xemacs* forms* info* vip*
+#	cd ${mandir} && $(RM) xemacs.1 etags.1 ctags.1 gnuserv.1
+#	cd ${bindir} && $(RM) xemacs-${version} xemacs
 
 
-### Some makes seem to remember that they've built something called FRC,
-### so you can only use a given FRC once per makefile.
-FRC FRC.src.paths.h FRC.src FRC.lib-src FRC.lwlib FRC.mkdir FRC.dump-elcs:
-FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean:
+## Some makes seem to remember that they've built something called FRC,
+## so you can only use a given FRC once per makefile.
+FRC FRC.src.paths.h FRC.mkdir FRC.dump-elcs:
+FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean FRC.tags:
 
-# ==================== Cleaning up and miscellanea ====================
+## ==================== Cleaning up and miscellanea ====================
 
 .PHONY: mostlyclean clean distclean realclean extraclean
 
-### `mostlyclean'
-###      Like `clean', but may refrain from deleting a few files that people
-###      normally don't want to recompile.  For example, the `mostlyclean'
-###      target for GCC does not delete `libgcc.a', because recompiling it
-###      is rarely necessary and takes a lot of time.
+## `mostlyclean'
+##      Like `clean', but may refrain from deleting a few files that people
+##      normally don't want to recompile.  For example, the `mostlyclean'
+##      target for GCC does not delete `libgcc.a', because recompiling it
+##      is rarely necessary and takes a lot of time.
 mostlyclean: FRC.mostlyclean
-	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
-	-(cd man && $(MAKE) $(MFLAGS) $@)
+	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
 
-### `clean'
-###      Delete all files from the current directory that are normally
-###      created by building the program.  Don't delete the files that
-###      record the configuration.  Also preserve files that could be made
-###      by building, but normally aren't because the distribution comes
-###      with them.
-###
-###      Delete `.dvi' files here if they are not part of the distribution.
+## `clean'
+##      Delete all files from the current directory that are normally
+##      created by building the program.  Don't delete the files that
+##      record the configuration.  Also preserve files that could be made
+##      by building, but normally aren't because the distribution comes
+##      with them.
+
+##      Delete `.dvi' files here if they are not part of the distribution.
 clean: FRC.clean
-	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
-	-(cd man && $(MAKE) $(MFLAGS) $@)
-	rm -f core
+	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	$(RM) core
 
-### `distclean'
-###      Delete all files from the current directory that are created by
-###      configuring or building the program.  If you have unpacked the
-###      source and built the program without creating any other files,
-###      `make distclean' should leave only the files that were in the
-###      distribution.
+## `distclean'
+##      Delete all files from the current directory that are created by
+##      configuring or building the program.  If you have unpacked the
+##      source and built the program without creating any other files,
+##      `make distclean' should leave only the files that were in the
+##      distribution.
 top_distclean=\
-	rm -f config.status config.log config-tmp-* build-install Installation ; \
+	$(RM) config.status config.log config-tmp-* build-install Installation ; \
 	for d in src lib-src lwlib dynodump ; do \
-	  rm -f $$d/Makefile $$d/Makefile.in ; \
+	  $(RM) $$d/Makefile $$d/Makefile.in ; \
 	done ; \
-	rm -f core .sbinit Makefile lock/*
+	$(RM) core .sbinit Makefile lock/*
 
 distclean: FRC.distclean
-	-for d in lock site-lisp; do test -d $$d || mkdir $$d; done
-	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
-	-(cd man && $(MAKE) $(MFLAGS) $@)
+	for d in lock site-lisp; do test -d $$d || mkdir $$d; done
+	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
 	-${top_distclean}
 
-### `realclean'
-###      Delete everything from the current directory that can be
-###      reconstructed with this Makefile.  This typically includes
-###      everything deleted by distclean, plus more: C source files
-###      produced by Bison, tags tables, info files, and so on.
-###
-###      One exception, however: `make realclean' should not delete
-###      `configure' even if `configure' can be remade using a rule in the
-###      Makefile.  More generally, `make realclean' should not delete
-###      anything that needs to exist in order to run `configure' and then
-###      begin to build the program.
+## `realclean'
+##      Delete everything from the current directory that can be
+##      reconstructed with this Makefile.  This typically includes
+##      everything deleted by distclean, plus more: C source files
+##      produced by Bison, tags tables, info files, and so on.
+
+##      One exception, however: `make realclean' should not delete
+##      `configure' even if `configure' can be remade using a rule in the
+##      Makefile.  More generally, `make realclean' should not delete
+##      anything that needs to exist in order to run `configure' and then
+##      begin to build the program.
 realclean: FRC.realclean
-	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
-	-(cd man && $(MAKE) $(MFLAGS) $@)
+	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
 	-${top_distclean}
 
-### This doesn't actually appear in the coding standards, but Karl
-### says GCC supports it, and that's where the configuration part of
-### the coding standards seem to come from.  It's like distclean, but
-### it deletes backup and autosave files too.
+## This doesn't actually appear in the coding standards, but Karl
+## says GCC supports it, and that's where the configuration part of
+## the coding standards seem to come from.  It's like distclean, but
+## it deletes backup and autosave files too.
 extraclean:
-	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
-	-(cd man && $(MAKE) $(MFLAGS) $@)
-	-rm -f *~ \#*
+	for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	$(RM) *~ \#*
 	-${top_distclean}
 
-### Unlocking and relocking.  The idea of these productions is to reduce
-### hassles when installing an incremental tar of XEmacs.  Do `make unlock'
-### before unlocking the file to take the write locks off all sources so
-### that tar xvof will overwrite them without fuss.  Then do `make relock'
-### afterward so that VC mode will know which files should be checked in
-### if you want to mung them.
-###
-### Note: it's no disaster if these productions miss a file or two; tar
-### and VC will swiftly let you know if this happens, and it is easily
-### corrected.
+## Unlocking and relocking.  The idea of these productions is to reduce
+## hassles when installing an incremental tar of XEmacs.  Do `make unlock'
+## before unlocking the file to take the write locks off all sources so
+## that tar xvof will overwrite them without fuss.  Then do `make relock'
+## afterward so that VC mode will know which files should be checked in
+## if you want to mung them.
+
+## Note: it's no disaster if these productions miss a file or two; tar
+## and VC will swiftly let you know if this happens, and it is easily
+## corrected.
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
 	README build-install.in configure make-dist move-if-change
 
 
 unlock:
 	chmod u+w $(SOURCES) cpp/*
-	-(cd elisp && chmod u+w Makefile README *.texi)
-	(cd etc     && $(MAKE) $(MFLAGS) unlock)
-	(cd lib-src && $(MAKE) $(MFLAGS) unlock)
-	(cd lisp    && $(MAKE) $(MFLAGS) unlock)
-	(cd lisp/term && chmod u+w README *.el)
-	(cd man && chmod u+w *texi* ChangeLog split-man)
-	(cd lwlib && chmod u+w *.[ch] Makefile.in.in)
-	(cd src && $(MAKE) $(MFLAGS) unlock)
+	-cd elisp && chmod u+w Makefile README *.texi
+	cd etc     && $(MAKE) $(MFLAGS) unlock
+	cd lib-src && $(MAKE) $(MFLAGS) unlock
+	cd lisp    && $(MAKE) $(MFLAGS) unlock
+	cd lisp/term && chmod u+w README *.el
+	cd man && chmod u+w *texi* ChangeLog split-man
+	cd lwlib && chmod u+w *.[ch] Makefile.in.in
+	cd src && $(MAKE) $(MFLAGS) $@
 
 relock:
 	chmod u-w $(SOURCES) cpp/*
-	-(cd elisp && chmod u-w Makefile README *.texi)
-	(cd etc     && $(MAKE) $(MFLAGS) relock)
-	(cd lib-src && $(MAKE) $(MFLAGS) relock)
-	(cd lisp    && $(MAKE) $(MFLAGS) relock)
-	(cd lisp/term && chmod u+w README *.el)
-	(cd man && chmod u+w *texi* ChangeLog split-man)
-	(cd lwlib && chmod u+w *.[ch] Makefile.in.in)
-	(cd src && $(MAKE) $(MFLAGS) relock)
+	-cd elisp && chmod u-w Makefile README *.texi
+	cd etc     && $(MAKE) $(MFLAGS) relock
+	cd lib-src && $(MAKE) $(MFLAGS) relock
+	cd lisp    && $(MAKE) $(MFLAGS) relock
+	cd lisp/term && chmod u+w README *.el
+	cd man && chmod u+w *texi* ChangeLog split-man
+	cd lwlib && chmod u+w *.[ch] Makefile.in.in
+	cd src && $(MAKE) $(MFLAGS) $@
 
 TAGS tags: FRC.tags
 	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
-	@PATH=`pwd`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
+	@PATH=`$(pwd)`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
 	  echo "Using etags from `which etags`."
-	PATH=`pwd`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
+	PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
 	etags --regex='/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/' src/*.[ch] ; \
 	for d in `find lisp -name SCCS -prune -o -name RCS -prune -o -type d -print` ; do \
 	  (cd $$d && if [ "`echo *.el`" != "*.el" ] ; then etags -a -o ${srcdir}/TAGS *.el ; fi ) ; \
 
 info: FRC.info
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
+
 dvi:
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
 
-# Fix up version information in executables (Solaris-only)
+## Fix up version information in executables (Solaris-only)
 mcs:
 	date=`LANG=C LC_ALL=C date -u '+%e %b %Y'`; \
 	ident="@(#)RELEASE VERSION XEmacs ${version} $${date}"; \
 You *have* to compile your own jpeg lib. The one delivered with SGI
 systems is a C++ lib, which apparently XEmacs cannot cope with.
 
-** XEmacs won't build with the n32 environment on Irix 6.
-
-Olivier Galibert <Olivier.Galibert@mines.u-nancy.fr> writes:
-While making the OS and the compiler able to work on 64b
-architectures, SGI designed another mode for using registers
-and passing parameters between functions, activated on the
-compiler by using -64. Since it was much more efficient ar
-using registers even for 32b architectures, they designed
-a version for 32b called n32. And it _is_ really better.
-This mode should always be used when not using gcc (which
-can only do o32 afaik).
-
-Too bad xemacs can't do n32 out of the box. So here is what
-I had to do to compile it in this mode:
-
-s/irix6-0.h:
-- #define LD_SWITCH_SYSTEM -32
-+ #define LD_SWITCH_SYSTEM -n32 -G 0
-
-m/iris4d.h:
-- #define LIBS_MACHINE -lmld
-+ #define LIBS_MACHINE
-
-- #define C_SWITCH_MACHINE -32
-+ #define C_SWITCH_MACHINE -n32 -G 0
-
-(the mld lib does not exist in n32 mode)
-
-I also added a --cflags='-n32 -O2 -G 0 -s' to the configuration
-line but it seems that these flags are ignored for configure test
-and since o32 and n32 libraries are independant I had to revert
-to the CFLAGS env var.
-
-Anyway, once done that the compile has gone succesfully, the dump
-was OK and I'm writing this in the resulting xemacs-20.2b1 ;-)
-
 ** Slow startup on Linux.
 
 People using systems based on the Linux kernel sometimes report that
 
 test "$extra_verbose" = "yes" && verbose=yes
 
-case "site_includes" in *:* ) site_includes="`echo '' $site_includes | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
-case "site_libraries" in *:* ) site_libraries="`echo '' $site_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
-case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo '' $site_runtime_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
+case "$site_includes" in *:* ) site_includes="`echo '' $site_includes | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
+case "$site_libraries" in *:* ) site_libraries="`echo '' $site_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
+case "$site_runtime_libraries" in *:* ) site_runtime_libraries="`echo '' $site_runtime_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
 
 test -n "$with_x" && with_x11="$with_x"
 
   romp-ibm-*       ) machine=ibmrt ;;
   rs6000-ibm-aix*  ) machine=ibmrs6000 ;;
   powerpc-ibm-aix* ) machine=ibmrs6000 ;;
-  powerpc-*-*      ) machine=powerpc ;;
+  powerpc*-*       ) machine=powerpc ;;
   hppa-*-*         ) machine=hp800 ;;
   m88k-dg-*        ) machine=aviion ;;
   m68*-sony-*      ) machine=news ;;
       m68*-sunos1* )	         machine=sun1     ;;
       m68*-sunos2* )	         machine=sun2     ;;
       m68* )		         machine=sun3     ;;
-      i[3-9]86*-sun-sunos[34]* ) machine=sun386 ;;
-      i[3-9]86-*-* )	         machine=intel386 ;;
+      i*86*-sun-sunos[34]* )   machine=sun386   ;;
+      i*86-*-* )	         machine=intel386 ;;
       rs6000* )                  machine=rs6000   ;;
     esac
 
         case "$canonical" in *-sunos5*)
-      canonical="`echo \"$canonical\" | sed -e s/sunos5/solaris2/`";;
+      canonical=`echo $canonical | sed -e s/sunos5/solaris2/`;;
     esac
 
                     case "$canonical" in
     esac
 
     case "$canonical" in
-            i[3-9]86-*-sunos4*) opsys=sunos4-0	;;
+      *-solaris*	  )
+	opsys=sol2
+	os_release=`uname -r | sed -e 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'`
+	{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining OS_RELEASE = $os_release
+EOF
+cat >> confdefs.h <<EOF
+#define OS_RELEASE $os_release
+EOF
+}
+ ;;
+
+            i*86-*-sunos4*      ) opsys=sunos4-0	;;
       *-sunos4.0*	  ) opsys=sunos4-0	;;
       *-sunos4.1.2*	  ) opsys=sunos4-1-2	;;
       *-sunos4.1.3*	  ) opsys=sunos4-1-3	;;
       *-sunos4.1.[4-9]* ) opsys=sunos4-1-4	;;
       *-sunos4* | *-sunos ) opsys=sunos4-1	;;
-
-      *-solaris2.3*	  ) opsys=sol2-3	;;
-      *-solaris2.4*	  ) opsys=sol2-4	;;
-      *-solaris2.5*	  ) opsys=sol2-5	;;
-      *-solaris2.[6-9]* ) opsys=sol2-6	;;
-      *-solaris*	  ) opsys=sol2		;;
-
       *-mach*		  ) opsys=mach-bsd4-3	;;
       *			  ) opsys=bsd4-2	;;
     esac
 
     case "$canonical" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac
 
-        case "$canonical" in
-      *-solaris* ) case "$CC" in /usr/ucb/cc* ) CC="" ;; esac ;;
-    esac
+        test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC=""
   ;;
 
     m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;;
   esac
 elif test "$dynamic" = "no" ; then
   case "$opsys" in
-    sol2* | decosf1-3 | decosf3-* | decosf4-* | linux ) opsys="${opsys}-static" ;;
+    sol2 | decosf1-3 | decosf3-* | decosf4-* | linux ) opsys="${opsys}-static" ;;
   esac
 fi
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1314: checking for $ac_word" >&5
+echo "configure:1317: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1340: checking for $ac_word" >&5
+echo "configure:1343: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1385: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1397 "configure"
+#line 1400 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1421: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1424: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1426: checking whether we are using GNU C" >&5
+echo "configure:1429: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1447: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1450: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1477: checking for $ac_word" >&5
+echo "configure:1480: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1503: checking for $ac_word" >&5
+echo "configure:1506: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1548: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1551: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1560 "configure"
+#line 1563 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1584: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1587: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1589: checking whether we are using GNU C" >&5
+echo "configure:1592: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1610: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1613: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1639: checking for $ac_word" >&5
+echo "configure:1642: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1665: checking for $ac_word" >&5
+echo "configure:1668: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1722 "configure"
+#line 1725 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1746: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1751: checking whether we are using GNU C" >&5
+echo "configure:1754: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1772: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1775: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 test -n "$NON_GNU_CPP" -a "$with_gcc" = "no" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1803: checking how to run the C preprocessor" >&5
+echo "configure:1806: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1816 "configure"
+#line 1819 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1833 "configure"
+#line 1836 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1862: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1864 "configure"
+echo "configure:1865: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1867 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
 
 
 echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6
-echo "configure:1891: checking whether we are using SunPro C" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1893 "configure"
+echo "configure:1894: checking whether we are using SunPro C" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1896 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   __sunpro_c=yes
 else
 #define LD_SWITCH_SITE
 #define LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE_AUX
+#define OS_RELEASE '$os_release'
 #include "'$srcdir'/src/'$opsysfile'"
 #include "'$srcdir'/src/'$machfile'"
 
 configure___ libs_standard=LIB_STANDARD
 
 
+#ifndef OBJECTS_MACHINE
+#define OBJECTS_MACHINE
+#endif
+configure___ objects_machine=OBJECTS_MACHINE
+
+#ifndef OBJECTS_SYSTEM
+#define OBJECTS_SYSTEM
+#endif
+configure___ objects_system=OBJECTS_SYSTEM
+
+
 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
 configure___ unexec=UNEXEC
 
 
+#ifndef LD_SWITCH_CALL_SHARED
+#define LD_SWITCH_CALL_SHARED
+#endif
+configure___ ld_switch_call_shared=LD_SWITCH_CALL_SHARED
+
+#ifndef LD_SWITCH_SHARED
+#define LD_SWITCH_SHARED "-c"
+#endif
+configure___ ld_switch_shared=LD_SWITCH_SHARED
+
+
+#ifdef ORDINARY_LINK
+#define LD "$(CC) $(CFLAGS)"
+#else /* no ORDINARY LINK */
+#ifdef COFF_ENCAPSULATE
+#define LD "$(CC) -nostdlib"
+#else /* not COFF_ENCAPSULATE */
+#ifdef LINKER
+#define LD LINKER
+#else /* ! defined (LINKER) */
+#define LD "ld"
+#endif /* ! defined (LINKER) */
+#endif /* ! defined (COFF_ENCAPSULATE) */
+#endif /* not ORDINARY_LINK */
+configure___ ld=LD
+
+#ifndef LIB_GCC
+#define LIB_GCC
+#endif
+configure___ lib_gcc=LIB_GCC
+
+#ifndef LD_TEXT_START_ADDR
+#define LD_TEXT_START_ADDR
+#endif
+configure___ ld_text_start_addr=LD_TEXT_START_ADDR
+
+
+#if ! defined (ORDINARY_LINK) && !defined (START_FILES)
+#ifdef NO_REMAP
+#ifdef COFF_ENCAPSULATE
+#define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o"
+#else /* ! defined (COFF_ENCAPSULATE) */
+#define START_FILES "pre-crt0.o /lib/crt0.o"
+#endif /* ! defined (COFF_ENCAPSULATE) */
+#else /* ! defined (NO_REMAP) */
+#define START_FILES "ecrt0.o"
+#endif /* ! defined (NO_REMAP) */
+#endif /* no ORDINARY_LINK */
+#ifndef START_FILES
+#define START_FILES
+#endif
+configure___ start_files=START_FILES
+
 #ifdef ORDINARY_LINK
 configure___ ordinary_link=yes
 #else
 ' > $tempcname
 CPP=`eval "echo $CPP"`
 eval `$CPP -Isrc $tempcname \
-	| sed -n -e "s/ *=[ \"]*/='/" -e "s/[ \"]*\$/'/" -e "s/^configure___//p"`
+	| sed -n -e "s/[ \t]*=[ \t\"]*/='/" -e "s/[ \t\"]*\$/'/" -e "s/^configure___//p"`
 
 
 rm $tempcname
 
+test "$extra_verbose" = "yes" && \
+  for var in libs_machine libs_system libs_termcap libs_standard   objects_machine objects_system c_switch_machine c_switch_system   c_switch_x_system ld_switch_machine ld_switch_system   ld_switch_x_system unexec ld_switch_call_shared ld_switch_shared   ld lib_gcc ld_text_start_addr start_files ordinary_link   have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
+
+
 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
 
 if test -z "$CFLAGS"; then
       CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
   elif test "$__sunpro_c" = "yes"; then
     case "$opsys" in
-      sol2*   ) CFLAGS="-v -xO4" ;;
-      sunos4* ) CFLAGS="-xO3";;
+      sol2    ) CFLAGS="-v -xO4" ;;
+      sunos4* ) CFLAGS="-xO2";;
     esac
   else
     CFLAGS="-O" # The only POSIX-approved flag
   fi
 fi
 
-extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
+if test "$GCC" = "yes"; then
+    ld_switch_system_tmp="$ld_switch_system"; ld_switch_system=""
+  for arg in $ld_switch_system_tmp; do
+    case "$arg" in
+      -L* | -l* | -R* | -u* | -Wl* | -f* ) ld_switch_system="$ld_switch_system $arg" ;;
+      -Xlinker* ) ;;
+      * ) ld_switch_system="$ld_switch_system -Xlinker $arg" ;;
+    esac
+  done
+  ld_switch_machine_tmp="$ld_switch_machine"; ld_switch_machine=""
+  for arg in $ld_switch_machine_tmp; do
+    case "$arg" in
+      -L* | -l* | -R* | -u* | -Wl* | -f* ) ld_switch_machine="$ld_switch_machine $arg" ;;
+      -Xlinker* ) ;;
+      * ) ld_switch_machine="$ld_switch_machine -Xlinker $arg" ;;
+    esac
+  done
+  LDFLAGS_tmp="$LDFLAGS"; LDFLAGS=""
+  for arg in $LDFLAGS_tmp; do
+    case "$arg" in
+      -L* | -l* | -R* | -u* | -Wl* | -f* ) LDFLAGS="$LDFLAGS $arg" ;;
+      -Xlinker* ) ;;
+      * ) LDFLAGS="$LDFLAGS -Xlinker $arg" ;;
+    esac
+  done
+fi
+
+test -n "$objects_machine" && extra_objs="$extra_objs $objects_machine" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"$objects_machine\""
+ fi
+test -n "$objects_system"  && extra_objs="$extra_objs $objects_system" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"$objects_system\""
+ fi
+test -n "$unexec"          && extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
    echo "    xemacs will be linked with \"$unexec\""
  fi
 
+echo $ac_n "checking for dynodump""... $ac_c" 1>&6
+echo "configure:2192: checking for dynodump" >&5
+if test "$unexec" != "unexsol2.o"; then
+  echo "$ac_t""no" 1>&6
+else
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining DYNODUMP
+EOF
+cat >> confdefs.h <<\EOF
+#define DYNODUMP 1
+EOF
+}
+
+  MAKE_SUBDIR="$MAKE_SUBDIR dynodump" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"dynodump\" to \$MAKE_SUBDIR"; fi
+  case "$machine" in
+    sparc   ) dynodump_arch=sparc ;;
+    *86*    ) dynodump_arch=i386  ;;
+    powerpc ) dynodump_arch=ppc   ;;
+  esac
+    test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi
+fi
+
+
+
+
+test -n "$ld_text_start_addr" && start_flags="-T $ld_text_start_addr -e __start"
+
+if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then
+ test -z "$linker" &&  linker='$(CC) -nostdlib'
+ test -z "$lib_gcc" && lib_gcc='`$(CC) -print-lib-gcc-file-name`'
+fi
+test "$GCC" != "yes" && lib_gcc=
+
+
+
 
 if test -n "$site_libraries"; then
   for arg in $site_libraries; do
   done
 fi
 
-if test -d "/usr/local/include" -a -d "/usr/local/lib"; then
-  ld_switch_site="$ld_switch_site "-L/usr/local/lib"" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \""-L/usr/local/lib"\" to \$ld_switch_site"; fi
-  c_switch_site="$c_switch_site "-I/usr/local/include"" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \""-I/usr/local/include"\" to \$c_switch_site"; fi
-fi
 
 for dir in "/usr/ccs/lib"; do
   test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-L${dir}\" to \$ld_switch_site"; fi
 
 if   test "$dynamic" = "no"; then add_runtime_path=no
 elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
-else case "$canonical" in
-       *-solaris2.* | *-sgi-irix* ) add_runtime_path=yes ;;
+else case "$opsys" in
+       sol2 | irix* | *bsd* ) add_runtime_path=yes ;;