Commits

Anonymous committed 43dd341

Import from CVS: tag r20-3b4

  • Participants
  • Parent commits 9414180
  • Tags r20-3b4

Comments (0)

Files changed (295)

 							-*- indented-text -*-
+to 20.3 beta4.
+-- miscellaneous bug fixes
+-- various about.el additions & updates
+-- edmacro.el-3.15
+-- Configure patches courtesy of Martin Buchholz
+-- about.el-2.2 courtesy of Hrvoje Niksic
+-- New function eval-when-feature from Emacs 20
+-- Toolbar buttons now take arbitrary lisp functions for callback
+-- webjump.el-1.5 courtesy of Neal W. Van Dyke
+-- reftex.el-2.13 courtesy of Carsten Dominik
+-- Initial synch with InfoDock 3.5
+-- Give defcustom the same special treatment defvar gets when evaluated with
+   `eval-last-sexp' (C-x C-e)
+-- "These patches make XEmacs run under NT!" - David Hobley
+-- Initial port of LEIM courtesy of MORIOKA Tomohiko
+-- tm-7.108 courtey of MORIOKA Tomohiko
+-- Custom-1.9907
+-- VM-6.32
+-- Gnus-5.4.56
+-- ediff & viper updates courtesy of Michael Kifer
+-- icomplete.el-4.10 courtesy of Ken Manheimer
+-- gdb-highlight.el courtesy of Jamie Zawinski
+-- New function `narrow-to-defun' bound to `C-x n d', from Emacs 19.35
+-- Oops, sorry.  gnudoit script restored
+-- New function `kill-buffer-and-window' bound to `C-x 4 0', from Emacs 19.34
+-- Cleanup of dumped packages to eliminate bytecompiler warnings
+
 to 20.3 beta3.
 -- miscellaneous bug fixes
 -- iso-acc.el-1.14 courtesy of Alexandre Oliva
+1997-06-05  Steven L Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-b4 is released.
+
+1997-06-04  Martin Buchholz  <mrb@eng.sun.com>
+
+	* src/*/*.h: Remove definitions of HAVE_UNION_WAIT, in accordance
+	with new Autoconf 2 mechanisms.
+	* src/syswait.h:
+	* src/sysdep.c:
+	* src/process.c: Use only Posix.1 sys/wait.h-defined symbols
+
+	* src/s/netbsd.h: complete rewrite, use ORDINARY_LINK, #ifdef out
+	old cruft that can be obtained from system header files.
+	* lib-src/getopt*: Synch with FSF, remove compiler warnings.
+	
+	* lib-src/b2m.c: 
+	* src/gifalloc.c: 
+	* lib-src/gnuslib.c: 
+	* lib-src/profile.c: 
+	* lib-src/movemail.c: Fix compiler warnings
+	
+	* lib-src/Makefile.in.in: Remove unused -DCONFIG_BROKETS flag
+	- Fix up compile flags for new etags version
+
+	* etc/NEWS: 
+	* etc/etags.1: 
+	* man/xemacs/programs.texi: 
+	* lib-src/etags.c:  Upgraded to etags 12.11
+
+	* src/config.h.in: Fix inline keyword support
+	
+	* configure.in: Use a different mechanism for removing extra white 
+	space.  Avoid using foo=`echo $bar`, which loses with various echos.
+	- new M4 macro XE_SPACE(var, words...)
+	- Use autoconf 2's AC_HEADER_SYS_WAIT
+	- Check for Xpm-XpmFree instead of Xpm-XpmReadFileToData to avoid
+	linking with losing Xpm implementations
+	- Check for correct wnn4 lib symbols
+	- Only link with inline.o when using gcc
+	- Support inline keywords inline, __inline, __inline__
+	- Ultrix now implies have_mmap=no
+	- Sun sound in non-standard dirs now works
+	- --native-sound-lib no longer ignored on HP & SGI
+	- gpm configure tests moved after curses configure tests
+	
+1997-05-30  Martin Buchholz  <mrb@eng.sun.com>
+
+	* configure.in: Automagically compute -R path for gcc
+
+Thu May 29 15:35:07 1997  Martin Buchholz  <mrb@eng.sun.com>
+
+	* configure.in: Add support for Solaris2.6 -z ignore linker flags
+
+1997-05-29  Martin Buchholz  <mrb@eng.sun.com>
+
+	* configure.in: Replace standard Autoconf MMAP test with Neal
+	Becker's replacement, hacked somewhat.
+
+1997-06-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/x11/x-menubar.el (default-menubar): Add menu for Mule.
+
+	* lisp/mule/mule-cmds.el: Menu for XEmacs were moved to
+ 	x11/x-menubar.el.
+
+1997-06-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/leim/quail.el: to avoid compiling warnings about
+ 	overlay.el.
+
+1997-06-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/leim/quail.el: to sync with quail.el of
+ 	Emacs-19.34.94-zeta.
+
+	* lisp/leim/quail/ziranma.el, lisp/leim/quail/tonepy.el,
+ 	lisp/leim/quail/py.el, lisp/leim/quail/qj.el,
+ 	lisp/leim/quail/sw.el, lisp/leim/quail/ccdospy.el,
+ 	lisp/leim/quail/punct.el, lisp/leim/quail/4corner.el,
+ 	lisp/leim/quail/symbol-ksc.el, lisp/leim/quail/ethiopic.el,
+ 	lisp/leim/quail/hanja.el, lisp/leim/quail/quick-cns.el,
+ 	lisp/leim/quail/tsangchi-cns.el, lisp/leim/quail/lrt.el,
+ 	lisp/leim/quail/tsangchi-b5.el, lisp/leim/quail/devanagari.el,
+ 	lisp/leim/quail/japanese.el, lisp/leim/quail/quick-b5.el,
+ 	lisp/leim/quail/punct-b5.el, lisp/leim/quail/qj-b5.el,
+ 	lisp/leim/quail/py-b5.el, lisp/leim/quail/ctlau.el,
+ 	lisp/leim/quail/ctlaub.el, lisp/leim/quail/ecdict.el,
+ 	lisp/leim/quail/array30.el, lisp/leim/quail/hangul3.el,
+ 	lisp/leim/quail/hanja-jis.el, lisp/leim/quail/cyrillic.el,
+ 	lisp/leim/quail/etzy.el, lisp/leim/quail/greek.el,
+ 	lisp/leim/quail/ipa.el, lisp/leim/quail/lao.el,
+ 	lisp/leim/quail/zozy.el, lisp/leim/quail/viqr.el,
+ 	lisp/leim/quail/latin.el, lisp/leim/quail/thai.el,
+ 	lisp/leim/quail/hangul.el: quail of LEIM for Emacs-19.34.94-zeta.
+
+1997-06-02  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mule/korean.el was abolished because it seems not to be used.
+
+	* mule/japanese.el was abolished because it seems not to be used.
+
+1997-06-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/tm/gnus-mime-old.el was abolished because XEmacs 20.3 has
+ 	Gnus 5.4.
+
+	* lisp/tm/tm-edit.el: updated to 7.108.
+
+	* lisp/tm/tm-view.el: updated to 7.83.
+
+	* lisp/leim/quail.el: modified for XEmacs.
+
+	* lisp/mule/mule-load.el, lisp/mule/mule-process.el: delete
+ 	mule-process.el because it is not used.
+
+	* lisp/mule/european.el was abolished because it seems not to be
+ 	used.
+
+	* lisp/mule/mule-load.el: must load mule-cmds before setting for
+ 	language-environment.
+
+	* lisp/mule/european-hooks.el: Modified for LEIM.
+
+	* lisp/mule/mule-cmds.el: Uncomment key definition for
+ 	`toggle-input-method'.
+
+	* lisp/mule/mule-init.el: Comment out about `mule-keymap' (moved
+ 	to mule-cmds.el).
+
+	* lisp/mule/mule-cmds.el: Uncomment about `mule-keymap' (moved
+ 	from mule-init.el).
+
+	* lisp/tl/tl-atype.el: Don't require tl-str.
+
+	* lisp/tl/tl-atype.el: Use atype.el of APEL.
+
+	* lisp/tl/tl-list.el: Use alist.el of APEL.
+
+1997-05-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/tl/richtext.el, lisp/tl/emu-x20.el, lisp/tl/emu-xemacs.el,
+ 	lisp/tl/emu.el, lisp/tl/emu-e19.el: moved to apel/.
+
+	* lisp/tl/file-detect.el, lisp/tl/filename.el: replaced by APEL's.
+
+	* lisp/mu/std11-parse.el, lisp/mu/std11.el: moved to apel/.
+
+	* lisp/leim/quail.el: Add new quail.el (imported from Emacs
+ 	19.34.94-epsilon).
+
+	* lisp/leim/skk/skkdic.el: delete skkdic.el temporary because
+ 	XEmacs can not compile it.
+
+	* lisp/leim/skk/skkdic.el, lisp/leim/quail/zozy.el,
+ 	lisp/leim/quail/ziranma.el, lisp/leim/quail/viqr.el,
+ 	lisp/leim/quail/tsangchi-cns.el, lisp/leim/quail/tsangchi-b5.el,
+ 	lisp/leim/quail/symbol-ksc.el, lisp/leim/quail/thai.el,
+ 	lisp/leim/quail/tonepy.el, lisp/leim/quail/quick-cns.el,
+ 	lisp/leim/quail/sw.el, lisp/leim/quail/qj-b5.el,
+ 	lisp/leim/quail/qj.el, lisp/leim/quail/quick-b5.el,
+ 	lisp/leim/quail/py-b5.el, lisp/leim/quail/py.el,
+ 	lisp/leim/quail/lao.el, lisp/leim/quail/latin.el,
+ 	lisp/leim/quail/lrt.el, lisp/leim/quail/punct-b5.el,
+ 	lisp/leim/quail/punct.el, lisp/leim/quail/hanja-jis.el,
+ 	lisp/leim/quail/hanja.el, lisp/leim/quail/ipa.el,
+ 	lisp/leim/quail/japanese.el, lisp/leim/quail/hangul3.el,
+ 	lisp/leim/quail/etzy.el, lisp/leim/quail/greek.el,
+ 	lisp/leim/quail/hangul.el, lisp/leim/quail/ethiopic.el,
+ 	lisp/leim/quail/devanagari.el, lisp/leim/quail/ecdict.el,
+ 	lisp/leim/quail/ctlau.el, lisp/leim/quail/ctlaub.el,
+ 	lisp/leim/quail/cyrillic.el, lisp/leim/quail/array30.el,
+ 	lisp/leim/quail/ccdospy.el, lisp/leim/quail/4corner.el: Add LEIM
+ 	elisp files; old lisp/quail was abolished.
+
+	* src/Makefile.in.in: Add mule-cmds.elc.
+
+	* lisp/mule/mule-load.el, lisp/mule/mule-cmds.el: Add mule-cmds.el
+ 	(imported from Emacs-19.34.94-epsilon and comment out a lot to
+ 	avoid conflict with mule-init.el or other XEmacs/mule files).
+
+	* lisp/prim/simple.el (assoc-ignore-case): New function; imported
+ 	from Emacs-19.34.94-epsilon.
+
 1997-05-29  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-beta3 is released.
 # and ${etcdir} are subdirectories of this.
 datadir=@datadir@
 
+pkgdir=@pkgdir@
+
 # Where to install and expect the files that XEmacs modifies as it
 # runs.	 These files are all architecture-independent. Right now, the
 # only such data is the locking directory; ${lockdir} is a
 ### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
 	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
-	  ${bindir} ${datadir} ${libdir} ${sitelispdir}
+	  ${bindir} ${datadir} ${libdir} ${sitelispdir} ${pkdir}
 	-chmod 0777 ${lockdir}
 
 ### Delete all the installed files that the `install' target would
 verbose=
 x_includes=NONE
 x_libraries=NONE
+CDPATH=.; export CDPATH
 
 if test -n "$ZSH_VERSION"; then
   setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO
 
 				
 		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
-	mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \
+	mandir | infodir | lispdir | etcdir | lockdir | pkgdir | archlibdir | \
 	sitelispdir | docdir )
 	   	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 esac
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:842: checking whether ln -s works" >&5
+echo "configure:843: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 
 
 echo "checking "the configuration name"" 1>&6
-echo "configure:899: checking "the configuration name"" >&5
+echo "configure:900: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(energize\|workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
 # 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:1325: checking for $ac_word" >&5
+echo "configure:1326: 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:1351: checking for $ac_word" >&5
+echo "configure:1352: 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:1396: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1397: 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 1408 "configure"
+#line 1409 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1413: \"$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:1432: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1433: 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:1437: checking whether we are using GNU C" >&5
+echo "configure:1438: 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:1444: \"$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:1445: \"$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:1458: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1459: 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:1488: checking for $ac_word" >&5
+echo "configure:1489: 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:1514: checking for $ac_word" >&5
+echo "configure:1515: 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:1559: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1560: 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 1571 "configure"
+#line 1572 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1576: \"$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:1595: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1596: 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:1600: checking whether we are using GNU C" >&5
+echo "configure:1601: 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:1607: \"$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:1608: \"$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:1621: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1622: 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:1650: checking for $ac_word" >&5
+echo "configure:1651: 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:1676: checking for $ac_word" >&5
+echo "configure:1677: 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:1721: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1722: 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 1733 "configure"
+#line 1734 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1738: \"$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:1757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1758: 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:1762: checking whether we are using GNU C" >&5
+echo "configure:1763: 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:1769: \"$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:1770: \"$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:1783: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1784: 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:1813: checking how to run the C preprocessor" >&5
+echo "configure:1814: 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 1826 "configure"
+#line 1827 "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:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1833: \"$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 1843 "configure"
+#line 1844 "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:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 ' > $tempcname
 CPP=`eval "echo $CPP"`
 eval `$CPP -Isrc $tempcname \
-       | grep 'configure___' \
-       | sed -n -e 's/^configure___ \([^= ]* *=\)\(.*\)$/\1\`echo \2\`/p'`
+	| sed -n -e "s/ *= */='/" -e "s/ *\$/'/" -e "s/^configure___//p"`
 if test -z "$SPECIFIED_CFLAGS"; then
   eval `$CPP -Isrc -DTHIS_IS_CONFIGURE $tempcname \
-	 | grep 'configure___' \
-	 | sed -n -e 's/^configure___ \([^= ]* *=\)\(.*\)$/\1\`echo \2\`/p'`
+	| sed -n -e "s/ *= */='/" -e "s/ *\$/'/" -e "s/^configure___//p"`
 else
   REAL_CFLAGS="$CFLAGS"
 fi
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2066: checking "for runtime libraries flag"" >&5
+echo "configure:2065: 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 2071 "configure"
+#line 2070 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
 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=""
+  if test -n "$LD_RUN_PATH"; then
     runpath="$LD_RUN_PATH"
+  elif test "$GCC" = "yes"; then
+        echo "int main(int argc, char *argv[]) {return 0;}" > conftest.c
+    xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+    for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+      case "$arg" in P,* | -L* | -R* )
+        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+          
+xe_runpath_dir="$dir"
+if test "$xe_runpath_dir" != "/lib"     -a \
+	"$xe_runpath_dir" != "/usr/lib" -a \
+	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
+  test -n "$runpath" && runpath="${runpath}:"
+  runpath="${runpath}${xe_runpath_dir}"
+fi
+
+        done ;;
+      esac
+    done
+    rm -f conftest*
   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
+        for arg in $ld_switch_site $ld_switch_x_site; do
+      case "$arg" in -L*) 
+xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+if test "$xe_runpath_dir" != "/lib"     -a \
+	"$xe_runpath_dir" != "/usr/lib" -a \
+	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
+  test -n "$runpath" && runpath="${runpath}:"
+  runpath="${runpath}${xe_runpath_dir}"
+fi
+;; esac
     done
         case "$canonical" in  *-solaris2.[1-4]* )
       test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
     esac
-  fi
-
+  fi 
   if test -n "$runpath"; then
     ld_switch_run="${dash_r}${runpath}"
     test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
 # 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:2142: checking for $ac_word" >&5
+echo "configure:2161: 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:2195: checking for a BSD compatible install" >&5
+echo "configure:2214: 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:2246: checking for $ac_word" >&5
+echo "configure:2265: 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:2274: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2276 "configure"
+echo "configure:2293: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2295 "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:2306: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2309 "configure"
+echo "configure:2325: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2328 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 fi
 done
 
-for ac_hdr in utime.h sys/wait.h libintl.h locale.h libgen.h
+for ac_hdr in utime.h locale.h libgen.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2347: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+echo "configure:2366: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2369 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2374: \"$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:2388: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2391 "configure"
+echo "configure:2407: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2410 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 fi
 done
 
+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+echo "configure:2445: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2448 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+int main() {
+int s;
+wait (&s);
+s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+; return 0; }
+EOF
+if { (eval echo configure:2464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
+if test $ac_cv_header_sys_wait_h = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SYS_WAIT_H
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SYS_WAIT_H 1
+EOF
+}
+
+fi
+
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2426: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2429 "configure"
+echo "configure:2488: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2491 "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:2437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2499: \"$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 2454 "configure"
+#line 2516 "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 2472 "configure"
+#line 2534 "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 2490 "configure"
+#line 2552 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 exit (0); }
 
 EOF
-if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:2563: \"$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:2526: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2529 "configure"
+echo "configure:2588: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2591 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2600: \"$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:2562: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2565 "configure"
+echo "configure:2624: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2627 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2639: \"$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:2602: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2604 "configure"
+echo "configure:2664: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2666 "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:2623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2685: \"$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:2643: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2646 "configure"
+echo "configure:2705: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2708 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2663: \"$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_type_signal=void
 else
 
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:2686: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2688 "configure"
+echo "configure:2748: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2750 "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:2704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2766: \"$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:2726: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2729 "configure"
+echo "configure:2788: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2791 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2799: \"$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:2761: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2764 "configure"
+echo "configure:2823: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2826 "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:2772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2834: \"$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:2795: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2798 "configure"
+echo "configure:2857: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2860 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2870: \"$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:2834: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2837 "configure"
+echo "configure:2896: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2899 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2948: \"$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:2911: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2973: 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:2936: checking whether byte ordering is bigendian" >&5
+echo "configure:2998: 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 2941 "configure"
+#line 3003 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3014: \"$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 2956 "configure"
+#line 3018 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3029: \"$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 2984 "configure"
+#line 3046 "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:2997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_bigendian=no
 else
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3023: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3026 "configure"
+echo "configure:3085: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3088 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3099: \"$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 $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3058: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3061 "configure"
+echo "configure:3120: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3123 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3134: \"$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 $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3093: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3096 "configure"
+echo "configure:3155: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3158 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3169: \"$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 $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3129: checking for long file names" >&5
+echo "configure:3191: 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:3177: checking for sqrt in -lm" >&5
+echo "configure:3239: 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 3182 "configure"
+#line 3244 "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:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3255: \"$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 "checking type of mail spool file locking" 1>&6
-echo "configure:3235: checking type of mail spool file locking" >&5
+echo "configure:3297: 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
 
 
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3258: checking for kstat_open in -lkstat" >&5
+echo "configure:3320: 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 3263 "configure"
+#line 3325 "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
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3336: \"$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 $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:3308: checking for kvm_read in -lkvm" >&5
+echo "configure:3370: 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 3313 "configure"
+#line 3375 "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
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3386: \"$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 $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:3358: checking for cma_open in -lpthreads" >&5
+echo "configure:3420: 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 3363 "configure"
+#line 3425 "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
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3436: \"$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
 fi
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:3410: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:3472: 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;
 fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3420: checking for dynodump" >&5
-case "$canonical" in *-solaris2.[0-5]* )
+echo "configure:3482: checking for dynodump" >&5
+case "$opsys" in sol2* )
   echo "$ac_t""yes" 1>&6
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining 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  ;;
+  case "$machine" in
+    sparc   ) dynodump_arch=sparc ;;
+    *86*    ) dynodump_arch=i386  ;;
+    powerpc ) dynodump_arch=ppc   ;;
   esac
     test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi ;;
   *) echo "$ac_t""no" 1>&6 ;;
 esac
 
+case "$opsys" in sol2-[6-9]* )
+  echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
+echo "configure:3505: checking for \"-z ignore\" linker flag" >&5
+  case "`ld -h 2>&1`" in
+    *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
+      ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
+    *) echo "$ac_t""no" 1>&6 ;;
+  esac ;;
+esac
+
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:3443: checking "for specified window system"" >&5
+echo "configure:3515: 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:3464: checking for X" >&5
+echo "configure:3536: 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 3524 "configure"
+#line 3596 "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:3529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3601: \"$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 3598 "configure"
+#line 3670 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3677: \"$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:3714: checking whether -R must be followed by a space" >&5
+echo "configure:3786: 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 3717 "configure"
+#line 3789 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3796: \"$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 3740 "configure"
+#line 3812 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3783: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3855: 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 3788 "configure"
+#line 3860 "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:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3871: \"$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 $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3823: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3895: 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 3828 "configure"
+#line 3900 "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:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3911: \"$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
     # 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:3868: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3871 "configure"
+echo "configure:3940: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3943 "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:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3966: \"$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:3915: checking for gethostbyname in -lnsl" >&5
+echo "configure:3987: 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 3920 "configure"
+#line 3992 "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:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4003: \"$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
     # -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:3961: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3964 "configure"
+echo "configure:4033: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4036 "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:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4010: checking "$xe_msg_checking"" >&5
+echo "configure:4082: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4015 "configure"
+#line 4087 "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
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4098: \"$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
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4050: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4053 "configure"
+echo "configure:4122: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4125 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:4076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4097: checking for remove in -lposix" >&5
+echo "configure:4169: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 4102 "configure"
+#line 4174 "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
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4185: \"$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
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4137: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4140 "configure"
+echo "configure:4209: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4212 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4184: checking for shmat in -lipc" >&5
+echo "configure:4256: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 4189 "configure"
+#line 4261 "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
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4272: \"$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
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   
 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4234: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4306: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4239 "configure"
+#line 4311 "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
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4322: \"$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
     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=""
+  if test -n "$LD_RUN_PATH"; then
     runpath="$LD_RUN_PATH"
+  elif test "$GCC" = "yes"; then
+        echo "int main(int argc, char *argv[]) {return 0;}" > conftest.c
+    xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
+    for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
+      case "$arg" in P,* | -L* | -R* )
+        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+          
+xe_runpath_dir="$dir"
+if test "$xe_runpath_dir" != "/lib"     -a \
+	"$xe_runpath_dir" != "/usr/lib" -a \
+	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
+  test -n "$runpath" && runpath="${runpath}:"
+  runpath="${runpath}${xe_runpath_dir}"
+fi
+
+        done ;;
+      esac
+    done
+    rm -f conftest*
   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
+        for arg in $ld_switch_site $ld_switch_x_site; do
+      case "$arg" in -L*) 
+xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+if test "$xe_runpath_dir" != "/lib"     -a \
+	"$xe_runpath_dir" != "/usr/lib" -a \
+	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
+  test -n "$runpath" && runpath="${runpath}:"
+  runpath="${runpath}${xe_runpath_dir}"
+fi
+;; esac
     done
         case "$canonical" in  *-solaris2.[1-4]* )
       test "$need_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
     esac
-  fi
-
+  fi 
   if test -n "$runpath"; then
     ld_switch_run="${dash_r}${runpath}"
     test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
 
   if test "$extra_verbose" = "yes"; then
     echo; echo "X11 compilation variables:"
-    echo "x_libraries = $x_libraries"
-echo "x_includes = $x_includes"
-echo "X_CFLAGS = $X_CFLAGS"
-echo "X_LIBS = $X_LIBS"
-echo "X_PRE_LIBS = $X_PRE_LIBS"
-echo "X_EXTRA_LIBS=\"$X_EXTRA_LIBS\""
+    echo "x_libraries = \"$x_libraries\""
+echo "x_includes = \"$x_includes\""
+echo "X_CFLAGS = \"$X_CFLAGS\""
+echo "X_LIBS = \"$X_LIBS\""
+echo "X_PRE_LIBS = \"$X_PRE_LIBS\""
+echo "X_EXTRA_LIBS = \"$X_EXTRA_LIBS\""
     echo
   fi
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:4370: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4373 "configure"
+echo "configure:4461: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4464 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:4402: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4493: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF