Commits

Anonymous committed aabb7f5

Import from CVS: tag r21-2-9

  • Participants
  • Parent commits f892a9d
  • Tags r21-2-9

Comments (0)

Files changed (107)

File CHANGES-beta

 							-*- indented-text -*-
+to 21.2 beta9 "Athena"
+-- parameterize replace-match function from Didier Verna
+-- X-Face support under mswindows from Andy Piper
+-- doc fixes from Adrian Aichner
+-- about patchlet from Marcus Thiessel
+-- isearch doc fixes from Didier Verna
+-- interlaced gif fix from Gunnar Evermann
+-- isearch improvements from Didier Verna
+-- eldap connection fix from William Perry
+-- package-get site fix from Robert Pluim
+-- loadable modules fix from Damon Lipparelli
+-- ldap fixes from Oscar Figueiredo
+-- loadable modules from J. Kean Johnston
+-- runwhatever from Charles Wilson
+-- redisplay fixes for glyphs from Andy Piper
+-- progress gauge widgets implentation from Andy Piper
+-- W3 works again due to font.el being fixed
+-- Another mule xemacs crash fixed
+-- Images in widgets, warning fixes and gui_item cleanup from Andy Piper
+-- package admin fixes under mswindows from Charles Waldman
+-- miscellaneous mswindows build fixes from Jonathan Harris
+-- help-echo fix from Hrvoje Niksic
+-- x font path support from Jim Radford
+-- MSVC compile fixes from Damon Lipparelli
+
 to 21.2 beta8 "Artemis"
 -- A bunch of Mule fixes from Martin Buchholz
 
+1999-02-02  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.2.9 is released
+
+1999-02-01  Glynn Clements  <glynn@sensei.co.uk>
+
+	* etc/recycle.xpm: Fix colours so that they work on TrueColor
+	and DirectColor displays
+
+1999-01-21  Andy Piper  <andy@xemacs.org>
+
+	* configure.in: make xface detection specifc to a window system in
+ 	general rather than just X.
+
+1999-18-10  Andy Piper <andy@xemacs.org>
+
+	* configure.in: remove -O3 prevention on cygwin - current versions
+ 	cope ok now.  remove dll prevention on cygwin - the new module
+ 	code checks correctly.
+	
+1999-01-10  J. Kean Johnston  <jkj@sco.com>
+
+	* configure.in: Added moduledir as the path where loadable modules 
+	are stored. Added --with-site-modules and --moduledir options.
+	- Ensure the SCO OpenServer compiles with --dynamic by default
+	- Check for dlfcn.h for dynamic loader
+	- Renamed dll.o to emodules.o and changed dynamic loader tests
+	- Renabled code that deals with site-lisp so that it is handled
+	correctly when a user specifies --with-site-lisp.
+
+	* aclocal.m4: Replaced entire file with more complete DLL tests
+	by way of libtool.
+
+	* config.usage: Removed TAB characters which caused it to be
+	displayed incorrectly on terminals where TAB != 8.
+	- Added help text to describe --with-site-modules and --moduledir.
+
+	* INSTALL: Updated documentation to describe module directories
+
+	* Makefile.in.in: Added moduledir, sitemoduledir macros.
+	- Make those directories at install time.
+
 1998-12-28  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.8 is released.
 By default, XEmacs installs its files in the following directories:
 
 `/usr/local/bin' holds the executable programs users normally run -
-		`xemacs', `etags', `ctags', `b2m', `emacsclient',
+		`xemacs', `etags', `ctags', `b2m', `emacsclient', `ellcc',
 		`gnuclient', `gnudoit', `gnuattach', and `rcs-checkin'.
 
 `/usr/local/lib/xemacs-VERSION/lisp' holds the Emacs Lisp libraries;
 		kinds of machines share the file system XEmacs is
 		installed on.
 
+`/usr/local/lib/xemacs-VERSION/CONFIGURATION-NAME/modules' holds the Emacs
+		dynamically loadable modules.  These are special programs
+		typically written in C that can be loaded in much the same
+		way that Lisp packages are.  Not all systems support
+		dynamic modules, so do not be alarmed if this directory
+		does not exist or is empty.
+
+		XEmacs searches for modules in this directory, or any
+		sub-directory of it, and then in
+		`/usr/local/lib/xemacs/site-modules/*'.
+
 `/usr/local/lib/xemacs-VERSION/info' holds the on-line documentation
 		for XEmacs, known as "info files".
 
 	above), is `/usr/local/lib/xemacs-VERSION/CONFIGURATION-NAME'
 	(where VERSION and CONFIGURATION-NAME are as described above).
 
+`moduledir' indicates where XEmacs installs and expects to find
+	any dynamic modules.  Its default value, based on
+	`archlibdir' (see above) is
+	`/usr/local/lib/xemacs-VERSION/CONFIGURATION-NAME/modules'
+	(where VERSION and CONFIGURATION-NAME are as described above).
+	By their very nature, dynamic loadable modules are architecture-
+	dependant, and care should be taken not to set this directory
+	to a system- or architecture-independant directory.
+
 Remember that you must specify any variable values you need each time
 you run `make' in the top directory.  If you run `make' once to build
 xemacs, test it, and then run `make' again to install the files, you

File Makefile.in.in

 ## themselves in separate directories.
 lispdir=@lispdir@
 
+## Where to install the module files distributed with
+## XEmacs.  This includes the XEmacs version, so that the
+## module files for different versions of XEmacs will install
+## themselves in separate directories.
+moduledir=@moduledir@
+
 ## Directory XEmacs should search for lisp files specific
 ## to this site (i.e. customizations), before consulting
 ## ${lispdir}.
 sitelispdir=@sitelispdir@
 
+## Directory XEmacs should search for module files specific
+## to this site (i.e. customizations), before consulting
+## ${moduledir}.
+sitemoduledir=@sitemoduledir@
+
 ## 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
 ## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
 	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
-	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir}
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
+	  ${sitelispdir} ${moduledir} ${sitemoduledir}
 	-chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would

File README.packages

+The XEmacs Packages Quick Start Guide
+-------------------------------------
+
+This text is intended to help you get started installing a new XEmacs
+and its packages from start.  For details see the 'Startup Paths' and
+'Packages' sections of the XEmacs info manual.
+
+Real Real Quickstart FAQ
+------------------------
+
+Q. Do I need to have the packages to compile XEmacs?
+A. If you want to compile with MULE, you need the mule-base package installed.
+   Otherwise, no package is required before compilation.
+
+Q. I really liked the old way that packages were bundled and do not
+   want to mess with packages at all.
+A. You can grab all the packages at once like you used to with old
+   XEmacs versions, skip to the 'Sumo Tarball' section below.
+
+A note of caution
+-----------------
+
+The XEmacs package system is still in its infancy. Please expect a few 
+minor hurdles on the way. Also neither the interface nor the structure is 
+set in stone. The XEmacs maintainers reserve the right to sacrifice
+backwards compatibility as quirks are worked out over the coming
+releases. 
+
+Some Package Theory
+-------------------
+
+In order to reduce the size and increase the maintainability of XEmacs,
+the majority of the Elisp packages that came with previous releases
+have been unbundled. They have been replaced by the package system.
+Each elisp add-on (or groups of them when they are small) now comes
+in its own tarball that contains a small search hierarchy.
+
+You select just the ones you need. Install them by untarring them into 
+the right place. On startup XEmacs will find them, set up the load
+path correctly, install autoloads, etc, etc.
+
+Package hierarchies
+-------------------
+
+On Startup XEmacs looks for packages in so called package hierarchies.
+These can be specified by the 'package-path' parameter to the
+'configure' script. However by default there are three system wide
+hierarchies.
+
+$prefix/lib/xemacs/site-packages
+     Local and 3rd party packages go here.
+
+$prefix/lib/xemacs/mule-packages
+     Only searched by MULE-enabled XEmacsen.
+
+$prefix/lib/xemacs/xemacs-packages
+     Normal packages go here.
+
+Where to get the packages
+-------------------------
+
+Packages are available from ftp://ftp.xemacs.org/pub/xemacs/packages
+and its mirror.
+
+How to install the packages
+---------------------------
+
+1. All at once, using the 'Sumo Tarball'.
+2. By hand.
+3. Automatically, using the package tools from XEmacs.
+
+The Sumo Tarball
+----------------
+
+Those with little time, cheap connections and plenty of disk space can
+install all packages at once using the sumo tarballs.
+Download the files
+
+xemacs-sumo-<date>.tar.gz if you have a latin-1 XEmacs.
+
+or
+
+xemacs-mule-sumo-<date>.tar.gz if you have a MULE XEmacs.
+
+N.B. There are called 'Sumo Tarballs' for good reason. They are
+currently 15MB and 23MB (gzipped) respectively.
+
+Install them by
+
+cd $prefix/lib/xemacs ; gunzip -c <tarballname> | tar xf -
+
+As the Sumo tarballs are not regenerated as often as the individual
+packages, it is recommended that you use the automatic package tools
+afterwards to pick up any recent updates.
+
+Installing by Hand
+------------------
+
+Fetch the packages from the ftp site, CDROM whatever. The filenames
+have the form name-<version>-pkg.tar.gz and are gzipped tar files. For
+a fresh install it is sufficient to untar the file at the top of the
+package hierarchy. For example if we are installing the 'xemacs-base'
+package in version 1.27:
+
+mkdir $prefix/lib/xemacs/xemacs-packages # if it does not exist yet
+cd $prefix/lib/xemacs/xemacs-packages
+gunzip -c ...../xemacs-base-1.27-pkg.tar.gz | tar xf -
+
+For MULE related packages, it is best to untar in the mule-packages
+hierarchy, i.e. for the mule-base package, version 1.25
+
+mkdir $prefix/lib/xemacs/mule-packages # if it does not exist yet
+cd $prefix/lib/xemacs/mule-packages
+gunzip -c ...../mule-base-1.25-pkg.tar.gz | tar xf -
+
+Installing automatically
+------------------------
+
+XEmacs comes with some tools to make the periodic updating and
+installing easier. It will notice if new packages or versions are
+available and will fetch them from the ftp site.
+
+Unfortunately this requires that a few packages are alreadyin place. 
+You will have to install them by hand as above or use a SUMO tarball. 
+This requirement will hopefully go away in the future. The packages
+you need are:
+
+   efs          - To fetch the files from the ftp site or mirrors.
+   xemacs-base  - Needed by efs.
+
+and optionally:
+
+   mailcrypt    - If you have PGP installed and want to verify the
+                  signature of the index file.
+   mule-base    - Needed if you want to compile XEmacs with MULE.
+
+After installing these by hand, you can start XEmacs. (It is a good
+idea to use 'xemacs -vanilla' here as your startup files might need
+things now moved to packages.)
+
+ - First you need to specify an FTP site to use.
+      Use Options->Manage Packages->Add Download Site
+       or M-x customize-variable RET package-get-remote RET
+
+   Alternatively, if you already have the packages on a local disk
+   then you can specify this directly using 'M-x
+   pui-add-install-directory'. Please make sure you also have a
+   corresponding copy of the package index there.
+
+ - Invoke Options->Manage Packages->List & Install
+      or M-x pui-list-packages RET
+   XEmacs will now first try to fetch a new version of the package
+   index from the FTP site. Depending on whether you are using
+   'mailcrypt/PGP', you will get some question about keys to fetch or
+   whether to use the index without verifying the signature. If the
+   new index was different from the one already on disk, XEmacs will
+   offer you to overwrite the old index.
+
+-  XEmacs will show you a buffer named "*Packages*" with an overview
+   of available and installed packages, including a short description.
+   In this buffer you can select which packages you want using the
+   mouse or using RET.
+
+-  When you are finished choosing packages, invoke
+   'Packages->Install/Remove Select' from the menu or type 'x' to
+   begin installing packages.
+    
+After Installation
+------------------
+
+New packages can only be used by XEmacs after a restart.
+
+Note to MULE users
+------------------
+
+Unlike all other packages the mule-base package is used at build/dump 
+time. This means that you need this available before compiling XEmacs
+with MULE. Also it is a good idea to keep packages that are
+MULE-only separate by putting them in the mule-packages hierarchy.
+
+Which Packages to install?
+--------------------------
+
+This is difficult to say. When in doubt install a package. If you
+administrate a big site it might be a good idea to just install
+everything. A good minimal set of packages for XEmacs-latin1 would be
+
+xemacs-base, xemacs-devel, c-support, cc-mode, debug, dired, efs,
+edit-utils, fsf-compat, mail-lib, net-utils, os-utils, prog-modes,
+text-modes, time
+
+Unfortunately the package system currently provides neither
+dependencies nor conflicts. This will be a future enhancement. The
+above set includes most packages that are used by others.
+
+See also '.../etc/PACKAGES' for further descriptions of the individual
+packages (currently outdated).
+
+Upgrading/Removing Packages
+---------------------------
+
+As the exact files and their locations contained in a package may
+change it is recommend to remove a package first before installing a
+new version. In order to facilitate removal each package contains an
+pgkinfo/MANIFEST.pkgname file which list all the files belong to the
+package. M-x package-admin-delete-binary-package RET can be used to
+remove a package using this file.
+
+Note that the interactive package tools included with XEmacs already do
+this for you.
+
+User Package directories
+------------------------
+
+In addition to the system wide packages, each user can have his own
+packages installed in "./xemacs" (Note that this will most likely
+change to "./xemacs/packages" in the near future). If you want to
+install packages there using the interactive tools, you need to set
+'pui-package-install-dest-dir' to "/xemacs"
+
+Site lisp/Site start
+--------------------
+
+The site-packages hierarchy replaces the old 'site-lisp' directory.
+XEmacs no longer looks into a 'site-lisp' directly by default.
+A good place to put 'site-start.el' would be in
+$prefix/lib/xemacs/site-packages/lisp/
 dnl aclocal.m4 --- Dynamically linked library support for XEmacs
-dnl Copyright (C) 1998 Free Software Foundation, Inc.
-dnl Author: William Perry <wmperry@aventail.com>
-dnl This file is part of XEmacs
+dnl Copyright (C) 1998, 1999 J. Kean Johnston.
+dnl Author: J. Kean Johnston <jkj@sco.com>, based on work in libtool.
+dnl This file is part of XEmacs.
 
-AC_DEFUN(XE_MAKE_SHAREDLIB, [
-dll_ld="ld"
-dll_lflags="-shared"
-dll_cflags="-r"
-dll_oflags="-o "
+dnl
+dnl There are several things we care about here. First, we need to find
+dnl out how we create an executable that has its symbols exported, so
+dnl that dynamically loaded modules have access to the internal XEmacs
+dnl symbols. This is stored in ``ld_dynamic_link_flags'' and is used
+dnl in the main Makefile.
+dnl Next, we need to know how we compile actual shared libraries, and
+dnl the objects in them.  For these purposes, we need to determine the
+dnl C compiler flags used to produce shared objects (``dll_cflags''),
+dnl what linker to use to create the final shared object that will be
+dnl loaded (``dll_ld'') and the flags to pass to that linker
+dnl (``dll_ldflags''). This information is used by ellcc to build up
+dnl the command line when compiling modules. We build up two other commands
+dnl for extremely weird systems where special things need to be done.
+dnl The first is ``dll_ldo'', which is the flag used to specify the output
+dnl file name, and the second is ``dll_post'' which is inserted after the
+dnl list of objects.
+dnl After all of this, we should be able to:
+dnl    $(CC) $(CFLAGS) $(dll_cflags) -c module.c
+dnl to produce a single shared object
+dnl And then:
+dnl   $(dll_ld) $(dll_ldflags) $(dll_ldo) module.ell module.o $(dll_post)
+dnl to create the loadable shared library.
+dnl
+dnl NOTE: In the code below, where I have modified things to work with
+dnl XEmacs, we use $canonical instead of libtool's $host, and we use
+dnl $internal_configuration instead of $host_alias. To make typing
+dnl shorter we assign these to $xehost and $xealias
 
-AC_MSG_CHECKING(how to build a shared library)
-case `uname -rs` in
-	UNIX_SV*|UNIX_System_V*)
-		dll_lflags="-G"
-		dll_cflags=-Kpic
-		dll_ld="ld"
-		;;
-	BSD/OS*)
-		dll_cflags=
-		dll_lflags="-r"
-		dll_ld="shlicc2"
-		;;
-	FreeBSD*2*)
-		dll_lflags="-Bshareable"
-		dll_cflags="-fPIC -DPIC"
-		dll_ld=ld
-		;;
-	SunOS*4.*)
- 		dll_cflags="-P"
-		dll_lflags="-dp -assert pure-text -assert nodefinitions"
-		;;
-	SunOS*5.*)
-		dll_ld="cc"
-		dll_cflags="-KPIC"
-		dll_lflags="-G"
-		dll_oflags="-W0,-y-o -W0,-y"
-		;;	
-	IRIX*5.*|IRIX*6.*)
-		dll_cflags="-KPIC"
-		;;
-	OSF1*)
-		;;
-	HP-UX*)
-		dll_ld="ld"
-		dll_lflags="-b"
-		dll_cflags="+z"
-		;;
-	SCO_SV*)
-		dll_ld="ld"
-		dll_lflags="-G"
-		dll_cflags="-Kpic"
-		;;
-	AIX*)
-		dll_lflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:\${@:.ell=.exp} -b noentry -lc"
-		dll_ld="ld"
-		;;
-	*)
-		;;
-	esac
+AC_DEFUN(XE_SHLIB_STUFF,[
+dll_ld=
+dll_ldflags=
+dll_cflags=
+dll_post=
+dll_ldo="-o"
+ld_dynamic_link_flags=
+xehost=$canonical
+xealias=$internal_configuration
 
-	if test "$GCC" = "yes" ; then
-		dll_cflags="-fPIC"
-		case `uname -rs` in
-		SunOS*5.*)
-			dll_ld="ld"
-			dll_oflags="-o "
-			dll_lflags="-G"
-			;;
-		SCO_SV*)
-			dll_ld="ld"
-			dll_lflags="-G"
-			dll_cflags="-b elf"
-			;;
-		FreeBSD*)
-			dll_cflags="-DDLSYM_NEEDS_UNDERSCORE -DPIC -fPIC"
-			dll_lflags="-Bshareable"
-			dll_ld=ld
-			;;
-		BSD/OS*)
-			dll_cflags=
-			dll_lflags="-r"
-			dll_ld="shlicc2"
-			;;
-		UNIX_SV*)
-			dll_cflags="-fPIC"
-			;;
-		*)
-			dll_ld="$CC"
-			dll_lflags="-shared"
-		esac
-	fi
+AC_CHECKING([how to build dynamic libraries for ${xehost}])
+# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
+case "$xehost" in
+*-*-linux-gnu*) ;;
+*-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
 
-	AC_MSG_RESULT("lflags: $dll_lflags cflags: $dll_cflags")
+changequote(<<, >>)dnl
+xehost_cpu=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
+
+case "$xehost_os" in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "${COLLECT_NAMES+set}" != set; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Now see if the compiler is really GCC.
+if test "$GCC" = "yes"; then
+  XEGCC=yes
+else
+  AC_MSG_CHECKING(checking whether we are using GNU C)
+  AC_EGREP_CPP(yes,[
+#ifdef __GNUC__
+  yes;
+#endif
+],XEGCC=yes, XEGCC=no)
+  AC_MSG_RESULT([${XEGCC}])
+fi
+
+AC_MSG_CHECKING(how to produce PIC code)
+wl=
+
+can_build_shared=yes
+if test "$XEGCC" = yes; then
+  wl='-Wl,'
+
+  case "$xehost_os" in
+  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
+    # PIC is the default for these OSes.
+    ;;
+
+  os2*)
+    # We can build DLLs from non-PIC.
+    ;;
+  amigaos*)
+    # FIXME: we need at least 68020 code to build shared libraries, but
+    # adding the `-m68020' flag to GCC prevents building anything better,
+    # like `-m68040'.
+    dll_cflags='-m68020 -resident32 -malways-restore-a4'
+    ;;
+  *)
+    dll_cflags='-fPIC'
+    ;;
+  esac
+else
+  # PORTME Check for PIC flags for the system compiler.
+  case "$xehost_os" in
+  hpux9* | hpux10*)
+    # Is there a better link_static_flag that works with the bundled CC?
+    wl='-Wl,'
+    dll_cflags='+Z'
+    ;;
+
+  irix5* | irix6*)
+    wl='-Wl,'
+    # PIC (with -KPIC) is the default.
+    ;;
+
+  os2*)
+    # We can build DLLs from non-PIC.
+    ;;
+
+  osf3* | osf4*)
+    # All OSF/1 code is PIC.
+    wl='-Wl,'
+    ;;
+
+  sco3.2v5*)
+    dll_cflags='-belf -Kpic'
+    wl='-Wl,'
+    ;;
+
+  unixware*)
+    dll_cflags="-KPIC"
+    wl="-Wl,"
+    ;;
+
+  sysv4*)
+    dll_cflags="-KPIC"
+    wl="-Wl,"
+    ;;
+
+  sysv5*)
+    dll_cflags="-KPIC"
+    wl="-Wl,"
+    ;;
+
+  solaris2*)
+    dll_cflags='-KPIC'
+    wl='-Wl,'
+    ;;
+
+  sunos4*)
+    dll_cflags='-PIC'
+    wl='-Qoption ld '
+    ;;
+
+  uts4*)
+    dll_cflags='-pic'
+    ;;
+
+  *)
+    can_build_shared=no
+    ;;
+  esac
+fi
+
+if test -n "$dll_cflags"; then
+  AC_MSG_RESULT([${dll_cflags}])
+  
+  # Check to make sure the dll_cflags actually works.
+  AC_MSG_CHECKING([if PIC flag ${dll_cflags} really works])
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $dll_cflags -DPIC"
+  AC_TRY_COMPILE(,[int x=0;],[
+    # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
+    # reports no error.  So, we need to grep stderr for (Bundled).
+    if grep '(Bundled)' config.log >/dev/null; then
+      AC_MSG_RESULT(no)
+      can_build_shared=no
+      dll_cflags=
+    else
+      AC_MSG_RESULT(yes)
+    fi], [AC_MSG_RESULT(no)
+    can_build_shared=no
+    dll_cflags=])
+  CFLAGS="$save_CFLAGS"
+else
+  AC_MSG_RESULT(none)
+fi
+
+dnl
+dnl Now comes the LD trickery. We do things differently to libtool here.
+dnl I believe that libtool is incorrect in trying to drive the linker
+dnl directly. This can cause considerable problems if the module you are
+dnl compiling has C++ or other static initializers. If we use ld directly,
+dnl we dont end up with the crt stuff being linked in, and we dont end up
+dnl with any .init or .fini sections (or the moral equivalent thereof).
+dnl gcc takes great care to do this propperly when invoked in -shared
+dnl mode, and we really do want this behaviour. Perhaps the libtool folks
+dnl are not aware that any SVR4 based dynamic loader will automatically
+dnl execute code in the .init section before dlopen() returns. This is
+dnl vital, as the module may have been compiled to rely on that behaviour.
+dnl
+dnl So, having said all of that, we diverge from libtool significantly
+dnl here. We want to try and use the C compiler as much as possible. Only
+dnl if the C compiler itself cannot create shared libraries to we try to
+dnl find the linker.
+dnl
+dnl The other advantage to my scheme is that it removes the dependancy
+dnl on a given compiler version remaining static with relation to the
+dnl version of XEmacs. With the libtool way, it picks up the linker that
+dnl gcc uses, which can be the internal collect2 that comes with gcc.
+dnl If the user ever changes their compiler version, the paths will no
+dnl longer be correct, and ellcc will break. This is clearly unacceptable.
+dnl By using the compiler driver on the path, we dont have this problem.
+dnl If that is not clear, consider that gcc -print-prog-name=ld can
+dnl produce something along the lines of:
+dnl   /usr/local/lib/gcc-lib/OS-NAME/GCC-VERSION/ld
+dnl If you ever change GCC versions, then that path no longer exists.
+dnl
+dnl So, we change the check order here. We first check to see if we are
+dnl using GCC, and if so, we see if -shared works. If it does, great.
+dnl If we are not using gcc, but the system C compiler can produce
+dnl shared objects, we try that. Only if all of that fails do we revert
+dnl back to the libtool ld trickery.
+dnl
+dnl We dont do ANY of this if we can't produce shared objects.
+dnl
+if test "$can_build_shared" = "yes"; then
+cc_produces_so=no
+xldf=
+xcldf=
+AC_MSG_CHECKING(if C compiler can produce shared libraries)
+if test "$XEGCC" = yes; then
+  xcldf="-shared"
+  xldf="-shared"
+else # Not using GCC
+  case "$xehost_os" in
+    aix3* | aix4*)
+      xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
+      xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
+      ;;
+
+    freebsd2* | netbsd* | openbsd*)
+      xldf="-Bshareable"
+      xcldf="${wl}-Bshareable"
+      ;;
+
+    freebsd3*)
+      xcldf="-shared"
+      ;;
+
+    hpux*)
+      xldf="-b +s"
+      xcldf="${wl}-b ${wl}+s"
+      ;;
+
+    irix5* | irix6* | osf3* | osf4*)
+      xcldf="${wl}-shared"
+      xldf="-shared"
+      ;;
+
+    sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7* | uts4*)
+      xcldf="-G"
+      xldf="-G"
+      ;;
+
+    sunos4*)
+      xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
+      xldf="-assert pure-text -Bstatic"
+      ;;
+  esac
+fi # End if if we are using gcc
+
+if test -n "$xcldf"; then
+  save_LDFLAGS=$LDFLAGS
+  save_LIBS=$LIBS
+  save_xe_libs=$xe_libs
+  LDFLAGS="$xcldf $LDFLAGS"
+  LIBS=
+  xe_libs=
+  ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC'
+  AC_TRY_LINK(,[int x=0;],cc_produces_so=yes,cc_produces_so=no)
+  LDFLAGS=$save_LDFLAGS
+  LIBS=$save_LIBS
+  xe_libs=$save_xe_libs
+  ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&AC_FD_CC'
+else
+  cc_produces_so=no
+fi
+AC_MSG_RESULT([${cc_produces_so}])
+
+LTLD=$LD
+if test -z "$LTLD"; then
+  ac_prog=ld
+  if test "$XEGCC" = yes; then
+    # Check if gcc -print-prog-name=ld gives a path.
+    AC_MSG_CHECKING(for ld used by GCC)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5`
+    case "$ac_prog" in
+    # Accept absolute paths.
+    /*)
+      if test -z "$LTLD"; then
+        case "$ac_prog" in
+          *gcc-lib*) LTLD="$CC"
+                     ;;
+          *)         LTLD="$ac_prog"
+                     ;;
+        esac
+      fi
+      ;;
+    "")
+      # If it fails, then pretend we aren't using GCC.
+      ac_prog=ld
+      ;;
+    *)
+      # If it is relative, then search for the first ld in PATH.
+      with_gnu_ld=unknown
+      ;;
+    esac
+  else
+    AC_MSG_CHECKING(for GNU ld)
+  fi
+
+  if test -z "$LTLD"; then
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+    for ac_dir in $PATH; do
+      test -z "$ac_dir" && ac_dir=.
+      if test -f "$ac_dir/$ac_prog"; then
+        LTLD="$ac_dir/$ac_prog"
+        # Check to see if the program is GNU ld.  I'd rather use --version,
+        # but apparently some GNU ld's only accept -v.
+        # Break only if it was the GNU/non-GNU ld that we prefer.
+        if "$LTLD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+          xe_gnu_ld=yes
+        else
+          xe_gnu_ld=no
+        fi
+      fi
+    done
+    IFS="$ac_save_ifs"
+  fi
+
+  if test -n "$LTLD"; then
+    AC_MSG_RESULT([${LTLD}])
+  else
+    AC_MSG_RESULT(no)
+  fi
+
+  if test -z "$LTLD" -a "$cc_produces_so" = no; then
+    AC_MSG_ERROR(no acceptable linker found in \$PATH)
+    exit 1
+  fi
+fi
+
+dnl
+dnl Order of the tests changed somewhat to prevent repetition
+dnl
+ld_dynamic_link_flags=
+
+# Check to see if it really is or isn't GNU ld.
+AC_MSG_CHECKING(if the linker is GNU ld)
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  xe_gnu_ld=yes
+else
+  xe_gnu_ld=no
+fi
+AC_MSG_RESULT([${xe_gnu_ld}])
+
+case "$xehost_os" in
+  amigaos* | sunos4*)
+    # On these operating systems, we should treat GNU ld like the system ld.
+    gnu_ld_acts_native=yes
+    ;;
+  *)
+    gnu_ld_acts_native=no
+    ;;
+esac
+
+if test "$cc_produces_so" = "yes"; then
+  dll_ld=$CC
+  dll_ldflags=$xcldf
+  can_build_shared=yes
+else
+  # OK - only NOW do we futz about with ld.
+  # See if the linker supports building shared libraries.
+  AC_MSG_CHECKING(whether the linker supports shared libraries)
+  dll_ld=$CC
+  dll_ldflags=$LDFLAGS
+  ld_shlibs=yes
+  can_build_shared=yes
+  if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+    # See if GNU ld supports shared libraries.
+    if $LTLD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      dll_ld=$CC
+      dll_ldflags="-shared"
+      ld_shlibs=yes
+    else
+      ld_shlibs=no
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case "$xehost_os" in
+    aix3*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    aix4*)
+      dll_ldflags=$xcldf
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # doesn't break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      dll_post="/usr/lib/c++rt0.o"
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 don't have this feature.
+    freebsd2*)
+      dll_ld=$LTLD
+      dll_ldflags="-Bshareable"
+      ;;
+
+    # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+    freebsd3*)
+      dll_ldflags="-shared"
+      ;;
+
+    hpux*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    irix5* | irix6*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    netbsd*)
+      # Tested with NetBSD 1.2 ld
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    openbsd*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    osf3* | osf4*)
+      dll_ld=$LTLD
+      dll_ldflags=$xldf
+      ;;
+
+    # For both SCO and Solaris we MAY want to have LDFLAGS include -z text
+    sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
+      dll_ld=$LTLD
+      case "$dll_ld" in
+        *gcc*) dll_ldflags="-shared"
+               dll_ld=$CC
+               ;;
+        *)     dll_ldflags="-G"
+               ;;
+      esac
+      ;;
+
+    sunos4*)
+      if test "$XEGCC" = yes; then
+        dll_ld=$CC
+      else
+        dll_ld=$LTLD
+      fi
+      dll_ldflags=$xldf
+      ;;
+
+    uts4*)
+      dll_ld=$LTLD
+      dll_ldflags="-G"
+      ;;
+
+    bsdi*)
+      dll_ldflags="-r"
+      dll_ld="shlicc2"
+      ;;
+
+    *)
+      ld_shlibs=no
+      can_build_shared=no
+      ;;
+    esac
+  fi
+  AC_MSG_RESULT([${ld_shlibs}])
+  if test "$ld_shlibs" = "no"; then
+    can_build_shared=no
+  fi
+fi # End of if cc_produces_so = no
+
+dnl
+dnl Last thing, check how to get a linked executable to have its symbols
+dnl exported, so that the modules have access to them.
+dnl
+dnl XEmacs FIXME - we need to set ld_dynamic_link_flags propperly for
+dnl most of these systems, which was missing from libtool. I know they
+dnl all have a way of doing this, but someone needs to look at this
+dnl for each OS and make sure it is correct. Remember that the arguments
+dnl are passed when temacs is linked, this is NOT for modules. The sole
+dnl purpose of the argument is to get the internal XEmacs symbols exposed
+dnl for modules to use. This means that the COMPILER (and NOT the linker)
+dnl is most often used to create temacs, so arguments to the linker will
+dnl usually need to be prefix with ${wl} or some other such thing.
+dnl
+
+if test "$xe_gnu_ld" = yes; then
+  if test "$ld_shlibs" = yes; then
+    ld_dynamic_link_flags="${wl}-export-dynamic"
+  fi
+fi
+
+if test -z "$ld_dynamic_link_flags"; then
+  case "$xehost_os" in
+  aix3*)
+    ld_dynamic_link_flags=
+    ;;
+
+  aix4*)
+    ld_dynamic_link_flags=
+    ;;
+
+  freebsd2.2*)
+    ld_dynamic_link_flags=
+    ;;
+
+  freebsd2*)
+    ld_dynamic_link_flags=
+    ;;
+
+  freebsd3*)
+    ld_dynamic_link_flags=
+    ;;
+
+  hpux*)
+    ld_dynamic_link_flags="${wl}-E"
+    ;;
+
+  irix5* | irix6*)
+    ld_dynamic_link_flags=
+    ;;
+
+  netbsd*)
+    ld_dynamic_link_flags=
+    ;;
+
+  openbsd*)
+    ld_dynamic_link_flags=
+    ;;
+
+  osf3* | osf4*)
+    ld_dynamic_link_flags=
+    ;;
+
+  sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
+    ld_dynamic_link_flags="${wl}-Bexport"
+    ;;
+
+  sunos4*)
+    ld_dynamic_link_flags=
+    ;;
+
+  uts4*)
+    ld_dynamic_link_flags=
+    ;;
+
+  bsdi*)
+    ld_dynamic_link_flags=
+    ;;
+
+  esac
+fi # End of if -z ld_dynamic_link_flags
+fi # End of if test "$can_build_shared" = "yes"
+
 AC_SUBST(dll_ld)
 AC_SUBST(dll_cflags)
-AC_SUBST(dll_oflags)
-AC_SUBST(dll_lflags)
+AC_SUBST(dll_ldflags)
+AC_SUBST(dll_post)
+AC_SUBST(dll_ldo)
+AC_SUBST(ld_dynamic_link_flags)
 ])dnl
+
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
 #### Copyright (C) 1995, 1996 Ben Wing.
+#### Copyright (C) 1998, 1999 J. Kean Johnston.
 
 ### Don't edit this script!
 ### This script was automatically generated by the `autoconf' program
 infopath=''
 install_pp=''
 lispdir='${datadir}/${PROGNAME}-${version}/lisp'
+moduledir='${datadir}/${PROGNAME}-${version}/${configuration}/modules'
+sitelispdir='${datadir}/xemacs/site-lisp'
+sitemoduledir='${datadir}/xemacs/site-modules'
 pkgdir='${datadir}/${PROGNAME}-${version}/lisp'
 package_path=''
 etcdir='${datadir}/${PROGNAME}-${version}/etc'
 lockdir='${statedir}/${PROGNAME}/lock'
-archlibdir='${libdir}/${PROGNAME}-${version}/${configuration}'
+archlibdir='${datadir}/${PROGNAME}-${version}/${configuration}'
 with_site_lisp='no'
+with_site_modules='yes'
 with_menubars=''
 with_scrollbars=''
 with_dialogs=''
             case "$opt" in
 
       	with_site_lisp	| \
+    with_site_modules | \
 	with_x		| \
 	with_x11	| \
 	with_msw	| \
 EOF
 }
  ;;
+             sitelispdir ) { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining SITELISPDIR_USER_DEFINED
+EOF
+cat >> confdefs.h <<\EOF
+#define SITELISPDIR_USER_DEFINED 1
+EOF
+}
+ ;;
+             moduledir ) { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MODULEDIR_USER_DEFINED
+EOF
+cat >> confdefs.h <<\EOF
+#define MODULEDIR_USER_DEFINED 1
+EOF
+}
+ ;;
              etcdir  )  { test "$extra_verbose" = "yes" && cat << \EOF
     Defining ETCDIR_USER_DEFINED
 EOF
 EOF
 }
 
+            { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MODULEDIR_USER_DEFINED
+EOF
+cat >> confdefs.h <<\EOF
+#define MODULEDIR_USER_DEFINED 1
+EOF
+}
+
 	        { test "$extra_verbose" = "yes" && cat << \EOF
     Defining ETCDIR_USER_DEFINED
 EOF
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:755: checking whether ln -s works" >&5
+echo "configure:785: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:971: checking "host system type"" >&5
+echo "configure:1001: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 
 if test -z "$dynamic"; then
   case "$opsys" in
-    hpux* | sunos4* | sco5 ) dynamic=no ;;
+    hpux* | sunos4* ) dynamic=no ;;
     *) dynamic=yes ;;
   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:1460: checking for $ac_word" >&5
+echo "configure:1490: 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:1486: checking for $ac_word" >&5
+echo "configure:1516: 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:1531: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1561: 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 1543 "configure"
+#line 1573 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1577: \"$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:1567: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1597: 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:1572: checking whether we are using GNU C" >&5
+echo "configure:1602: 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:1579: \"$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:1609: \"$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:1593: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1623: 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:1622: checking for $ac_word" >&5
+echo "configure:1652: 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:1648: checking for $ac_word" >&5
+echo "configure:1678: 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:1693: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1723: 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 1705 "configure"
+#line 1735 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1739: \"$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:1729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1759: 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:1734: checking whether we are using GNU C" >&5
+echo "configure:1764: 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:1741: \"$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:1771: \"$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:1755: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1785: 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:1784: checking for $ac_word" >&5
+echo "configure:1814: 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:1810: checking for $ac_word" >&5
+echo "configure:1840: 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:1855: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1885: 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 1867 "configure"
+#line 1897 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1901: \"$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:1891: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1921: 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:1896: checking whether we are using GNU C" >&5
+echo "configure:1926: 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:1903: \"$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:1933: \"$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:1917: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1947: 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 "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1950: checking how to run the C preprocessor" >&5
+echo "configure:1980: 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 1963 "configure"
+#line 1993 "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:1969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1999: \"$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 1980 "configure"
+#line 2010 "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:1986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2016: \"$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:2009: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2011 "configure"
+echo "configure:2039: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2041 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
 
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2038: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+echo "configure:2068: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2070 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
 
 
 cat > conftest.$ac_ext <<EOF
-#line 2074 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
 #endif
 }
 EOF
-if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
 if test "$cflags_specified" = "no"; then
       if   test "$GCC" = "yes"; then
     CFLAGS="-g -O3 -Wall -Wno-switch"
-                    test "$opsys $machine" = "cygwin32 intel386" && \
-      CFLAGS="-g -O2 -Wall -Wno-switch"
-  elif test "$__SUNPRO_C" = "yes"; then
+                          elif test "$__SUNPRO_C" = "yes"; then
     case "$opsys" in
       sol2    ) CFLAGS="-v -xO4" ;;
       sunos4* ) CFLAGS="-xO2";;
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2356: checking for dynodump" >&5
+echo "configure:2384: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2394: checking for terminateAndUnload in -lC" >&5
+echo "configure:2422: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
+#line 2427 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2514: checking "for runtime libraries flag"" >&5
+echo "configure:2542: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* ) dash_r="-rpath " ;;
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 2536 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 2564 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
 
 
 
+
 GNU_MALLOC=yes
 if test "$with_dlmalloc" != "no"; then
 	doug_lea_malloc=yes
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2644: checking for malloc_get_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2647 "configure"
+echo "configure:2673: checking for malloc_get_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2676 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_get_state=yes"
 else
 fi
 
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2690: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2693 "configure"
+echo "configure:2719: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2722 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:2736: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2738 "configure"
+echo "configure:2765: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2767 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2804: checking for $ac_word" >&5
+echo "configure:2833: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2857: checking for a BSD compatible install" >&5
+echo "configure:2886: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2908: checking for $ac_word" >&5
+echo "configure:2937: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2939: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2942 "configure"
+echo "configure:2968: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2971 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2980: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2983 "configure"
+echo "configure:3009: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3012 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3021: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3024 "configure"
+echo "configure:3050: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3053 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3059: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3062 "configure"
+echo "configure:3088: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3091 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3102: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3105 "configure"
+echo "configure:3131: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3134 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3130 "configure"
+#line 3159 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3177 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3166 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 exit (0); }
 
 EOF
-if { (eval echo configure:3177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3203: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3206 "configure"
+echo "configure:3232: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3235 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3239: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3242 "configure"
+echo "configure:3268: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3271 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
 
 
 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3279: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3281 "configure"
+echo "configure:3308: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3310 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
 rm -f conftest*
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3320: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+echo "configure:3349: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3352 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3362: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3365 "configure"
+echo "configure:3391: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3394 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3396: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3399 "configure"
+echo "configure:3425: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3428 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3430: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3433 "configure"
+echo "configure:3459: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3462 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3469: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3472 "configure"
+echo "configure:3498: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3501 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3503: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3506 "configure"
+echo "configure:3532: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3535 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3538: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3540 "configure"
+echo "configure:3567: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3569 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3578: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3581 "configure"
+echo "configure:3607: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3610 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3613: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3616 "configure"
+echo "configure:3642: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3645 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3647: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3650 "configure"
+echo "configure:3676: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3679 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3686: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3689 "configure"
+echo "configure:3715: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3718 "configure"
 #include "confdefs.h"
 
 int main() {