Commits

cvs  committed 59463af

Import from CVS: tag r20-3b2

  • Participants
  • Parent commits 8ebb1c0
  • Tags r20-3b2

Comments (0)

Files changed (105)

File CHANGES-beta

 							-*- indented-text -*-
+to 20.3 beta2.
+-- mega configure patches courtesy of Martin Buchholz
+-- edmacro.el-3.14
+-- eldoc.el-1.13 courtesy of Noah Friedman
+-- strokes.el-2.2 courtesy of David Bakhash
+-- eterm updates courtesy of Per Bothner
+-- add-log.el gets new mode type variables for lisp-like, c-like, and tex-like
+   modes courtesy of Erik Naggum
+-- add-log.el synched with Emacs 20.0
+-- gnudoit removed, Gnuserv updated courtesy of Hrvoje Niksic
+-- miscellaneous bug fixes
+-- Fix for multiple frame `cursor lockstep' bug courtesy of Kyle Jones
+-- Continued configure/build cleanup
+-- obsolete dynodump directories removed
+-- Gnus-5.4.53 courtesy of Lars Magne Ingebrigtsen
+-- vc-hooks.el, vc.el synched up with Emacs 19.34.94.
+-- Bytecompiler optimization hacking courtesy of Jamie Zawinski
+
 to 20.3 beta1.
--- Custom-1.97 courtesy of Per Abraham
+-- Custom-1.97 courtesy of Per Abrahamsen
 -- Obsolete files emacstool.c, emacsclient.c, emacsserver.c removed
 -- etags.c-11.90 courtesy of Francesco Potorti`
 -- Dragable modeline courtesy of Kyle Jones
 -- New variable `Info-button1-follows-hyperlink' to allow disabling the
    feature.
 -- Restore Gosling Emacs transpose-chars implementation as an option
--- Bytecompiler optimization hacking courtesy of Jamie Zawinski
+1997-05-22  Steven L Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-beta2 is released.
+
+Thu May 22 04:19:09 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* configure.in: Try to fix all reported bugs with 20.3-b1.
+	Change HAVE_WNN6 to WNN6.  WNN6 correctly autodetected.
+	extra-verbose now default on beta builds.
+	extra-verbose now much more verbose.
+	Don't set libs_termcap to " ".
+	Detect -lXm AFTER detecting -lXpm.
+	Use runtime paths before running tests, since AC_TRY_RUN may
+	depend on it.
+	with-xim=motif only default on Solaris.
+	realpath moved from s&m to configure.in.
+	xemacs-version.h removed.  main_1 now contains $canonical as well, 
+	for even more useful backtraces.
+	termcap handling rewritten.
+	Create .sbinit for Sun's source browser.
+	Warn user if no XPM support present.
+	Warn user if compiling in error checking.
+
+	* Makefile.in: use MAKE_SUBDIR consistently.  Remove references to 
+	dynodump.  Remove core when cleaning.  Remove config.log.
+	make distclean now functional.
+
+Tue Jun  4 10:15:54 1996  Per Bothner  <bothner@deneb.cygnus.com>
+
+	* etc/e/eterm.ti:  Add kcub1, kcuf1, kcuu1, kcud1 capabilities.
+
+Sun May 18 13:03:20 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* lwlib/Makefile.in.in (distclean): Clean up config.h.
+
+	* Makefile.in (distclean): Remve config.log.
+	remove broken dynodump stuffs.
+
 Sat May 17 20:30:54 1997  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-b1 is released.
 `/dev/dsp' is required for raw data and WAVE format files.
 
 The `--rel-alloc' option can be used to either enable or disable use
-of the relocating allocator.  Generally, it's best to go with the
-default configuration for your system.
+of the relocating allocator.  Turning on --rel-alloc will allow XEmacs
+to return unused memory to the operating system, thereby reducing its
+memory footprint.  However, it may make XEmacs runs more slowly,
+especially if your system's `mmap' implemntation is missing or
+inefficient.  Generally, it's best to go with the default
+configuration for your system.  You can tweak this based on how you
+use XEmacs, and the memory and cpu resources available on your system.
 
 The `--use-system-malloc' option can be use to either enable or
 disable use of the system malloc.  Generally, it's best to go with the
 The `--with-xim' option enables use of the X11 XIM mechanism to allow
 an input method to input text into XEmacs.  The input method is shared
 among all the X applications sharing an X display and using the same
-language.  The XIM support comes in 2 flavors: motif, and xlib.  If
-Motif support (the XmIm* set of functions) is available, it is
-preferred when available.  The xlib XIM support does not work quite as
-well, so by default if the XmIm* routines are autodetected, then the
-default is `--with-xim=motif', else `--with-xim=no'.
+language.  The XIM support comes in two flavors: `motif' and `xlib'.
+The Motif support (the XmIm* functions) is preferred when available.
+The xlib XIM support does not work quite as well.  The XIM support has
+been known to cause crashes due to bugs in X11, so it defaults to `no'
+except on Solaris, where it is known to be stable.
 
 The `--with-canna' option enables the use of the Canna Japanese input
 method.
 #      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
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
-src:	lib-src lwlib dynodump FRC.src
+src:	@SRC_SUBDIR_DEPS@ FRC.src
 lib-src: FRC.lib-src
 lwlib:	FRC.lwlib
-dynodump: FRC.dynodump
 
 .RECURSIVE: ${SUBDIR}
 
 lwlib/Makefile: ${srcdir}/lwlib/Makefile.in.in config.status
 	./config.status
 
-dynodump/Makefile: ${srcdir}/dynodump/Makefile.in.in config.status
-	./config.status
-
 src/config.h: ${srcdir}/src/config.h.in
 	./config.status
 
 ### 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.dynodump:
 FRC.mostlyclean FRC.clean FRC.distclean FRC.realclean:
 
 # ==================== Cleaning up and miscellanea ====================
 ###      target for GCC does not delete `libgcc.a', because recompiling it
 ###      is rarely necessary and takes a lot of time.
 mostlyclean: FRC.mostlyclean
-	(cd src      && $(MAKE) $(MFLAGS) mostlyclean)
-	(cd lib-src  && $(MAKE) $(MFLAGS) mostlyclean)
-	(cd lwlib    && $(MAKE) $(MFLAGS) mostlyclean)
-	(cd dynodump && $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd man     && $(MAKE) $(MFLAGS) mostlyclean)
+	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	-(cd man && $(MAKE) $(MFLAGS) $@)
 
 ### `clean'
 ###      Delete all files from the current directory that are normally
 ###      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
-	(cd src      && $(MAKE) $(MFLAGS) clean)
-	(cd lib-src  && $(MAKE) $(MFLAGS) clean)
-	(cd lwlib    && $(MAKE) $(MFLAGS) clean)
-	(cd dynodump && $(MAKE) $(MFLAGS) clean)
-	-(cd man     && $(MAKE) $(MFLAGS) clean)
+	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	-(cd man && $(MAKE) $(MFLAGS) $@)
+	rm -f core
 
 ### `distclean'
 ###      Delete all files from the current directory that are created by
 ###      `make distclean' should leave only the files that were in the
 ###      distribution.
 top_distclean=\
-	rm -f config.status config-tmp-* build-install Installation ; \
-	rm -f Makefile ${SUBDIR_MAKEFILES}; \
-	(cd lock && rm -f *)
+	rm -f 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 ; \
+	done ; \
+	rm -f core .sbinit Makefile lock/*
 
 distclean: FRC.distclean
-	-([ ! -d lock ] && mkdir lock)
-	-([ ! -d site-lisp ] && mkdir site-lisp)
-	(cd src      && $(MAKE) $(MFLAGS) distclean)
-	(cd lib-src  && $(MAKE) $(MFLAGS) distclean)
-	(cd lwlib    && $(MAKE) $(MFLAGS) distclean)
-	(cd dynodump && $(MAKE) $(MFLAGS) distclean)
-	-(cd man     && $(MAKE) $(MFLAGS) 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) $@)
 	-${top_distclean}
 
 ### `realclean'
 ###      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
-	(cd src      && $(MAKE) $(MFLAGS) realclean)
-	(cd lib-src  && $(MAKE) $(MFLAGS) realclean)
-	(cd lwlib    && $(MAKE) $(MFLAGS) realclean)
-	(cd dynodump && $(MAKE) $(MFLAGS) realclean)
-	-(cd man     && $(MAKE) $(MFLAGS) realclean)
+	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	-(cd man && $(MAKE) $(MFLAGS) $@)
 	-${top_distclean}
 
 ### This doesn't actually appear in the coding standards, but Karl
 ### the coding standards seem to come from.  It's like distclean, but
 ### it deletes backup and autosave files too.
 extraclean:
-	(cd src      && $(MAKE) $(MFLAGS) extraclean)
-	(cd lib-src  && $(MAKE) $(MFLAGS) extraclean)
-	(cd lwlib    && $(MAKE) $(MFLAGS) extraclean)
-	(cd dynodump && $(MAKE) $(MFLAGS) extraclean)
-	-(cd man     && $(MAKE) $(MFLAGS) extraclean)
+	for d in $(MAKE_SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done
+	-(cd man && $(MAKE) $(MFLAGS) $@)
 	-rm -f *~ \#*
 	-${top_distclean}
 
 
 
 ac_ext=c
-xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
-xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
 
 cache_file=/dev/null
 
-MAKE_SUBDIR="src lib-src"
+MAKE_SUBDIR="$MAKE_SUBDIR lib-src" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lib-src\" to \$MAKE_SUBDIR"; fi
 
 prefix='/usr/local'
 exec_prefix='${prefix}'
 use_system_malloc='default'
 energize_version=''
 native_sound_lib=''
-error_check_default='no'
+error_check_default='yes'
 error_check_extents=$error_check_default
 error_check_typecheck=$error_check_default
 error_check_bufpos=$error_check_default
 error_check_gc=$error_check_default
 error_check_malloc=$error_check_default
 debug=$error_check_default
+extra_verbose=$error_check_default
 use_assertions='yes'
 with_gif=''
 with_toolbars=''
 --with-dnet (*)		Compile with support for DECnet.
 --mail-locking=TYPE (*)	Specify the locking to be used by movemail to prevent
 			concurrent updates of mail spool files. Valid types
-			are \`lockf', \`flock', and \`lock-file'.
+			are \`lockf', \`flock', and \`file'.
 
 Internationalization options:
 
 --with-xim=motif (*)	Used in conjunction with Mule support.
 			Use either raw Xlib to provide XIM support, or
 			the Motif XmIm* routines (when available).
-			If the XmIm* routines are autodetected,
-			then the default is --with-xim=motif, else --with-xim=no.
-			NOTE:  On some systems like SunOS4 use of this option
-			will cause XEmacs to crash at startup.
+			NOTE:  On some systems bugs in X11's XIM support
+			will cause XEmacs to crash, so by default,
+			no XIM support is compiled in, unless running
+			on Solaris and the XmIm* routines are detected.
 --with-canna (*)	Compile with support for Canna (a Japanese input method
 			used in conjunction with Mule support).
 --with-wnn (*)		Compile with support for WNN (a multi-language input method
 	  with_database_gnudbm=no
 	  for x in `echo "$val" | sed 's/,/ /'` ; do
 	    case "$x" in
-		no ) : ;;
+		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
 		d | db | dbm )				with_database_dbm=yes    ;;
 		g | gn | gnu | gnud | gnudb | gnudbm )  with_database_gnudbm=yes ;;
             esac
 	  done
 	  if test "$with_database_dbm"    = "yes" -a \
-	          "$with_database_gnudbm" = "yes" ; then
+	          "$with_database_gnudbm" = "yes"; then
 	  (echo "$progname: Usage error:"
 echo " " "Only one of \`dbm' and \`gnudbm' may be specified
   with the \`--$optname' option."
 	  case "$val" in
 	    lockf )	val=lockf ;;
 	    flock )	val=flock ;;
-	    file  )	val=file  ;;
+	    file )	val=file  ;;
 	    * ) (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option must have one of these values:
   \`lockf', \`flock', or \`file'."
 echo " " "Valid types for the \`--$optname' option are:
   $types."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
-	    elif test "$new_default" ; then
+	    elif test -n "$new_default" ; then
 		error_check_extents=$new_default
 		error_check_typecheck=$new_default
 		error_check_bufpos=$new_default
 		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \
 	sitelispdir | docdir )
-	   	   if test "$valomitted" = "yes" ; then
-	     if test "$#" = 0 ; then
+	   	   if test "$valomitted" = "yes"; then
+	     if test "$#" = 0; then
 		 (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option requires a value."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1;
 
 if test "$with_energize" = "yes" ; then
   with_menubars=lucid with_scrollbars=motif with_dialogs=motif with_tooltalk=yes
-  MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize"
+  MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib/energize\" to \$MAKE_SUBDIR"; fi
 fi
 
 test "$extra_verbose" = "yes" && verbose=yes
 
-test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias
-if test "$with_workshop" = "yes"; then
-  { test "$extra_verbose" = "yes" && cat << \EOF
-    Defining SUNPRO
-EOF
-cat >> confdefs.h <<\EOF
-#define SUNPRO 1
-EOF
-}
-
-  extra_objs="$extra_objs sunpro.o"
-  with_tooltalk=yes
-fi
-
 case "site_includes" in *:* ) site_includes="`echo $site_includes | sed 's/:/ /g'`";; esac
 case "site_libraries" in *:* ) site_libraries="`echo $site_libraries | sed 's/:/ /g'`";; esac
 case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo $site_runtime_libraries | sed 's/:/ /g'`";; esac
 
-if test "$debug" = "yes"; then
-  use_assertions=yes memory_usage_stats=yes
-  extra_objs="$extra_objs debug.o"
-fi
-
 test -n "$with_x" && with_x11="$with_x"
 
 if test "$run_in_place" = "yes"; then
 esac
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:857: checking whether ln -s works" >&5
+echo "configure:839: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 vpath %.in $(srcdir)'
 fi
 
-for dir in ./src ./lib-src ./dynodump ./lwlib ./lock ; do
-  test ! -d "$dir" && mkdir "$dir"
-done
-if test "$with_energize" = "yes" -a ! -d ./lwlib/energize; then
-  mkdir ./lwlib/energize
-fi
-
 
 echo "checking "the configuration name"" 1>&6
-echo "configure:921: checking "the configuration name"" >&5
+echo "configure:896: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(energize\|workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
 
 
 
-machine='' opsys='' need_dynodump=no
+machine='' opsys=''
 
 case "$canonical" in
   sparc-*-*        ) machine=sparc ;;
   *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
   *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
 	if test -z "$NON_GNU_CPP" ; then
-	  if test -f /usr/ccs/lib/cpp
-	  then NON_GNU_CPP=/usr/ccs/lib/cpp
-	  else NON_GNU_CPP=/lib/cpp
-	  fi
+	  for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do
+	    if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi
+	  done
 	fi
 	opsys=usg5-4-2 ;;
     *-sysv4* | *-sysvr4* )	opsys=usg5-4 ;;
       *-hp-hpux8*  )  opsys=hpux8  ;;
       *-hp-hpux9*  )  opsys=hpux9  ;;
       *-hp-hpux10* )  opsys=hpux10 ;;
-      * )
-        case "`uname -r`" in
-	  *.B8.* )  opsys=hpux8  ;;
-	  *.08.* )  opsys=hpux8  ;;
-	  *.09.* )  opsys=hpux9  ;;
-	  *.10.* )  opsys=hpux10 ;;
-	  *      )  opsys=hpux   ;;
-        esac
-      ;;
+      *            )  opsys=hpux   ;;
     esac
 
-        case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o";; esac
+        case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"strcat.o\""
+ fi ;; esac
 
     if test "$opsys" = "hpux10"; then ansi_flag="-Ae"; else ansi_flag="-Aa"; fi
     NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E"
       *-solaris2* )
         test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
         RANLIB=':'
-	case "$canonical" in *-solaris2.[0-5]* ) need_dynodump=yes ;; esac
-	esac
+    esac
 
     case "$canonical" in
             i[3-9]86-*-sunos4*) opsys=sunos4-0	;;
 opsysfile="s/${opsys}.h"
 
 
+if test "$debug" = "yes"; then
+  use_assertions=yes memory_usage_stats=yes
+  extra_objs="$extra_objs debug.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"debug.o\""
+ fi
+fi
+
+test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias
+if test "$with_workshop" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining SUNPRO
+EOF
+cat >> confdefs.h <<\EOF
+#define SUNPRO 1
+EOF
+}
+
+  extra_objs="$extra_objs sunpro.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"sunpro.o\""
+ fi
+  with_tooltalk=yes
+fi
+
 test -n "$CC" && cc_specified=yes
 
 SPECIFIED_CFLAGS="$CFLAGS"
 # 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:1332: checking for $ac_word" >&5
+echo "configure:1322: 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:1358: checking for $ac_word" >&5
+echo "configure:1348: 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:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1393: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
-xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
-xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1415 "configure"
+#line 1405 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1409: \"$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:1439: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1429: 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:1444: checking whether we are using GNU C" >&5
+echo "configure:1434: 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:1451: \"$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:1441: \"$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:1465: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1455: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 fi
 
 
-if   test "$with_gcc" = "no"  -a "$ac_cv_prog_gcc" = "yes"; then 
+if   test "$with_gcc" = "no"  -a "$ac_cv_prog_gcc" = "yes"; then
   CC=${NON_GNU_CC-cc}
   # 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:1495: checking for $ac_word" >&5
+echo "configure:1485: 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:1521: checking for $ac_word" >&5
+echo "configure:1511: 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:1566: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1556: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
-xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
-xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1578 "configure"
+#line 1568 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1572: \"$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:1602: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1592: 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:1607: checking whether we are using GNU C" >&5
+echo "configure:1597: 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:1614: \"$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:1604: \"$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:1628: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1618: 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 "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
-elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then 
+elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then
   CC=gcc
   # 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:1657: checking for $ac_word" >&5
+echo "configure:1647: 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:1683: checking for $ac_word" >&5
+echo "configure:1673: 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:1728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1718: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
-xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
-xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
+xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
 cat > conftest.$ac_ext <<EOF
-#line 1740 "configure"
+#line 1730 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1734: \"$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:1764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1754: 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:1769: checking whether we are using GNU C" >&5
+echo "configure:1759: 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:1776: \"$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:1766: \"$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:1790: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1780: 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:1820: checking how to run the C preprocessor" >&5
+echo "configure:1810: 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 1833 "configure"
+#line 1823 "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:1829: \"$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 1850 "configure"
+#line 1840 "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:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 
 
 case "$canonical" in
-  *-sun-sunos* ) test "$CPP" = "acc -E"  &&  CPP="acc -E -Xs" ;;
+  *-sun-sunos* ) test "$CPP" = "acc -E" && CPP="acc -E -Xs" ;;
 esac
 
 
 #include "'$srcdir'/src/'$machfile'"
 
 #ifndef LIBS_MACHINE
-#define LIBS_MACHINE 
+#define LIBS_MACHINE
 #endif
 configure___ libs_machine=LIBS_MACHINE
 
 #ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM 
+#define LIBS_SYSTEM
 #endif
 configure___ libs_system=LIBS_SYSTEM
 
 #ifndef LIBS_TERMCAP
-#define LIBS_TERMCAP 
+#define LIBS_TERMCAP
 #endif
 configure___ libs_termcap=LIBS_TERMCAP
 
 #ifndef LIB_STANDARD
-#define LIB_STANDARD 
+#define LIB_STANDARD
 #endif
 configure___ libs_standard=LIB_STANDARD
 
 #ifndef C_SWITCH_SYSTEM
-#define C_SWITCH_SYSTEM 
+#define C_SWITCH_SYSTEM
 #endif
 configure___ c_switch_system=C_SWITCH_SYSTEM
 
 #ifndef C_SWITCH_MACHINE
-#define C_SWITCH_MACHINE 
+#define C_SWITCH_MACHINE
 #endif
 configure___ c_switch_machine=C_SWITCH_MACHINE
 
 #ifndef C_SWITCH_X_SYSTEM
-#define C_SWITCH_X_SYSTEM 
+#define C_SWITCH_X_SYSTEM
 #endif
 configure___ c_switch_x_system=C_SWITCH_X_SYSTEM
 
 #ifndef LD_SWITCH_X_SYSTEM
-#define LD_SWITCH_X_SYSTEM 
+#define LD_SWITCH_X_SYSTEM
 #endif
 configure___ ld_switch_x_system=LD_SWITCH_X_SYSTEM
 
 #ifndef LD_SWITCH_SYSTEM
-#define LD_SWITCH_SYSTEM 
+#define LD_SWITCH_SYSTEM
 #endif
 configure___ ld_switch_system=LD_SWITCH_SYSTEM
 
 configure___ mail_use_lockf=no
 #endif
 
-#ifdef __SUNPRO_C
-configure___ sunpro_c=yes
-#else
-configure___ sunpro_c=no
-#endif
-
 
 #ifdef THIS_IS_CONFIGURE
 
 fi
 rm $tempcname
 
-if test "$cflags" != "NO_CFLAGS_DEFINED" ; then
-  REAL_CFLAGS=$cflags
-fi
-
-UNEXEC_SRC="`echo $unexec | sed 's/\.o/.c/'`"
+test "$cflags" != "NO_CFLAGS_DEFINED" && REAL_CFLAGS="$cflags"
+
+extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"$unexec\""
+ fi
+
+
+if test -n "$site_libraries"; then
+  for arg in $site_libraries; do
+    case "$arg" in -* ) ;; * ) arg="-L${arg}" ;; esac
+    ld_switch_site="$ld_switch_site $arg" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"$arg\" to \$ld_switch_site"; fi
+  done
+fi
+
+if test -n "$site_includes" ; then
+  for arg in $site_includes; do
+    case "$arg" in -* ) ;; * ) arg="-I${arg}" ;; esac
+    c_switch_site="$c_switch_site $arg" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"$arg\" to \$c_switch_site"; fi
+  done
+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
+done
+
+if test -n "$site_runtime_libraries" ; then
+  LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ 	*/:/'`"
+  export LD_RUN_PATH
+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 ;;
+       * ) add_runtime_path=no ;;
+     esac
+fi
+
+if test "$add_runtime_path" = "yes"; then
+      echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
+echo "configure:2054: checking "for runtime libraries flag"" >&5
+  dash_r=""
+  for try_dash_r in "-R" "-R " "-rpath "; do
+    xe_check_libs="${try_dash_r}/no/such/file-or-directory"
+    cat > conftest.$ac_ext <<EOF
+#line 2059 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  dash_r="$try_dash_r"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    xe_check_libs=""
+    test -n "$dash_r" && break
+  done
+  if test -n "$dash_r";
+    then echo "$ac_t"""\"${dash_r}\""" 1>&6
+    else echo "$ac_t""NONE" 1>&6
+  fi
+fi
+
+
+if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
+    ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
+  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+  
+        if test -n "$LD_RUN_PATH"; then
+    runpath="$LD_RUN_PATH"
+  else
+        runpath=""
+    for arg in $ld_switch_site $ld_switch_x_site; do
+      case "$arg" in -L* )
+	dir=`echo "$arg" | sed 's/^-L//'`
+	if test -n "`ls ${dir}/*.s[ol] 2>/dev/null`"; then
+	  test -n "$runpath" && runpath="${runpath}:"
+	  runpath="${runpath}${dir}"
+        fi
+	;;
+      esac
+    done
+        case "$canonical" in  *-solaris2.[1-4]* )
+      test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
+    esac
+  fi
+
+  if test -n "$runpath"; then
+    ld_switch_run="${dash_r}${runpath}"
+    test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+  fi
+fi
+
+
 
 GNU_MALLOC=yes
 if test "$system_malloc" = "yes" ; then
 fi
 
 
-
 # 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:2051: checking for $ac_word" >&5
+echo "configure:2130: 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:2104: checking for a BSD compatible install" >&5
+echo "configure:2183: 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:2155: checking for $ac_word" >&5
+echo "configure:2234: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2183: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2185 "configure"
+echo "configure:2262: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2264 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2215: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2218 "configure"
+echo "configure:2294: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2297 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2302: \"$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:2256: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2259 "configure"
+echo "configure:2335: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2338 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2343: \"$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:2297: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2300 "configure"
+echo "configure:2376: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2379 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2384: \"$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 ANSI C header files""... $ac_c" 1>&6
-echo "configure:2335: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2338 "configure"
+echo "configure:2414: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2417 "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:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2425: \"$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 2363 "configure"
+#line 2442 "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 2381 "configure"
+#line 2460 "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 2399 "configure"
+#line 2478 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 exit (0); }
 
 EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2489: \"$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:2435: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
+echo "configure:2514: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2517 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2526: \"$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:2471: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+echo "configure:2550: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2553 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2565: \"$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:2511: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2513 "configure"
+echo "configure:2590: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2592 "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:2532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2611: \"$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:2552: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2555 "configure"
+echo "configure:2631: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2634 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
 
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:2595: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
+echo "configure:2674: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2676 "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:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2692: \"$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:2635: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2638 "configure"
+echo "configure:2714: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2717 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2725: \"$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:2670: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2673 "configure"
+echo "configure:2749: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2752 "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:2681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2760: \"$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:2704: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2707 "configure"
+echo "configure:2783: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2786 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2796: \"$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:2743: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2746 "configure"
+echo "configure:2822: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2825 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2820: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2899: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2845: checking whether byte ordering is bigendian" >&5
+echo "configure:2924: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 2850 "configure"
+#line 2929 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 2865 "configure"
+#line 2944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 2893 "configure"
+#line 2972 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_bigendian=no
 else
 fi
 
 
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:3011: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3014 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
+EOF
+if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_SHORT = $ac_cv_sizeof_short
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+}
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:3046: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3049 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_INT = $ac_cv_sizeof_int
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+}
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:3081: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3084 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_LONG = $ac_cv_sizeof_long
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+}
+
+
+
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:2932: checking for long file names" >&5
+echo "configure:3117: checking for long file names" >&5
 
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
 
 
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:2980: checking for sqrt in -lm" >&5
+echo "configure:3165: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 2985 "configure"
+#line 3170 "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
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3181: \"$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
 rm -f conftest*
 xe_check_libs=""
 
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
     ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
 EOF
 }
 
-  LIBS="-lm $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+  LIBS="-lm $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lm\" to \$LIBS"; fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+{ test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LISP_FLOAT_TYPE
+EOF
+cat >> confdefs.h <<\EOF
+#define LISP_FLOAT_TYPE 1
+EOF
+}
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3029: checking type of mail spool file locking" >&5
+echo "configure:3223: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
 
 fi
 
-if test "$need_dynodump" = "yes" ; then
+
+echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
+echo "configure:3246: checking for kstat_open in -lkstat" >&5
+ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lkstat "
+cat > conftest.$ac_ext <<EOF
+#line 3251 "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
+    builtin and then its argument prototype would still apply.  */
+char kstat_open();
+
+int main() {
+kstat_open()
+; return 0; }
+EOF
+if { (eval echo configure:3262: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lkstat $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkstat\" to \$LIBS"; fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
+echo "configure:3296: checking for kvm_read in -lkvm" >&5
+ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lkvm "
+cat > conftest.$ac_ext <<EOF
+#line 3301 "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
+    builtin and then its argument prototype would still apply.  */
+char kvm_read();
+
+int main() {
+kvm_read()
+; return 0; }
+EOF
+if { (eval echo configure:3312: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lkvm $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lkvm\" to \$LIBS"; fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
+echo "configure:3346: checking for cma_open in -lpthreads" >&5
+ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lpthreads "
+cat > conftest.$ac_ext <<EOF
+#line 3351 "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
+    builtin and then its argument prototype would still apply.  */
+char cma_open();
+
+int main() {
+cma_open()
+; return 0; }
+EOF
+if { (eval echo configure:3362: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lpthreads $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpthreads\" to \$LIBS"; fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then
+   case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac
+fi
+
+echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
+echo "configure:3398: checking whether the -xildoff compiler flag is required" >&5
+if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
+  if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
+    then echo "$ac_t""no" 1>&6;
+    else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-xildoff\" to \$ld_switch_site"; fi
+  fi
+  else echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for dynodump""... $ac_c" 1>&6
+echo "configure:3408: checking for dynodump" >&5
+case "$canonical" in *-solaris2.[0-5]* )
+  echo "$ac_t""yes" 1>&6
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining DYNODUMP
 EOF
 EOF
 }
 
-  MAKE_SUBDIR="$MAKE_SUBDIR dynodump"
+  MAKE_SUBDIR="$MAKE_SUBDIR dynodump" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"dynodump\" to \$MAKE_SUBDIR"; fi
   case "$canonical" in
     sparc*   ) dynodump_arch=sparc ;;
     powerpc* ) dynodump_arch=ppc   ;;
     i*86*    ) dynodump_arch=i386  ;;
   esac
-    test "$GCC" = "yes" && ld_switch_site="-fno-gnu-linker $ld_switch_site"
-fi
-
-for dir in "/usr/ccs/lib"; do
-  test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}"
-done
+    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 ;;
+  *) echo "$ac_t""no" 1>&6 ;;
+esac
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:3074: checking "for specified window system"" >&5
+echo "configure:3431: checking "for specified window system"" >&5
 
 if test "$x_includes $x_libraries" = "NONE NONE"; then
   if test -n "$OPENWINHOME" \
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3095: checking for X" >&5
+echo "configure:3452: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3155 "configure"
+#line 3512 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3229 "configure"
+#line 3586 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3345: checking whether -R must be followed by a space" >&5
+echo "configure:3702: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 3348 "configure"
+#line 3705 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 3371 "configure"
+#line 3728 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
     # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
-    if test "$with_dnet" = "no"; then
+    if test "$with_dnet" = "no" ; then
 ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3414: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3771: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 3419 "configure"
+#line 3776 "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
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3787: \"$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
 rm -f conftest*
 xe_check_libs=""
 
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 else
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3454: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3811: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 3459 "configure"
+#line 3816 "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
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3827: \"$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
 rm -f conftest*
 xe_check_libs=""
 
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 else
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3499: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3502 "configure"
+echo "configure:3856: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3859 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3546: checking for gethostbyname in -lnsl" >&5
+echo "configure:3903: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 3551 "configure"
+#line 3908 "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
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3919: \"$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
 rm -f conftest*
 xe_check_libs=""
 
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 else
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:3592: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3595 "configure"
+echo "configure:3949: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else