--- xemacs21-21.4.17.orig/config.guess
+++ xemacs21-21.4.17/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-08-12'
+timestamp='2004-08-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -33,10 +34,6 @@
 #
 # The plan is that this can be called by configure scripts if you
 # don't specify an explicit build system type.
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,7 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -91,33 +88,45 @@
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break
-	  fi
-	done
-	rm -f $dummy.c $dummy.o $dummy.rel
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
 	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found
+	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
@@ -131,29 +140,31 @@
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -169,70 +180,123 @@
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -246,33 +310,18 @@
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -290,6 +339,13 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -318,7 +374,7 @@
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -332,9 +388,6 @@
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -361,17 +414,8 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
@@ -389,6 +433,7 @@
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -410,12 +455,20 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -463,11 +516,20 @@
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -479,8 +541,7 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -488,9 +549,9 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -498,23 +559,10 @@
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
-    *:AIX:*:5)
-	case "`lsattr -El proc0 -a type -F value`" in
-	    PowerPC*) IBM_ARCH=powerpc
-		      IBM_MANUF=ibm ;;
-	    Itanium)  IBM_ARCH=ia64
-		      IBM_MANUF=unknown ;;
-	    POWER*)   IBM_ARCH=power
-		      IBM_MANUF=ibm ;;
-	    *)        IBM_ARCH=powerpc
-		      IBM_MANUF=ibm ;;
-	esac
-	echo ${IBM_ARCH}-${IBM_MANUF}-aix${UNAME_VERSION}.${UNAME_RELEASE}
-	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
 	exit 0 ;;
@@ -542,10 +590,8 @@
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -554,12 +600,13 @@
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -592,11 +639,21 @@
                   exit (0);
               }
 EOF
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $dummy
-	fi ;;
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -604,6 +661,7 @@
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -629,8 +687,7 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -639,7 +696,7 @@
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
 	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -648,7 +705,7 @@
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -658,9 +715,6 @@
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -679,42 +733,39 @@
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -726,9 +777,6 @@
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
@@ -738,11 +786,17 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
+	echo i586-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
@@ -754,253 +808,178 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
-    *:Linux:*:*)
-
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_emulations=`cd /; ld --help 2>&1 \
-			 | sed -ne '/supported emulations:/!d
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
+				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-        case "$ld_supported_emulations" in
-	  *ia64)
-		echo "${UNAME_MACHINE}-unknown-linux"
-		exit 0
-		;;
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
+        case "$ld_supported_targets" in
+	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  i?86coff)
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	  sparclinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32_sparc)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  armlinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32arm*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-		exit 0
-		;;
-	  armelf_linux*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  m68klinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32ppc | elf32ppclinux)
-		# Determine Lib Version
-		cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unkown\n");
-#endif
-  return 0;
-}
-EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			./$dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi
-		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC}
-		exit 0
-		;;
-	  shelf_linux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
 	esac
-
-	if test "${UNAME_MACHINE}" = "alpha" ; then
-		cat <<EOF >$dummy.s
-			.data
-		\$Lformat:
-			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-			.text
-			.globl main
-			.align 4
-			.ent main
-		main:
-			.frame \$30,16,\$26,0
-			ldgp \$29,0(\$27)
-			.prologue 1
-			.long 0x47e03d80 # implver \$0
-			lda \$2,-1
-			.long 0x47e20c21 # amask \$2,\$1
-			lda \$16,\$Lformat
-			mov \$0,\$17
-			not \$1,\$18
-			jsr \$26,printf
-			ldgp \$29,0(\$26)
-			mov 0,\$16
-			jsr \$26,exit
-			.end main
-EOF
-		LIBC=""
-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			esac
-
-			objdump --private-headers $dummy | \
-			  grep ld.so.1 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi
-		rm -f $dummy.s $dummy
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-#ifdef __R5900
-/* Little Endian R5900 running Linux,
-   this *must* be Sony PlayStation 2 */
-  printf ("%sel-PlayStation2-linux-gnu\n", argv[1]);
-#else
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-#endif
-  return 0;
-}
-EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-	  rm -f $dummy.c $dummy
-	elif test "${UNAME_MACHINE}" = "s390"; then
-	  echo s390-ibm-linux && exit 0
-	elif test "${UNAME_MACHINE}" = "x86_64"; then
-	  echo x86_64-unknown-linux-gnu && exit 0
-	elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
-	  # Look for CPU level
-	  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	    PA7*)
-		echo hppa1.1-unknown-linux-gnu
-		;;
-	    PA8*)
-		echo hppa2.0-unknown-linux-gnu
-		;;
-	    *)
-		echo hppa-unknown-linux-gnu
-		;;
-	  esac
-	  exit 0
-	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
-	  # or one that does not give us useful --help.
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  # If ld does not provide *any* "supported emulations:"
-	  # that means it is gnuoldld.
-	  test -z "$ld_supported_emulations" \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-	  case "${UNAME_MACHINE}" in
-	  i?86)
-	    VENDOR=pc;
-	    ;;
-	  *)
-	    VENDOR=unknown;
-	    ;;
-	  esac
-	  # Determine whether the default compiler is a.out or elf
-	  cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-	  rm -f $dummy.c $dummy
-	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -1008,7 +987,27 @@
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -1016,36 +1015,32 @@
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
-        # Fixed at (any) Pentium or better
-        UNAME_MACHINE=i586
-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
-	else
-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1069,9 +1064,15 @@
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1082,22 +1083,19 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1117,8 +1115,8 @@
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
@@ -1130,6 +1128,10 @@
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
 	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
@@ -1158,6 +1160,9 @@
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1165,18 +1170,25 @@
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1199,11 +1211,6 @@
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
 	exit 0 ;;
-    i?86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
 	exit 0 ;;
@@ -1222,11 +1229,25 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1313,11 +1334,24 @@
 #endif
 
 #if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1328,8 +1362,7 @@
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
--- xemacs21-21.4.17.orig/configure
+++ xemacs21-21.4.17/configure
@@ -237,7 +237,7 @@
 with_site_modules='yes'
 with_menubars=''
 with_scrollbars=''
-with_widgets=''
+with_widgets='athena'
 with_dialogs=''
 with_file_coding=''
 cpp='' cppflags='' libs='' ldflags=''
@@ -826,6 +826,9 @@
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
     fi
   ;;
+  hppa*-*-linux-gnu* )
+    machine=hp800 opsys=gnu-linux
+  ;;
 
     * )
     if test ! -f "$srcdir/src/lisp.h" -o \
@@ -851,7 +854,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:855: checking whether ln -s works" >&5
+echo "configure:858: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1116,7 +1119,7 @@
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1120: checking "host system type"" >&5
+echo "configure:1123: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1654,7 +1657,7 @@
 # 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:1658: checking for $ac_word" >&5
+echo "configure:1661: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1681,7 +1684,7 @@
   # 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:1685: checking for $ac_word" >&5
+echo "configure:1688: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1729,7 +1732,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1733: checking for $ac_word" >&5
+echo "configure:1736: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1758,7 +1761,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1765: 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'
@@ -1771,12 +1774,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1775 "configure"
+#line 1778 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
@@ -1804,19 +1807,19 @@
   { 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:1808: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: 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:1813: checking whether we are using GNU C" >&5
+echo "configure:1816: 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:1820: \"$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:1823: \"$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
@@ -1834,7 +1837,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1838: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1841: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1867,7 +1870,7 @@
   # 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:1871: checking for $ac_word" >&5
+echo "configure:1874: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1894,7 +1897,7 @@
   # 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:1898: checking for $ac_word" >&5
+echo "configure:1901: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1942,7 +1945,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1946: checking for $ac_word" >&5
+echo "configure:1949: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1971,7 +1974,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1978: 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'
@@ -1984,12 +1987,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1988 "configure"
+#line 1991 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
@@ -2017,19 +2020,19 @@
   { 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:2021: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2024: 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:2026: checking whether we are using GNU C" >&5
+echo "configure:2029: 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:2033: \"$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:2036: \"$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
@@ -2047,7 +2050,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2051: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2054: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2080,7 +2083,7 @@
   # 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:2084: checking for $ac_word" >&5
+echo "configure:2087: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2107,7 +2110,7 @@
   # 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:2111: checking for $ac_word" >&5
+echo "configure:2114: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2155,7 +2158,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2159: checking for $ac_word" >&5
+echo "configure:2162: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2184,7 +2187,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2188: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2191: 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'
@@ -2197,12 +2200,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2201 "configure"
+#line 2204 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
@@ -2230,19 +2233,19 @@
   { 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:2234: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2237: 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:2239: checking whether we are using GNU C" >&5
+echo "configure:2242: 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:2246: \"$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:2249: \"$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
@@ -2260,7 +2263,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2264: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2267: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2297,7 +2300,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2301: checking how to run the C preprocessor" >&5
+echo "configure:2304: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2310,13 +2313,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2314 "configure"
+#line 2317 "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:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2327,13 +2330,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2331 "configure"
+#line 2334 "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:2337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2344,13 +2347,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2348 "configure"
+#line 2351 "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:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2376,9 +2379,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2380: checking for AIX" >&5
+echo "configure:2383: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2385 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2405,9 +2408,9 @@
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2409: checking for GNU libc" >&5
+echo "configure:2412: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2411 "configure"
+#line 2414 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2419,7 +2422,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2496,7 +2499,7 @@
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2500 "configure"
+#line 2503 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2512,7 +2515,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2748,17 +2751,17 @@
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2752: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2755: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2755 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2769,14 +2772,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
+#line 2776 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2802,6 +2805,7 @@
       CFLAGS="$CFLAGS -Wshadow"
     fi
             test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
+        test "$machine" == "m68k" && CFLAGS="$CFLAGS -malign-int"
               elif test "$__SUNPRO_C" = "yes"; then
     case "$opsys" in
       sol2    ) CFLAGS="-v -xO4" ;;
@@ -2819,7 +2823,7 @@
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2823: checking for buggy gcc versions" >&5
+echo "configure:2827: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2876,11 +2880,11 @@
 fi
 
 if test "$pdump" != "yes"; then
-  echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2881: checking for \"-z nocombreloc\" linker flag" >&5
+  echo $ac_n "checking for \"-Xlinker -znocombreloc\" linker flag""... $ac_c" 1>&6
+echo "configure:2885: checking for \"-Xlinker -znocombreloc\" linker flag" >&5
   case "`ld --help 2>&1`" in
     *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
-      ld_switch_site="-z nocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
+      ld_switch_site="-Xlinker -znocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Xlinker -znocombreloc\" to \$ld_switch_site"; fi ;;
     *) echo "$ac_t""no" 1>&6 ;;
   esac
 fi
@@ -2966,7 +2970,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2970: checking for dynodump" >&5
+echo "configure:2974: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3003,12 +3007,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3007: checking for terminateAndUnload in -lC" >&5
+echo "configure:3011: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 3012 "configure"
+#line 3016 "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
@@ -3019,7 +3023,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3127,7 +3131,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3131: checking "for runtime libraries flag"" >&5
+echo "configure:3135: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3149,14 +3153,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3153 "configure"
+#line 3157 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3257,10 +3261,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3261: checking for malloc_set_state" >&5
+echo "configure:3265: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3264 "configure"
+#line 3268 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3283,7 +3287,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3303,16 +3307,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3307: checking whether __after_morecore_hook exists" >&5
+echo "configure:3311: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3309 "configure"
+#line 3313 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3368,7 +3372,7 @@
 # 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:3372: checking for $ac_word" >&5
+echo "configure:3376: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3423,7 +3427,7 @@
 # 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:3427: checking for a BSD compatible install" >&5
+echo "configure:3431: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3477,7 +3481,7 @@
 # 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:3481: checking for $ac_word" >&5
+echo "configure:3485: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3509,15 +3513,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3513: checking for $ac_hdr" >&5
+echo "configure:3517: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3516 "configure"
+#line 3520 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3547,10 +3551,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3551: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3555: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3554 "configure"
+#line 3558 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3566,7 +3570,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3590,10 +3594,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3594: checking for ANSI C header files" >&5
+echo "configure:3598: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3597 "configure"
+#line 3601 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3601,7 +3605,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3618,7 +3622,7 @@
 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 3622 "configure"
+#line 3626 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3636,7 +3640,7 @@
 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 3640 "configure"
+#line 3644 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3654,7 +3658,7 @@
 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 3658 "configure"
+#line 3662 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3665,7 +3669,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3691,10 +3695,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3695: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3699: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3698 "configure"
+#line 3702 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3703,7 +3707,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3727,10 +3731,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3731: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3735: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3734 "configure"
+#line 3738 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3742,7 +3746,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3768,9 +3772,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3772: checking for utime" >&5
+echo "configure:3776: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3774 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3778,7 +3782,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3786: \"$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
@@ -3797,10 +3801,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3801: checking for $ac_func" >&5
+echo "configure:3805: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3804 "configure"
+#line 3808 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3823,7 +3827,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3855,10 +3859,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3859: checking return type of signal handlers" >&5
+echo "configure:3863: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3862 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3875,7 +3879,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3897,10 +3901,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3901: checking for size_t" >&5
+echo "configure:3905: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3904 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3931,10 +3935,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3935: checking for pid_t" >&5
+echo "configure:3939: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3938 "configure"
+#line 3942 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3965,10 +3969,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3969: checking for uid_t in sys/types.h" >&5
+echo "configure:3973: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3972 "configure"
+#line 3976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4004,10 +4008,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4008: checking for mode_t" >&5
+echo "configure:4012: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4011 "configure"
+#line 4015 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4038,10 +4042,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4042: checking for off_t" >&5
+echo "configure:4046: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4072,10 +4076,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4076: checking for ssize_t" >&5
+echo "configure:4080: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
+#line 4083 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4107,9 +4111,9 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4111: checking for socklen_t" >&5
+echo "configure:4115: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4113 "configure"
+#line 4117 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4119,7 +4123,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4128,7 +4132,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4132 "configure"
+#line 4136 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4138,7 +4142,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4170,9 +4174,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4174: checking for struct timeval" >&5
+echo "configure:4178: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4176 "configure"
+#line 4180 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4188,7 +4192,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4210,10 +4214,10 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4214: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4218: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4217 "configure"
+#line 4221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4221,7 +4225,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4245,10 +4249,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4249: checking for tm_zone in struct tm" >&5
+echo "configure:4253: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4252 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4256,7 +4260,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4279,10 +4283,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4283: checking for tzname" >&5
+echo "configure:4287: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4286 "configure"
+#line 4290 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4292,7 +4296,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4318,10 +4322,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4322: checking for working const" >&5
+echo "configure:4326: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4325 "configure"
+#line 4329 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4370,7 +4374,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4395,7 +4399,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4399: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4403: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4420,12 +4424,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4424: checking whether byte ordering is bigendian" >&5
+echo "configure:4428: 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 4429 "configure"
+#line 4433 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4436,11 +4440,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4444: \"$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 4444 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4451,7 +4455,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4468,7 +4472,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4476 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4481,7 +4485,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4508,12 +4512,13 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4512: checking size of short" >&5
+echo "configure:4516: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4515 "configure"
+#line 4519 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4522,7 +4527,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4550,12 +4555,13 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4554: checking size of int" >&5
+echo "configure:4559: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4557 "configure"
+#line 4562 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4564,7 +4570,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4586,12 +4592,13 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4590: checking size of long" >&5
+echo "configure:4596: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4593 "configure"
+#line 4599 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4600,7 +4607,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4622,12 +4629,13 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4626: checking size of long long" >&5
+echo "configure:4633: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4629 "configure"
+#line 4636 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4636,7 +4644,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4658,12 +4666,13 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4662: checking size of void *" >&5
+echo "configure:4670: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4665 "configure"
+#line 4673 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4672,7 +4681,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4696,7 +4705,7 @@
 
 case $opsys in
   cygwin* ) cat > conftest.$ac_ext <<EOF
-#line 4700 "configure"
+#line 4709 "configure"
 #include "confdefs.h"
 #include <cygwin/types.h>
 EOF
@@ -4721,7 +4730,7 @@
 esac
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4725: checking for long file names" >&5
+echo "configure:4734: 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:
@@ -4767,10 +4776,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4771: checking for sin" >&5
+echo "configure:4780: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4774 "configure"
+#line 4783 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4793,7 +4802,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4811,12 +4820,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4815: checking for sin in -lm" >&5
+echo "configure:4824: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4820 "configure"
+#line 4829 "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
@@ -4827,7 +4836,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4871,14 +4880,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4875 "configure"
+#line 4884 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0); 
 ; return 0; }
 EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4895,14 +4904,14 @@
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4899: checking type of mail spool file locking" >&5
+echo "configure:4908: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4903: checking for $ac_func" >&5
+echo "configure:4912: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4906 "configure"
+#line 4915 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4925,7 +4934,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5007,12 +5016,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5011: checking for cma_open in -lpthreads" >&5
+echo "configure:5020: 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 5016 "configure"
+#line 5025 "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
@@ -5023,7 +5032,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5060,7 +5069,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5064: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5073: 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;
@@ -5072,7 +5081,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 506; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5076: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5085: 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 ;;
@@ -5083,7 +5092,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5087: checking "for specified window system"" >&5
+echo "configure:5096: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5091,7 +5100,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5095: checking for GNOME configuration script" >&5
+echo "configure:5104: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5122,7 +5131,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5126: checking for GTK configuration script" >&5
+echo "configure:5135: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5144,18 +5153,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5148: checking gtk version" >&5
+echo "configure:5157: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6
 
       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5153: checking gtk libs" >&5
+echo "configure:5162: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6
 
       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5159: checking gtk cflags" >&5
+echo "configure:5168: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5165,19 +5174,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5169: checking for main in -lgdk_imlib" >&5
+echo "configure:5178: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5174 "configure"
+#line 5183 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5199,12 +5208,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5203: checking for Imlib_init in -lImlib" >&5
+echo "configure:5212: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5208 "configure"
+#line 5217 "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
@@ -5215,7 +5224,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5238,10 +5247,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5242: checking for $ac_func" >&5
+echo "configure:5251: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5245 "configure"
+#line 5254 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5264,7 +5273,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5343,15 +5352,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5347: checking for $ac_hdr" >&5
+echo "configure:5356: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5350 "configure"
+#line 5359 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5382,19 +5391,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5386: checking for main in -lxml" >&5
+echo "configure:5395: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5391 "configure"
+#line 5400 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5416,19 +5425,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5420: checking for main in -lglade" >&5
+echo "configure:5429: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5425 "configure"
+#line 5434 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5450,19 +5459,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5454: checking for main in -lglade-gnome" >&5
+echo "configure:5463: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5459 "configure"
+#line 5468 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5483,7 +5492,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5487 "configure"
+#line 5496 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5542,7 +5551,7 @@
 # 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:5546: checking for X" >&5
+echo "configure:5555: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5602,12 +5611,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5606 "configure"
+#line 5615 "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:5611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5676,14 +5685,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5680 "configure"
+#line 5689 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5792,17 +5801,17 @@
     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:5796: checking whether -R must be followed by a space" >&5
+echo "configure:5805: 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 5799 "configure"
+#line 5808 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5818,14 +5827,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5822 "configure"
+#line 5831 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5861,12 +5870,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5865: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5874: 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 5870 "configure"
+#line 5879 "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
@@ -5877,7 +5886,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5901,12 +5910,12 @@
     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:5905: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5914: 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 5910 "configure"
+#line 5919 "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
@@ -5917,7 +5926,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5946,10 +5955,10 @@
     # 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:5950: checking for gethostbyname" >&5
+echo "configure:5959: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5953 "configure"
+#line 5962 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5972,7 +5981,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -5993,12 +6002,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5997: checking for gethostbyname in -lnsl" >&5
+echo "configure:6006: 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 6002 "configure"
+#line 6011 "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
@@ -6009,7 +6018,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6039,10 +6048,10 @@
     # -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:6043: checking for connect" >&5
+echo "configure:6052: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6046 "configure"
+#line 6055 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6065,7 +6074,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6088,12 +6097,12 @@
 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:6092: checking "$xe_msg_checking"" >&5
+echo "configure:6101: 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 6097 "configure"
+#line 6106 "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
@@ -6104,7 +6113,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6128,10 +6137,10 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6132: checking for remove" >&5
+echo "configure:6141: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6135 "configure"
+#line 6144 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6154,7 +6163,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6175,12 +6184,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6179: checking for remove in -lposix" >&5
+echo "configure:6188: 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 6184 "configure"
+#line 6193 "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
@@ -6191,7 +6200,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6215,10 +6224,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6219: checking for shmat" >&5
+echo "configure:6228: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6222 "configure"
+#line 6231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6241,7 +6250,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6262,12 +6271,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6266: checking for shmat in -lipc" >&5
+echo "configure:6275: 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 6271 "configure"
+#line 6280 "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
@@ -6278,7 +6287,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6314,12 +6323,12 @@
 xe_msg_checking="for IceConnectionNumber in -lICE"
 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:6318: checking "$xe_msg_checking"" >&5
+echo "configure:6327: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6323 "configure"
+#line 6332 "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
@@ -6330,7 +6339,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6376,15 +6385,15 @@
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6380: checking for Xm/Xm.h" >&5
+echo "configure:6389: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6383 "configure"
+#line 6392 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6401,12 +6410,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6405: checking for XmStringFree in -lXm" >&5
+echo "configure:6414: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 6410 "configure"
+#line 6419 "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
@@ -6417,7 +6426,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6569,7 +6578,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6573: checking for X defines extracted by xmkmf" >&5
+echo "configure:6582: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6618,15 +6627,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6622: checking for X11/Intrinsic.h" >&5
+echo "configure:6631: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6625 "configure"
+#line 6634 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6650,12 +6659,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6654: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6663: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6659 "configure"
+#line 6668 "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
@@ -6666,7 +6675,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6691,12 +6700,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6695: checking "$xe_msg_checking"" >&5
+echo "configure:6704: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 6700 "configure"
+#line 6709 "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
@@ -6707,7 +6716,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6734,12 +6743,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6738: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6747: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 6743 "configure"
+#line 6752 "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
@@ -6750,7 +6759,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6773,12 +6782,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6777: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6786: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 6782 "configure"
+#line 6791 "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
@@ -6789,7 +6798,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6812,14 +6821,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6816: checking the version of X11 being used" >&5
+echo "configure:6825: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6818 "configure"
+#line 6827 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6850,10 +6859,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6854: checking for $ac_func" >&5
+echo "configure:6863: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6857 "configure"
+#line 6866 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6876,7 +6885,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6908,15 +6917,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6912: checking for $ac_hdr" >&5
+echo "configure:6921: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6915 "configure"
+#line 6924 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6949,10 +6958,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6953: checking for $ac_func" >&5
+echo "configure:6962: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6956 "configure"
+#line 6965 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6975,7 +6984,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7003,9 +7012,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7007: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7016: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7009 "configure"
+#line 7018 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7017,7 +7026,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7038,12 +7047,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7042: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7051: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 7047 "configure"
+#line 7056 "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
@@ -7054,7 +7063,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7093,19 +7102,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7097: checking for main in -lXbsd" >&5
+echo "configure:7106: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 7102 "configure"
+#line 7111 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7129,7 +7138,7 @@
     if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
         if test "$GCC" = "yes"; then
                   echo $ac_n "checking for name of AIX gcc threads option""... $ac_c" 1>&6
-echo "configure:7133: checking for name of AIX gcc threads option" >&5
+echo "configure:7142: checking for name of AIX gcc threads option" >&5
       case `$CC -v --help 2>&1` in
         *-mthreads*) aix_threads=-mthreads ;;
                   *) aix_threads=-pthread  ;;
@@ -7143,12 +7152,13 @@
          xe_save_CC="$CC"
          CC="${CC}_r"
          echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:7147: checking size of short" >&5
+echo "configure:7156: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7150 "configure"
+#line 7159 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -7157,7 +7167,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:7161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -7186,22 +7196,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7190: checking for MS-Windows" >&5
+echo "configure:7200: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7193: checking for main in -lgdi32" >&5
+echo "configure:7203: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 7198 "configure"
+#line 7208 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7274,12 +7284,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7278 "configure"
+#line 7288 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7343,15 +7353,15 @@
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7347: checking for X11/extensions/shape.h" >&5
+echo "configure:7357: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7350 "configure"
+#line 7360 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7403,7 +7413,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7407: checking for WM_COMMAND option" >&5;
+echo "configure:7417: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7418,15 +7428,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7422: checking for X11/Xauth.h" >&5
+echo "configure:7432: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7425 "configure"
+#line 7435 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7449,12 +7459,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7453: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7463: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 7458 "configure"
+#line 7468 "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
@@ -7465,7 +7475,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7510,15 +7520,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:7514: checking for ${dir}tt_c.h" >&5
+echo "configure:7524: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7517 "configure"
+#line 7527 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7554,12 +7564,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7558: checking "$xe_msg_checking"" >&5
+echo "configure:7568: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7563 "configure"
+#line 7573 "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
@@ -7570,7 +7580,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7627,15 +7637,15 @@
 
 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:7631: checking for Dt/Dt.h" >&5
+echo "configure:7641: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7634 "configure"
+#line 7644 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7658,12 +7668,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7662: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7672: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 7667 "configure"
+#line 7677 "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
@@ -7674,7 +7684,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7747,7 +7757,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7751: checking if drag and drop API is needed" >&5
+echo "configure:7761: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -7767,18 +7777,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7771: checking for LDAP" >&5
+echo "configure:7781: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7774: checking for ldap.h" >&5
+echo "configure:7784: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7777 "configure"
+#line 7787 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7801,15 +7811,15 @@
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:7805: checking for lber.h" >&5
+echo "configure:7815: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7808 "configure"
+#line 7818 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7833,12 +7843,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7837: checking for ldap_search in -lldap" >&5
+echo "configure:7847: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7842 "configure"
+#line 7852 "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
@@ -7849,7 +7859,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7873,12 +7883,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7877: checking "$xe_msg_checking"" >&5
+echo "configure:7887: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 7882 "configure"
+#line 7892 "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
@@ -7889,7 +7899,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7913,12 +7923,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7917: checking "$xe_msg_checking"" >&5
+echo "configure:7927: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7922 "configure"
+#line 7932 "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
@@ -7929,7 +7939,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7953,12 +7963,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7957: checking "$xe_msg_checking"" >&5
+echo "configure:7967: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7962 "configure"
+#line 7972 "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
@@ -7969,7 +7979,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7991,12 +8001,12 @@
  }
               test "$with_ldap_lber" != "yes" && { 
 echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6
-echo "configure:7995: checking for ber_pvt_opt_on in -llber" >&5
+echo "configure:8005: checking for ber_pvt_opt_on in -llber" >&5
 ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -llber "
 cat > conftest.$ac_ext <<EOF
-#line 8000 "configure"
+#line 8010 "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
@@ -8007,7 +8017,7 @@
 ber_pvt_opt_on()
 ; return 0; }
 EOF
-if { (eval echo configure:8011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8053,10 +8063,10 @@
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8057: checking for $ac_func" >&5
+echo "configure:8067: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8060 "configure"
+#line 8070 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8079,7 +8089,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8110,20 +8120,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8114: checking for PostgreSQL" >&5
+echo "configure:8124: checking for PostgreSQL" >&5
 
   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:8119: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:8129: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8122 "configure"
+#line 8132 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8147,12 +8157,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8151: checking for PQconnectdb in -lpq" >&5
+echo "configure:8161: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8156 "configure"
+#line 8166 "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
@@ -8163,7 +8173,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8196,12 +8206,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8200: checking for PQconnectStart in -lpq" >&5
+echo "configure:8210: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8205 "configure"
+#line 8215 "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
@@ -8212,7 +8222,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8260,7 +8270,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8264: checking for graphics libraries" >&5
+echo "configure:8274: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8286,10 +8296,10 @@
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8290: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8300: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8293 "configure"
+#line 8303 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8298,7 +8308,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -8342,17 +8352,17 @@
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8346: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8356: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8349 "configure"
+#line 8359 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8378,15 +8388,15 @@
 
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8382: checking for compface.h" >&5
+echo "configure:8392: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8385 "configure"
+#line 8395 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8409,12 +8419,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8413: checking for UnGenFace in -lcompface" >&5
+echo "configure:8423: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8418 "configure"
+#line 8428 "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
@@ -8425,7 +8435,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8477,12 +8487,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8481: checking for inflate in -lc" >&5
+echo "configure:8491: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8486 "configure"
+#line 8496 "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
@@ -8493,7 +8503,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8512,12 +8522,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8516: checking for inflate in -lz" >&5
+echo "configure:8526: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8521 "configure"
+#line 8531 "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
@@ -8528,7 +8538,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8547,12 +8557,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8551: checking for inflate in -lgz" >&5
+echo "configure:8561: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8556 "configure"
+#line 8566 "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
@@ -8563,7 +8573,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8593,15 +8603,15 @@
 
     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8597: checking for jpeglib.h" >&5
+echo "configure:8607: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8600 "configure"
+#line 8610 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8624,12 +8634,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8628: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8638: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 8633 "configure"
+#line 8643 "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
@@ -8640,7 +8650,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8676,10 +8686,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8680: checking for pow" >&5
+echo "configure:8690: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8683 "configure"
+#line 8693 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8702,7 +8712,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -8723,15 +8733,15 @@
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:8727: checking for png.h" >&5
+echo "configure:8737: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8730 "configure"
+#line 8740 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8754,12 +8764,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8758: checking for png_read_image in -lpng" >&5
+echo "configure:8768: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8763 "configure"
+#line 8773 "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
@@ -8770,7 +8780,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8793,10 +8803,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8797: checking for workable png version information" >&5
+echo "configure:8807: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8800 "configure"
+#line 8810 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8804,7 +8814,7 @@
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -8847,15 +8857,15 @@
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8851: checking for tiffio.h" >&5
+echo "configure:8861: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8854 "configure"
+#line 8864 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8878,12 +8888,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8882: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8892: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 8887 "configure"
+#line 8897 "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
@@ -8894,7 +8904,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8933,15 +8943,15 @@
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8937: checking for compface.h" >&5
+echo "configure:8947: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8940 "configure"
+#line 8950 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8964,12 +8974,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8968: checking for UnGenFace in -lcompface" >&5
+echo "configure:8978: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8973 "configure"
+#line 8983 "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
@@ -8980,7 +8990,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9019,12 +9029,12 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9023: checking for X11 graphics libraries" >&5
+echo "configure:9033: checking for X11 graphics libraries" >&5
 fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9028: checking for the Athena widgets" >&5
+echo "configure:9038: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9040,12 +9050,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9044: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9054: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9049 "configure"
+#line 9059 "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
@@ -9056,7 +9066,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9072,12 +9082,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9076: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9086: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9081 "configure"
+#line 9091 "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
@@ -9088,7 +9098,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9119,12 +9129,12 @@
   else
         
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9123: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9133: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9128 "configure"
+#line 9138 "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
@@ -9135,7 +9145,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9153,12 +9163,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6
-echo "configure:9157: checking for $athena_3d_function in -lXaw" >&5
+echo "configure:9167: checking for $athena_3d_function in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 9162 "configure"
+#line 9172 "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
@@ -9169,7 +9179,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9200,15 +9210,15 @@
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9204: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9214: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9207 "configure"
+#line 9217 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9228,15 +9238,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:9232: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9242: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9235 "configure"
+#line 9245 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9262,15 +9272,15 @@
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9266: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9276: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9269 "configure"
+#line 9279 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9287,15 +9297,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9291: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9301: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9294 "configure"
+#line 9304 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9323,15 +9333,15 @@
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9327: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9337: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9330 "configure"
+#line 9340 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9348,15 +9358,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9352: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9362: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9355 "configure"
+#line 9365 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9385,15 +9395,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9389: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9399: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9392 "configure"
+#line 9402 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9410,15 +9420,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9414: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9424: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9417 "configure"
+#line 9427 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9450,15 +9460,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9454: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9464: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9457 "configure"
+#line 9467 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9475,15 +9485,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9479: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9489: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9482 "configure"
+#line 9492 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9515,15 +9525,15 @@
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9519: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9529: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9522 "configure"
+#line 9532 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9562,15 +9572,15 @@
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9566: checking for Xm/Xm.h" >&5
+echo "configure:9576: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9569 "configure"
+#line 9579 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9587,12 +9597,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9591: checking for XmStringFree in -lXm" >&5
+echo "configure:9601: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 9596 "configure"
+#line 9606 "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
@@ -9603,7 +9613,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9632,9 +9642,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9636: checking for Lesstif" >&5
+echo "configure:9646: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9638 "configure"
+#line 9648 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10080,7 +10090,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10084: checking for Mule-related features" >&5
+echo "configure:10094: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10105,15 +10115,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10109: checking for $ac_hdr" >&5
+echo "configure:10119: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10112 "configure"
+#line 10122 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10144,12 +10154,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10148: checking for strerror in -lintl" >&5
+echo "configure:10158: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 10153 "configure"
+#line 10163 "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
@@ -10160,7 +10170,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10193,18 +10203,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10197: checking for Mule input methods" >&5
+echo "configure:10207: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10200: checking for XIM" >&5
+echo "configure:10210: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10203: checking for XOpenIM in -lX11" >&5
+echo "configure:10213: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10208 "configure"
+#line 10218 "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
@@ -10215,7 +10225,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10239,12 +10249,12 @@
             if test "$need_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10243: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10253: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10248 "configure"
+#line 10258 "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
@@ -10255,7 +10265,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10278,12 +10288,12 @@
     elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10282: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10292: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10287 "configure"
+#line 10297 "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
@@ -10294,7 +10304,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10359,15 +10369,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10363: checking for XFontSet" >&5
+echo "configure:10373: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10366: checking for XmbDrawString in -lX11" >&5
+echo "configure:10376: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10371 "configure"
+#line 10381 "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
@@ -10378,7 +10388,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10418,15 +10428,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:10422: checking for wnn/jllib.h" >&5
+echo "configure:10432: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10425 "configure"
+#line 10435 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10449,15 +10459,15 @@
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10453: checking for wnn/commonhd.h" >&5
+echo "configure:10463: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10456 "configure"
+#line 10466 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10482,10 +10492,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10486: checking for $ac_func" >&5
+echo "configure:10496: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10489 "configure"
+#line 10499 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10508,7 +10518,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10537,12 +10547,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10541: checking for crypt in -lcrypt" >&5
+echo "configure:10551: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 10546 "configure"
+#line 10556 "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
@@ -10553,7 +10563,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10588,12 +10598,12 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10592: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10602: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10597 "configure"
+#line 10607 "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
@@ -10604,7 +10614,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10622,12 +10632,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10626: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10636: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 10631 "configure"
+#line 10641 "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
@@ -10638,7 +10648,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10656,12 +10666,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10660: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10670: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 10665 "configure"
+#line 10675 "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
@@ -10672,7 +10682,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10690,12 +10700,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10694: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10704: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 10699 "configure"
+#line 10709 "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
@@ -10706,7 +10716,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10754,12 +10764,12 @@
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10758: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10768: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10763 "configure"
+#line 10773 "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
@@ -10770,7 +10780,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10805,15 +10815,15 @@
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10809: checking for canna/jrkanji.h" >&5
+echo "configure:10819: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10812 "configure"
+#line 10822 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10840,15 +10850,15 @@
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10844: checking for canna/jrkanji.h" >&5
+echo "configure:10854: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10847 "configure"
+#line 10857 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10876,15 +10886,15 @@
 
   test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:10880: checking for canna/RK.h" >&5
+echo "configure:10890: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10883 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10907,12 +10917,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10911: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10921: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 10916 "configure"
+#line 10926 "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
@@ -10923,7 +10933,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10946,12 +10956,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10950: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10960: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 10955 "configure"
+#line 10965 "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
@@ -10962,7 +10972,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11011,12 +11021,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:11015: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11025: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 11020 "configure"
+#line 11030 "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
@@ -11027,7 +11037,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11114,10 +11124,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11118: checking for $ac_func" >&5
+echo "configure:11128: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11121 "configure"
+#line 11131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11140,7 +11150,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11181,10 +11191,10 @@
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11185: checking for $ac_func" >&5
+echo "configure:11195: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11188 "configure"
+#line 11198 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11207,7 +11217,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11236,10 +11246,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11240: checking for openpty" >&5
+echo "configure:11250: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11243 "configure"
+#line 11253 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11262,7 +11272,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -11281,12 +11291,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11285: checking for openpty in -lutil" >&5
+echo "configure:11295: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 11290 "configure"
+#line 11300 "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
@@ -11297,7 +11307,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11332,15 +11342,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11336: checking for $ac_hdr" >&5
+echo "configure:11346: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11339 "configure"
+#line 11349 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11376,15 +11386,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11380: checking for $ac_hdr" >&5
+echo "configure:11390: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11383 "configure"
+#line 11393 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11417,10 +11427,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11421: checking for $ac_func" >&5
+echo "configure:11431: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11424 "configure"
+#line 11434 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11443,7 +11453,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11474,15 +11484,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11478: checking for $ac_hdr" >&5
+echo "configure:11488: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11481 "configure"
+#line 11491 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11519,10 +11529,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11523: checking for $ac_func" >&5
+echo "configure:11533: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11526 "configure"
+#line 11536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11545,7 +11555,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11578,15 +11588,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11582: checking for $ac_hdr" >&5
+echo "configure:11592: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11585 "configure"
+#line 11595 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11622,12 +11632,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11626: checking for kstat_open in -lkstat" >&5
+echo "configure:11636: 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 11631 "configure"
+#line 11641 "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
@@ -11638,7 +11648,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11673,15 +11683,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11677: checking for $ac_hdr" >&5
+echo "configure:11687: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11680 "configure"
+#line 11690 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11713,12 +11723,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11717: checking for kvm_read in -lkvm" >&5
+echo "configure:11727: 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 11722 "configure"
+#line 11732 "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
@@ -11729,7 +11739,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11763,16 +11773,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11767: checking whether netdb declares h_errno" >&5
+echo "configure:11777: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11769 "configure"
+#line 11779 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -11792,16 +11802,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11796: checking for sigsetjmp" >&5
+echo "configure:11806: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11798 "configure"
+#line 11808 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11815: \"$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
@@ -11821,11 +11831,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11825: checking whether localtime caches TZ" >&5
+echo "configure:11835: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11829 "configure"
+#line 11839 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11860,7 +11870,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11890,9 +11900,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11894: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11904: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11896 "configure"
+#line 11906 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11913,7 +11923,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -11935,19 +11945,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11939: checking for inline" >&5
+echo "configure:11949: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11944 "configure"
+#line 11954 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11988,17 +11998,17 @@
   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:11992: checking for working alloca.h" >&5
+echo "configure:12002: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11995 "configure"
+#line 12005 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -12022,10 +12032,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12026: checking for alloca" >&5
+echo "configure:12036: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12029 "configure"
+#line 12039 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12053,7 +12063,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -12092,10 +12102,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12096: checking whether alloca needs Cray hooks" >&5
+echo "configure:12106: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12099 "configure"
+#line 12109 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12119,10 +12129,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12123: checking for $ac_func" >&5
+echo "configure:12133: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12126 "configure"
+#line 12136 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12145,7 +12155,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12175,10 +12185,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12179: checking stack direction for C alloca" >&5
+echo "configure:12189: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12182 "configure"
+#line 12192 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12197,7 +12207,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12227,15 +12237,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:12231: checking for vfork.h" >&5
+echo "configure:12241: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12234 "configure"
+#line 12244 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12263,10 +12273,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12267: checking for working vfork" >&5
+echo "configure:12277: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12270 "configure"
+#line 12280 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12361,7 +12371,7 @@
   }
 }
 EOF
-if { (eval echo configure:12365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12387,10 +12397,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12391: checking for working strcoll" >&5
+echo "configure:12401: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12394 "configure"
+#line 12404 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12400,7 +12410,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12428,10 +12438,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12432: checking for $ac_func" >&5
+echo "configure:12442: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12435 "configure"
+#line 12445 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12454,7 +12464,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12482,10 +12492,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12486: checking whether getpgrp takes no argument" >&5
+echo "configure:12496: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12489 "configure"
+#line 12499 "configure"
 #include "confdefs.h"
 
 /*
@@ -12540,7 +12550,7 @@
 }
 
 EOF
-if { (eval echo configure:12544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12567,10 +12577,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12571: checking for working mmap" >&5
+echo "configure:12581: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12574 "configure"
+#line 12584 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12603,7 +12613,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12632,9 +12642,9 @@
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12636: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12646: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12638 "configure"
+#line 12648 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12646,7 +12656,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12671,15 +12681,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12675: checking for termios.h" >&5
+echo "configure:12685: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12678 "configure"
+#line 12688 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12722,15 +12732,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:12726: checking for termio.h" >&5
+echo "configure:12736: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12729 "configure"
+#line 12739 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12762,10 +12772,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12766: checking for socket" >&5
+echo "configure:12776: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12769 "configure"
+#line 12779 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12788,7 +12798,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -12803,15 +12813,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:12807: checking for netinet/in.h" >&5
+echo "configure:12817: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12810 "configure"
+#line 12820 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12828,15 +12838,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:12832: checking for arpa/inet.h" >&5
+echo "configure:12842: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12835 "configure"
+#line 12845 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12861,9 +12871,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12865: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12875: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12867 "configure"
+#line 12877 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12874,7 +12884,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -12892,9 +12902,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12896: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12906: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12898 "configure"
+#line 12908 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12904,7 +12914,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -12935,10 +12945,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12939: checking for msgget" >&5
+echo "configure:12949: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12942 "configure"
+#line 12952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12961,7 +12971,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -12976,15 +12986,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:12980: checking for sys/ipc.h" >&5
+echo "configure:12990: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12983 "configure"
+#line 12993 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13001,15 +13011,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:13005: checking for sys/msg.h" >&5
+echo "configure:13015: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13008 "configure"
+#line 13018 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13047,15 +13057,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13051: checking for dirent.h" >&5
+echo "configure:13061: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13054 "configure"
+#line 13064 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13082,15 +13092,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:13086: checking for sys/dir.h" >&5
+echo "configure:13096: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13089 "configure"
+#line 13099 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13123,15 +13133,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13127: checking for nlist.h" >&5
+echo "configure:13137: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13130 "configure"
+#line 13140 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13161,22 +13171,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13165: checking "for sound support"" >&5
+echo "configure:13175: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 
 if test "$with_native_sound" != "no"; then
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:13172: checking for multimedia/audio_device.h" >&5
+echo "configure:13182: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13175 "configure"
+#line 13185 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13232,12 +13242,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13236: checking for ALopenport in -laudio" >&5
+echo "configure:13246: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13241 "configure"
+#line 13251 "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
@@ -13248,7 +13258,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13279,12 +13289,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13283: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13293: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 13288 "configure"
+#line 13298 "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
@@ -13295,7 +13305,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13340,15 +13350,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:13344: checking for ${dir}/soundcard.h" >&5
+echo "configure:13354: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13347 "configure"
+#line 13357 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13402,15 +13412,15 @@
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13406: checking for audio/audiolib.h" >&5
+echo "configure:13416: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13409 "configure"
+#line 13419 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13428,12 +13438,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13432: checking for AuOpenServer in -laudio" >&5
+echo "configure:13442: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13437 "configure"
+#line 13447 "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
@@ -13444,7 +13454,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13483,7 +13493,7 @@
  fi
     libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
             cat > conftest.$ac_ext <<EOF
-#line 13487 "configure"
+#line 13497 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13514,7 +13524,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13518: checking for $ac_word" >&5
+echo "configure:13528: checking for $ac_word" >&5
 
 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -13543,10 +13553,10 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13547: checking for esd_play_stream" >&5
+echo "configure:13557: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13550 "configure"
+#line 13560 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13569,7 +13579,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -13620,7 +13630,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13624: checking for TTY-related features" >&5
+echo "configure:13634: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13636,12 +13646,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13640: checking for tgetent in -lncurses" >&5
+echo "configure:13650: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 13645 "configure"
+#line 13655 "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
@@ -13652,7 +13662,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13685,15 +13695,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13689: checking for ncurses/curses.h" >&5
+echo "configure:13699: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13692 "configure"
+#line 13702 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13715,15 +13725,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13719: checking for ncurses/term.h" >&5
+echo "configure:13729: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13722 "configure"
+#line 13732 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13753,15 +13763,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13757: checking for ncurses/curses.h" >&5
+echo "configure:13767: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13760 "configure"
+#line 13770 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13796,12 +13806,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13800: checking for tgetent in -l$lib" >&5
+echo "configure:13810: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 13805 "configure"
+#line 13815 "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
@@ -13812,7 +13822,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13837,12 +13847,12 @@
     else       if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then
                                 
 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:13841: checking for tgoto in -ltermcap" >&5
+echo "configure:13851: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 13846 "configure"
+#line 13856 "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
@@ -13853,7 +13863,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:13857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13898,12 +13908,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13902: checking for tgetent in -lcurses" >&5
+echo "configure:13912: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 13907 "configure"
+#line 13917 "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
@@ -13914,7 +13924,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13932,12 +13942,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13936: checking for tgetent in -ltermcap" >&5
+echo "configure:13946: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 13941 "configure"
+#line 13951 "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
@@ -13948,7 +13958,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13997,15 +14007,15 @@
     if test "$with_gpm" != "no"; then
     ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:14001: checking for gpm.h" >&5
+echo "configure:14011: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14004 "configure"
+#line 14014 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14023,12 +14033,12 @@
   
       
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14027: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14037: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 14032 "configure"
+#line 14042 "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
@@ -14039,7 +14049,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14098,20 +14108,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14102: checking for database support" >&5
+echo "configure:14112: checking for database support" >&5
 
 if test "$with_database_gdbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:14107: checking for ndbm.h" >&5
+echo "configure:14117: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14110 "configure"
+#line 14120 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14141,12 +14151,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14145: checking for dbm_open in -lgdbm" >&5
+echo "configure:14155: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 14150 "configure"
+#line 14160 "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
@@ -14157,7 +14167,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14185,10 +14195,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14189: checking for dbm_open" >&5
+echo "configure:14199: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14192 "configure"
+#line 14202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14211,7 +14221,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -14230,12 +14240,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14234: checking for dbm_open in -ldbm" >&5
+echo "configure:14244: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 14239 "configure"
+#line 14249 "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
@@ -14246,7 +14256,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14287,12 +14297,12 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14291: checking for Berkeley db.h" >&5
+echo "configure:14301: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     case "$opsys" in
         *freebsd*)
     cat > conftest.$ac_ext <<EOF
-#line 14296 "configure"
+#line 14306 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14308,7 +14318,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14319,7 +14329,7 @@
         ;;
         *)
     cat > conftest.$ac_ext <<EOF
-#line 14323 "configure"
+#line 14333 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14341,7 +14351,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14359,9 +14369,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14363: checking for Berkeley DB version" >&5
+echo "configure:14373: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14365 "configure"
+#line 14375 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14373,7 +14383,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14377 "configure"
+#line 14387 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14400,10 +14410,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14404: checking for $dbfunc" >&5
+echo "configure:14414: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14407 "configure"
+#line 14417 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14426,7 +14436,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -14445,12 +14455,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14449: checking for $dbfunc in -ldb" >&5
+echo "configure:14459: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 14454 "configure"
+#line 14464 "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
@@ -14461,7 +14471,42 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
+  with_database_berkdb=yes need_libdb=yes
+else
+  echo "$ac_t""no" 1>&6
+
+echo $ac_n "checking for ${dbfunc}_4001 in -ldb""... $ac_c" 1>&6
+echo "configure:14494: checking for ${dbfunc}_4001 in -ldb" >&5
+ac_lib_var=`echo db'_'${dbfunc}_4001 | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldb "
+cat > conftest.$ac_ext <<EOF
+#line 14499 "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 ${dbfunc}_4001();
+
+int main() {
+${dbfunc}_4001()
+; return 0; }
+EOF
+if { (eval echo configure:14510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14480,6 +14525,9 @@
   echo "$ac_t""no" 1>&6
 fi
 
+ 
+fi
+
 
 fi
 
@@ -14525,12 +14573,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14529: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14577: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 14534 "configure"
+#line 14582 "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
@@ -14541,7 +14589,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14596,7 +14644,7 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14600: checking for module support" >&5
+echo "configure:14648: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
@@ -14612,15 +14660,15 @@
  ;;
       *)          ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14616: checking for dlfcn.h" >&5
+echo "configure:14664: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14619 "configure"
+#line 14667 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14637,16 +14685,16 @@
   echo "$ac_t""yes" 1>&6
   
            echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14641: checking for dlopen in -lc" >&5
+echo "configure:14689: checking for dlopen in -lc" >&5
            cat > conftest.$ac_ext <<EOF
-#line 14643 "configure"
+#line 14691 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	      dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14655,18 +14703,18 @@
   rm -rf conftest*
   
                echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14659: checking for dlopen in -ldl" >&5
+echo "configure:14707: checking for dlopen in -ldl" >&5
                ac_save_LIBS="$LIBS"
                LIBS="-ldl $LIBS"
                cat > conftest.$ac_ext <<EOF
-#line 14663 "configure"
+#line 14711 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	         dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14695,12 +14743,12 @@
         else
            
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14699: checking for shl_load in -ldld" >&5
+echo "configure:14747: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14704 "configure"
+#line 14752 "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
@@ -14711,7 +14759,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14738,12 +14786,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14742: checking for dld_init in -ldld" >&5
+echo "configure:14790: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14747 "configure"
+#line 14795 "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
@@ -14754,7 +14802,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14801,7 +14849,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14805: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14853: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14829,9 +14877,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14833: checking checking whether we are using GNU C" >&5
+echo "configure:14881: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14835 "configure"
+#line 14883 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14853,7 +14901,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14857: checking how to produce PIC code" >&5
+echo "configure:14905: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14954,18 +15002,18 @@
 
   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14958: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:15006: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14962 "configure"
+#line 15010 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -14996,7 +15044,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:15000: checking if C compiler can produce shared libraries" >&5
+echo "configure:15048: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes -o "$__ICC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -15047,14 +15095,14 @@
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 15051 "configure"
+#line 15099 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -15079,7 +15127,7 @@
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:15083: checking for ld used by GCC" >&5
+echo "configure:15131: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -15105,7 +15153,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15109: checking for GNU ld" >&5
+echo "configure:15157: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -15143,7 +15191,7 @@
 
 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:15147: checking if the linker is GNU ld" >&5
+echo "configure:15195: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -15171,7 +15219,7 @@
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:15175: checking whether the linker supports shared libraries" >&5
+echo "configure:15223: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -15289,7 +15337,7 @@
 
 
 if test "$xe_gnu_ld" = yes; then
-  if test "$ld_shlibs" = yes; then
+  if test "$ld_shlibs" = yes && test "$xehost_cpu" != "ia64" ; then
     ld_dynamic_link_flags="${wl}-export-dynamic"
   fi
 fi
@@ -15382,10 +15430,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15386: checking for $ac_func" >&5
+echo "configure:15434: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15389 "configure"
+#line 15437 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15408,7 +15456,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -15447,11 +15495,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15451 "configure"
+#line 15499 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -15762,6 +15810,14 @@
   esac
 done
 
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining DOCDIR = "$docdir"
+EOF
+cat >> confdefs.h <<EOF
+#define DOCDIR "$docdir"
+EOF
+}
+
 
 
 
@@ -16154,7 +16210,7 @@
 echo "  Relocating allocator for buffers:  $rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
 case "$ld_switch_site" in
-  *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
+  *nocombreloc*) echo "  Linking with \`-Xlinker -znocombreloc'.
     - Consider configuring with --pdump." ;;
 esac
 
--- xemacs21-21.4.17.orig/config.sub
+++ xemacs21-21.4.17/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2001-01-12'
+timestamp='2004-06-24'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -69,7 +70,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -117,7 +118,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -143,7 +145,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -157,6 +159,14 @@
 		os=-vxworks
 		basic_machine=$1
 		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -215,24 +225,50 @@
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
-		| pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| hppa64 \
-		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
-		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | sh[34] \
-		| powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp10 | pdp11 \
-		| mips16 | mips64 | mipsel | mips64el \
-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | d30v | fr30 | avr | openrisc)
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -240,13 +276,13 @@
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[234567]86 | x86_64)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -255,29 +291,62 @@
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
-	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
-	      | hppa2.0n-* | hppa64-* \
-	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
-	      | alphaev6[78]-* \
-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
-	      | clipper-* | orion-* \
-	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* \
-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f30[01]-* | f700-* | s390-* | sv1-* | t3e-* \
-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| msp430-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -295,6 +364,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -309,6 +381,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -340,6 +418,10 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -360,17 +442,17 @@
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
@@ -378,12 +460,24 @@
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -504,19 +598,19 @@
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -564,28 +658,20 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -665,6 +751,14 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -687,42 +781,58 @@
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
@@ -740,10 +850,26 @@
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -751,7 +877,10 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -818,22 +947,42 @@
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -855,8 +1004,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -877,13 +1026,13 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -904,16 +1053,12 @@
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -930,13 +1075,16 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -951,9 +1099,8 @@
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -1007,28 +1154,35 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1037,6 +1191,9 @@
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1049,6 +1206,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1067,14 +1227,23 @@
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1086,6 +1255,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1113,8 +1285,14 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
 		;;
 	-none)
 		;;
@@ -1147,10 +1325,14 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1177,6 +1359,9 @@
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1189,6 +1374,9 @@
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1240,19 +1428,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1321,10 +1509,16 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1338,6 +1532,9 @@
 				;;
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
 				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
--- xemacs21-21.4.17.orig/lisp/custom-load.el
+++ xemacs21-21.4.17/lisp/custom-load.el
@@ -17,12 +17,13 @@
 (custom-add-loads 'menu '("menubar-items"))
 (custom-add-loads 'minibuffer '("simple" "minibuf"))
 (custom-add-loads 'log-message '("simple"))
-(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "gutter" "cus-edit" "gnuserv" "menubar" "sound" "toolbar-items" "x-init"))
+(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "gutter" "toolbar-items" "x-init" "cus-edit" "gnuserv" "sound"))
 (custom-add-loads 'sound '("sound"))
 (custom-add-loads 'pui '("package-ui"))
 (custom-add-loads 'terminals '("gnuserv"))
 (custom-add-loads 'auto-save '("files" "auto-save"))
 (custom-add-loads 'mail '("simple" "startup"))
+(custom-add-loads 'lpr '("printer"))
 (custom-add-loads 'custom-menu '("cus-edit"))
 (custom-add-loads 'docs '("hyper-apropos" "info"))
 (custom-add-loads 'tools '("etags" "hyper-apropos"))
@@ -44,7 +45,7 @@
 (custom-add-loads 'widget-documentation '("wid-edit"))
 (custom-add-loads 'comm '("ldap"))
 (custom-add-loads 'backup '("files"))
-(custom-add-loads 'frames '("frame" "window-xemacs" "gnuserv" "gui"))
+(custom-add-loads 'frames '("frame" "window-xemacs" "gui" "gnuserv"))
 (custom-add-loads 'customize '("wid-edit" "cus-edit"))
 (custom-add-loads 'custom-browse '("cus-edit"))
 (custom-add-loads 'abbrev '("abbrev" "files"))
@@ -72,8 +73,8 @@
 (custom-add-loads 'languages '("lisp-mode" "cus-edit" "font-lock"))
 (custom-add-loads 'fill '("simple" "fill"))
 (custom-add-loads 'custom-magic-faces '("cus-edit"))
-(custom-add-loads 'display '("modeline" "auto-show" "scrollbar" "toolbar"))
-(custom-add-loads 'faces '("faces" "font" "cus-edit" "font-lock" "hyper-apropos" "info" "wid-edit"))
+(custom-add-loads 'display '("modeline" "toolbar" "scrollbar" "auto-show"))
+(custom-add-loads 'faces '("faces" "cus-edit" "font-lock" "font" "hyper-apropos" "info" "wid-edit"))
 (custom-add-loads 'emacs '("faces" "help" "files" "cus-edit" "package-get"))
 (custom-add-loads 'processes '("process" "gnuserv"))
 (custom-add-loads 'hyper-apropos '("hyper-apropos"))
@@ -82,11 +83,11 @@
 (custom-add-loads 'isearch '("isearch-mode"))
 (custom-add-loads 'font-lock-faces '("font-lock"))
 (custom-add-loads 'modeline '("modeline"))
-(custom-add-loads 'editing '("simple" "abbrev" "fill" "cus-edit" "dragdrop" "mouse"))
+(custom-add-loads 'editing '("simple" "abbrev" "fill" "mouse" "cus-edit" "dragdrop"))
 (custom-add-loads 'matching '("simple" "isearch-mode" "hyper-apropos"))
 (custom-add-loads 'i18n '("cus-edit"))
-(custom-add-loads 'info '("info" "toolbar-items"))
-(custom-add-loads 'x '("gtk-faces" "x-faces"))
+(custom-add-loads 'info '("toolbar-items" "info"))
+(custom-add-loads 'x '("x-faces" "gtk-faces"))
 (custom-add-loads 'buffers-tab '("gutter-items"))
 
 ;;; custom-load.el ends here
--- xemacs21-21.4.17.orig/lisp/gnuserv.el
+++ xemacs21-21.4.17/lisp/gnuserv.el
@@ -408,13 +408,6 @@
   (eval form))
 
 
-
-(defun make-x-device-with-gtk-fallback (device)
-  (or (condition-case ()
-          (make-x-device device)
-        (error nil))
-      (make-gtk-device)))
-
 ;; "Execute" a client connection, called by gnuclient.  This is the
 ;; backbone of gnuserv.el.
 (defun gnuserv-edit-files (type list &rest flags)
@@ -447,7 +440,7 @@
 			  (case (car type)
 			    (tty (apply 'make-tty-device (cdr type)))
 			    (gtk (make-gtk-device))
-			    (x   (make-x-device-with-gtk-fallback (cadr type)))
+			    (x   (make-x-device (cadr type)))
 			    (mswindows   (make-mswindows-device))
 			    (t   (error "Invalid device type"))))
 			 (t
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@.postinst.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@.postinst.in
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+set -e
+
+#DEBHELPER#
--- xemacs21-21.4.17.orig/debian/control
+++ xemacs21-21.4.17/debian/control
@@ -0,0 +1,226 @@
+Source: xemacs21
+Section: editors
+Priority: optional
+Maintainer: OHURA Makoto <ohura@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: texinfo, libcanna1g-dev, libwnn6-dev, libjpeg62-dev, libncurses5-dev, libpng2-dev, libtiff4-dev, zlib1g-dev, texi2html, debhelper (>> 4), libldap2-dev, libdb3-dev, libpam0g-dev, libcompfaceg1-dev, xlibs-dev, libxaw7-dev, autoconf2.13, libgtk1.2-dev, libgnome-dev, libart-dev, libesd0-dev, dpatch (>= 1.11)
+
+Package: xemacs21
+Architecture: all
+Depends: xemacs21-mule (= ${Source-Version}) | xemacs21-mule-canna-wnn (= ${Source-Version}) | xemacs21-nomule (= ${Source-Version}) | xemacs21-gnome-mule (= ${Source-Version}) | xemacs21-gnome-mule-canna-wnn (= ${Source-Version}) | xemacs21-gnome-nomule (= ${Source-Version})
+Replaces: xemacs, xemacs-widget
+Conflicts: xemacs, xemacs-widget
+Description: highly customizable text editor
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package exists to cause the installation of the real XEmacs packages.
+
+Package: xemacs21-mule
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1), xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary has
+ been compiled with support for mule, but no input extensions.
+ .
+ Mule is the extension to (x)emacs that allows for the display of
+ non-European characters (for example Japanese and Korean characters).
+ This version of the package is mainly useful for only the display and
+ reading of international characters.  It does not have any mechanism
+ for entering non-European characters (see the xemacs21-mule-canna-wnn
+ package for that).
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
+
+Package: xemacs21-nomule
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Non-mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary does
+ not have any of the mule stuff compiled into it.  It should be faster
+ than the xemacs21-mule and xemacs21-mule-canna-wnn packages because
+ it does not contain the fairly large bit of code for either the
+ display or input of non-European characters.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
+
+Package: xemacs21-mule-canna-wnn
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1), xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Suggests: xfonts-cjk
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Mule binary compiled with Canna and Wnn
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary has
+ support for the input extensions Canna and WNN compiled in.
+ .
+ Mule is an extension to (x)emacs that allows for the display and
+ input of non-European characters.  This binary allows for input and
+ display whereas the xemacs21-mule package only does display.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
+
+Package: xemacs21-bin
+Architecture: any
+Conflicts: suidmanager (<< 0.50)
+Depends: xemacs21-support (= ${Source-Version}),  xemacs21 (= ${Source-Version}), ${shlibs:Depends}
+Description: highly customizable text editor -- support binaries
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ After starting it up peruse the Help menu and read more on its
+ origins and what it can do.
+ .
+ You will need one of xemacs21-mule, xemacs21-nomule, or
+ xemacs21-mule-canna-wnn to actually run xemacs.
+
+Package: xemacs21-support
+Architecture: all
+Conflicts: xemacs-support, sgml-base (<< 1.23)
+Replaces: xemacs-support
+Suggests: xemacs21-supportel (= ${Source-Version})
+Depends: emacsen-common, xemacs21 (= ${Source-Version})
+Description: highly customizable text editor -- architecture independent support files
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ Support and architecture independent files for XEmacs 21.4.17.  This
+ includes the files found in etc and all required elisp library files
+ (mostly compiled (.elc files), but a few uncompiled (.el files)).
+
+Package: xemacs21-supportel
+Architecture: all
+Depends: xemacs21-support (= ${Source-Version})
+Description: highly customizable text editor -- non-required library files
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains all the non-necessary library files for
+ XEmacs.  The xemacs21-support package contains the compiled versions
+ of these files.
+ .
+ The major reason to install this package is if you want to learn
+ elisp or modify the libraries for your specific installation.
+
+Package: xemacs21-gnome-mule
+Section: gnome
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1), xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary has
+ been compiled with support for mule, but no input extensions.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ Mule is the extension to (x)emacs that allows for the display of
+ non-European characters (for example Japanese and Korean characters).
+ This version of the package is mainly useful for only the display and
+ reading of international characters.  It does not have any mechanism
+ for entering non-European characters (see the xemacs21-mule-canna-wnn
+ package for that).
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
+
+Package: xemacs21-gnome-nomule
+Section: gnome
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Non-mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary does
+ not have any of the mule stuff compiled into it.  It should be faster
+ than the xemacs21-mule and xemacs21-mule-canna-wnn packages because
+ it does not contain the fairly large bit of code for either the
+ display or input of non-European characters.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
+
+Package: xemacs21-gnome-mule-canna-wnn
+Section: gnome
+Architecture: any
+Depends: xemacs21-support (= ${Source-Version}), xemacs21-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs21-mulesupport (>= 2003.04.23-1), xemacs21-basesupport (>= 2003.04.23-1), emacsen-common
+Suggests: xfonts-cjk
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs21
+Description: highly customizable text editor -- Mule binary compiled with Canna and Wnn
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs21-support package for lisp and etc files, and
+ the xemacs21-bin package for supporting binaries.  This binary has
+ support for the input extensions Canna and WNN compiled in.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ Mule is an extension to (x)emacs that allows for the display and
+ input of non-European characters.  This binary allows for input and
+ display whereas the xemacs21-mule package only does display.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs21-nomule, xemacs21-mule,
+ xemacs21-mule-canna-wnn, xemacs21-gnome-nomule, xemacs21-gnome-mule, and
+ xemacs21-gnome-mule-canna-wnn.
--- xemacs21-21.4.17.orig/debian/remove-elcs
+++ xemacs21-21.4.17/debian/remove-elcs
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -w
+
+# OK, here we take a command line argument for dpkg-source, and parse
+# out all the .elc files that have been change and delete them so that
+# the real dpkg-source (run later by dpkg-buildpackage) won't complain
+# about them.
+
+use strict;
+use diagnostics;
+
+my $dir = $ARGV[0];
+
+if(0) {
+  my $prog_name = "dpkg-source -d $dir 2>&1";
+  
+  open(DPKG_OUTPUT, "$prog_name |");
+  
+  while (<DPKG_OUTPUT>) {
+    # look for lines like dpkg-source
+    if (m/^$prog_name: cannot represent change to (.*\.elc):.*$/) {
+      print "This NOT OK: $_";
+      print "Removing $1 cause $prog_name complained\n";
+      unlink "$dir/$1";
+    }
+    else {
+      print "This OK: $_";
+    }
+  }
+
+  close(DPKG_OUTPUT);
+  
+}
+elsif(1) {
+
+  print "Searching directory ", $ARGV[0], "\n";
+  chdir $ARGV[0] || die "No directory $1";
+  
+  my $prog_name = "find . -name *.elc -print";
+
+  open(FIND_OUTPUT, "$prog_name |");
+
+  my %stats = ();
+  my $total_files = 0;
+  while(<FIND_OUTPUT>) {
+    chop;
+    my @one_stats = stat($_);
+    $stats{$_} = $one_stats[9];
+    $total_files++;
+    # print "Checking file $_\n";
+  }
+
+  close(FIND_OUTPUT);
+  
+  # cound up all the available times.
+  my %times = ();
+  my $one_time;
+  foreach $one_time (values %stats) {
+    if(! exists $times{$one_time}) {
+      $times{$one_time} = 0;
+    }
+    $times{$one_time}++;
+  }
+
+  # find the most often occuring time
+  my $max_time = 0;
+  my $time_number = "";
+  foreach $one_time (keys %times) {
+    if($times{$one_time} > $max_time) {
+      $max_time = $times{$one_time};
+      $time_number = $one_time;
+    }
+  }
+
+  # OK unlink all the files with times greater than $time_number
+  my $one_file;
+  my $unlinked_files = 0;
+  foreach $one_file (keys %stats) {
+    if($stats{$one_file} > $time_number) {
+      unlink($one_file);
+      print "Unlinking $one_file. ", $stats{$one_file}, " > $time_number\n";
+      $unlinked_files++;
+    }
+  }
+
+  print "Unlinked $unlinked_files out of $total_files\n";
+
+  # let's hope that clears out all the modified stuff.
+  
+}
+exit 0;
--- xemacs21-21.4.17.orig/debian/xemacs-@VERSION@-mule-canna-wnn.1.in
+++ xemacs21-21.4.17/debian/xemacs-@VERSION@-mule-canna-wnn.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/control.in
+++ xemacs21-21.4.17/debian/control.in
@@ -0,0 +1,226 @@
+Source: xemacs@MAJVERSION@
+Section: editors
+Priority: optional
+Maintainer: OHURA Makoto <ohura@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: texinfo, libcanna1g-dev, libwnn6-dev, libjpeg62-dev, libncurses5-dev, libpng2-dev, libtiff4-dev, zlib1g-dev, texi2html, debhelper (>> 4), libldap2-dev, libdb3-dev, libpam0g-dev, libcompfaceg1-dev, xlibs-dev, libxaw7-dev, autoconf2.13, libgtk1.2-dev, libgnome-dev, libart-dev, libesd0-dev, dpatch (>= 1.11)
+
+Package: xemacs@MAJVERSION@@SUBNAME@
+Architecture: all
+Depends: xemacs@MAJVERSION@@SUBNAME@-mule (= ${Source-Version}) | xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn (= ${Source-Version}) | xemacs@MAJVERSION@@SUBNAME@-nomule (= ${Source-Version}) | xemacs@MAJVERSION@@SUBNAME@-gnome-mule (= ${Source-Version}) | xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn (= ${Source-Version}) | xemacs@MAJVERSION@@SUBNAME@-gnome-nomule (= ${Source-Version})
+Replaces: xemacs, xemacs-widget
+Conflicts: xemacs, xemacs-widget
+Description: highly customizable text editor
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package exists to cause the installation of the real XEmacs packages.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-mule
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-mulesupport (>= 2003.04.23-1), xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary has
+ been compiled with support for mule, but no input extensions.
+ .
+ Mule is the extension to (x)emacs that allows for the display of
+ non-European characters (for example Japanese and Korean characters).
+ This version of the package is mainly useful for only the display and
+ reading of international characters.  It does not have any mechanism
+ for entering non-European characters (see the xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn
+ package for that).
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-nomule
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Non-mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary does
+ not have any of the mule stuff compiled into it.  It should be faster
+ than the xemacs@MAJVERSION@@SUBNAME@-mule and xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn packages because
+ it does not contain the fairly large bit of code for either the
+ display or input of non-European characters.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-mulesupport (>= 2003.04.23-1), xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Suggests: xfonts-cjk
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Mule binary compiled with Canna and Wnn
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary has
+ support for the input extensions Canna and WNN compiled in.
+ .
+ Mule is an extension to (x)emacs that allows for the display and
+ input of non-European characters.  This binary allows for input and
+ display whereas the xemacs@MAJVERSION@@SUBNAME@-mule package only does display.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-bin
+Architecture: any
+Conflicts: suidmanager (<< 0.50)
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}),  xemacs@MAJVERSION@@SUBNAME@ (= ${Source-Version}), ${shlibs:Depends}
+Description: highly customizable text editor -- support binaries
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ After starting it up peruse the Help menu and read more on its
+ origins and what it can do.
+ .
+ You will need one of xemacs@MAJVERSION@@SUBNAME@-mule, xemacs@MAJVERSION@@SUBNAME@-nomule, or
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn to actually run xemacs.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-support
+Architecture: all
+Conflicts: xemacs-support, sgml-base (<< 1.23)
+Replaces: xemacs-support
+Suggests: xemacs@MAJVERSION@@SUBNAME@-supportel (= ${Source-Version})
+Depends: emacsen-common, xemacs21 (= ${Source-Version})
+Description: highly customizable text editor -- architecture independent support files
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ Support and architecture independent files for XEmacs @VERSION@.  This
+ includes the files found in etc and all required elisp library files
+ (mostly compiled (.elc files), but a few uncompiled (.el files)).
+
+Package: xemacs@MAJVERSION@@SUBNAME@-supportel
+Architecture: all
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version})
+Description: highly customizable text editor -- non-required library files
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains all the non-necessary library files for
+ XEmacs.  The xemacs@MAJVERSION@@SUBNAME@-support package contains the compiled versions
+ of these files.
+ .
+ The major reason to install this package is if you want to learn
+ elisp or modify the libraries for your specific installation.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-gnome-mule
+Section: gnome
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-mulesupport (>= 2003.04.23-1), xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary has
+ been compiled with support for mule, but no input extensions.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ Mule is the extension to (x)emacs that allows for the display of
+ non-European characters (for example Japanese and Korean characters).
+ This version of the package is mainly useful for only the display and
+ reading of international characters.  It does not have any mechanism
+ for entering non-European characters (see the xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn
+ package for that).
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-gnome-nomule
+Section: gnome
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Non-mule binary
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary does
+ not have any of the mule stuff compiled into it.  It should be faster
+ than the xemacs@MAJVERSION@@SUBNAME@-mule and xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn packages because
+ it does not contain the fairly large bit of code for either the
+ display or input of non-European characters.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
+
+Package: xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn
+Section: gnome
+Architecture: any
+Depends: xemacs@MAJVERSION@@SUBNAME@-support (= ${Source-Version}), xemacs@MAJVERSION@@SUBNAME@-bin (= ${Source-Version}), ${shlibs:Depends}, xemacs@MAJVERSION@@SUBNAME@-mulesupport (>= 2003.04.23-1), xemacs@MAJVERSION@@SUBNAME@-basesupport (>= 2003.04.23-1), emacsen-common
+Suggests: xfonts-cjk
+Provides: emacsen, info-browser, mail-reader, news-reader, www-browser, xemacs@MAJVERSION@@SUBNAME@
+Description: highly customizable text editor -- Mule binary compiled with Canna and Wnn
+ XEmacs is a full fledged programming language with a mail reader,
+ news reader, info browser, web browser, calendar, specialized editor
+ for more programming languages and other formats than most people
+ encounter in a lifetime, and much much more.
+ .
+ This package contains the actual binary used to run XEmacs.  It
+ depends on the xemacs@MAJVERSION@@SUBNAME@-support package for lisp and etc files, and
+ the xemacs@MAJVERSION@@SUBNAME@-bin package for supporting binaries.  This binary has
+ support for the input extensions Canna and WNN compiled in.
+ .
+ This version has also been compiled to use features from gtk and gnome.
+ .
+ Mule is an extension to (x)emacs that allows for the display and
+ input of non-European characters.  This binary allows for input and
+ display whereas the xemacs@MAJVERSION@@SUBNAME@-mule package only does display.
+ .
+ This package actually contains one of the six xemacs binaries
+ available.  They are xemacs@MAJVERSION@@SUBNAME@-nomule, xemacs@MAJVERSION@@SUBNAME@-mule,
+ xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn, xemacs@MAJVERSION@@SUBNAME@-gnome-nomule, xemacs@MAJVERSION@@SUBNAME@-gnome-mule, and
+ xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn.
--- xemacs21-21.4.17.orig/debian/xemacs21-support.conffiles.foo
+++ xemacs21-21.4.17/debian/xemacs21-support.conffiles.foo
@@ -0,0 +1 @@
+/etc/xemacs21/site-start.d/00debian.el
--- xemacs21-21.4.17.orig/debian/xemacs21-fake
+++ xemacs21-21.4.17/debian/xemacs21-fake
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo You need to install one of xemacs#MAJVERSION@-nomule
+echo xemacs21-mule or xemacs21-mule-canna-wnn.
+echo
+echo This is here to make sure that is done and that there is
+echo an xemacs21 binary available.
--- xemacs21-21.4.17.orig/debian/patches/20_gcc_4.0_compiling.dpatch
+++ xemacs21-21.4.17/debian/patches/20_gcc_4.0_compiling.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_gcc_4.0.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compiling problem of gcc-4.0
+## DP: See BTS #289294
+
+@DPATCH@
+diff -urNad xemacs21-21.4.16/src/glyphs-gtk.c /tmp/dpep.s9tDC8/xemacs21-21.4.16/src/glyphs-gtk.c
+--- xemacs21-21.4.16/src/glyphs-gtk.c	2005-01-10 23:04:43.000000000 +0900
++++ /tmp/dpep.s9tDC8/xemacs21-21.4.16/src/glyphs-gtk.c	2005-01-15 21:01:58.000000000 +0900
+@@ -768,7 +768,7 @@
+     find_keyword_in_vector (instantiator, Q_file);
+ 
+   IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
+-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
++  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
+   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
+   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
+   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
+@@ -2999,7 +2999,7 @@
+ 
+ /* shared data for the image read/parse logic */
+ static short hexTable[256];		/* conversion value */
+-static int initialized = FALSE;	/* easier to fill in at run time */
++static int initialized_local = FALSE;	/* easier to fill in at run time */
+ 
+ /*
+  *	Table index for the hex values. Initialized once, first time.
+@@ -3032,7 +3032,7 @@
+     hexTable['}'] = -1;	hexTable['\n'] = -1;
+     hexTable['\t'] = -1;
+ 	
+-    initialized = TRUE;
++    initialized_local = TRUE;
+ }
+ 
+ /*
+@@ -3089,7 +3089,7 @@
+ #define Xmalloc(size) malloc(size)
+ 
+     /* first time initialization */
+-    if (initialized == FALSE) initHexTable();
++    if (initialized_local == FALSE) initHexTable();
+ 
+     /* error cleanup and return macro	*/
+ #define	RETURN(code) { if (data) free (data); return code; }
+@@ -3223,7 +3223,7 @@
+       IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
+       /* Make sure there aren't two pointers to the same mask, causing
+ 	 it to get freed twice. */
+-      IMAGE_INSTANCE_GTK_MASK (p) = 0;
++      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
+       break;
+ 
+     default:
--- xemacs21-21.4.17.orig/debian/patches/01_debian_patch.dpatch
+++ xemacs21-21.4.17/debian/patches/01_debian_patch.dpatch
@@ -0,0 +1,341 @@
+#! /bin/sh -e
+## XX_PATCHNAME.dpatch by YOUR NAME <YOUR EMAIL>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
+
+if [ $# -lt 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+
+--- xemacs21-21.4.15.orig/configure.in
++++ xemacs21-21.4.15/configure.in
+@@ -349,7 +349,7 @@
+ with_menubars=''
+ with_scrollbars=''
+ dnl can't turn off widgets here because of systems where they are demanded
+-with_widgets=''
++with_widgets='athena'
+ with_dialogs=''
+ with_file_coding=''
+ cpp='' cppflags='' libs='' ldflags=''
+@@ -2039,10 +2044,10 @@
+ dnl #### Should make this Solaris-friendly.
+ dnl Link with -z nocombreloc for now.
+ if test "$pdump" != "yes"; then
+-  AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag)
++  AC_MSG_CHECKING(for \"-Xlinker -znocombreloc\" linker flag)
+   case "`ld --help 2>&1`" in
+     *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
+-      XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
++      XE_PREPEND(-Xlinker -znocombreloc, ld_switch_site) ;;
+     *) AC_MSG_RESULT(no) ;;
+   esac
+ fi
+@@ -4500,7 +4506,8 @@
+     AC_MSG_RESULT(2); dbfunc=db_open])],[
+     AC_MSG_RESULT(1); dbfunc=dbopen])
+     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
+-    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
++    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes, [
++    AC_CHECK_LIB(db, [${dbfunc}_4001], with_database_berkdb=yes need_libdb=yes) ])])
+   fi
+ 
+   if test "$with_database_berkdb" = "yes"; then
+@@ -4856,6 +4863,7 @@
+   esac
+ done
+ AC_SUBST(DOCDIR)
++AC_DEFINE_UNQUOTED(DOCDIR, "$docdir")
+ 
+ AC_SUBST(archlibdir)
+ AC_SUBST(ARCHLIBDIR_USER_DEFINED)
+@@ -5084,7 +5092,7 @@
+ echo "  Relocating allocator for buffers:  $rel_alloc"
+ echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
+ case "$ld_switch_site" in
+-  *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
++  *nocombreloc*) echo "  Linking with \`-Xlinker -znocombreloc'.
+     - Consider configuring with --pdump." ;;
+ esac
+ 
+--- xemacs21-21.4.15.orig/lisp/ChangeLog
++++ xemacs21-21.4.15/lisp/ChangeLog
+@@ -430,6 +430,12 @@
+ 
+ 	* XEmacs 21.4.9 "Informed Management" is released.
+ 
++2002-07-27  James LewisMoss  <dres@lewismoss.org>
++
++	* gnuserv.el (gnuserv-edit-files): fallback to gtk if x device
++	fails.  Fixes problem where gnuclient fails for gtk instances when
++	gnuclient was built with X configure.
++
+ 2002-06-22  Ville Skyttä  <ville.skytta@xemacs.org>
+ 
+ 	* subr.el (add-to-list): Sync with GNU Emacs 21.2, adding the
+--- xemacs21-21.4.15.orig/lisp/font-menu.el
++++ xemacs21-21.4.15/lisp/font-menu.el
+@@ -158,6 +158,11 @@
+   :type '(choice (string :tag "Format string")
+ 		 (function)))
+ 
++(defcustom font-menu-max-number nil
++  "The maximum number of fonts retrieved from the server"
++  :type 'integer
++  :group 'font-menu)
++
+ (defvar font-menu-preferred-resolution
+   (make-specifier-and-init 'generic '((global ((mswindows) . ":")
+ 					      ((gtk) . "*-*")
+--- xemacs21-21.4.15.orig/lisp/gnuserv.el
++++ xemacs21-21.4.15/lisp/gnuserv.el
+@@ -399,6 +399,13 @@
+   (eval form))
+ 
+ 
++
++(defun make-x-device-with-gtk-fallback (device)
++  (or (condition-case ()
++          (make-x-device device)
++        (error nil))
++      (make-gtk-device)))
++
+ ;; "Execute" a client connection, called by gnuclient.  This is the
+ ;; backbone of gnuserv.el.
+ (defun gnuserv-edit-files (type list &rest flags)
+@@ -431,7 +438,7 @@
+ 			  (case (car type)
+ 			    (tty (apply 'make-tty-device (cdr type)))
+ 			    (gtk (make-gtk-device))
+-			    (x   (make-x-device (cadr type)))
++			    (x   (make-x-device-with-gtk-fallback (cadr type)))
+ 			    (mswindows   (make-mswindows-device))
+ 			    (t   (error "Invalid device type"))))
+ 			 (t
+--- xemacs21-21.4.15.orig/lisp/x-font-menu.el
++++ xemacs21-21.4.15/lisp/x-font-menu.el
+@@ -89,7 +89,8 @@
+ 	family size weight entry monospaced-p
+ 	dev-cache cache families sizes weights)
+     (dolist (name (cond ((null debug)	; debugging kludge
+-			 (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device))
++			 (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device
++                                     font-menu-max-number))
+ 			((stringp debug) (split-string debug "\n"))
+ 			(t debug)))
+       (when (and (string-match x-font-regexp-ascii name)
+--- xemacs21-21.4.15.orig/src/ChangeLog
++++ xemacs21-21.4.15/src/ChangeLog
+@@ -311,6 +315,11 @@
+ 
+ 	* specifier.c (Fvalid_specifier_type_p): Typo in comment.
+ 
++2002-11-16  James LewisMoss  <dres@lewismoss.org>
++
++	* dumper.c (pdump_load): add search for file DUMP in DOCDIR along
++	with the patterned exe path search.
++
+ 2002-11-13  Stephen J. Turnbull  <stephen@xemacs.org>
+ 
+ 	* event-Xt.c (Xt_timeout):
+--- xemacs21-21.4.15.orig/src/config.h.in
++++ xemacs21-21.4.15/src/config.h.in
+@@ -905,6 +905,7 @@
+ #undef MODULEDIR_USER_DEFINED
+ #undef SITEMODULEDIR_USER_DEFINED
+ #undef DOCDIR_USER_DEFINED
++#undef DOCDIR
+ #undef LISPDIR_USER_DEFINED
+ #undef PACKAGE_PATH_USER_DEFINED
+ #undef SITELISPDIR_USER_DEFINED
+--- xemacs21-21.4.15.orig/src/console.h
++++ xemacs21-21.4.15/src/console.h
+@@ -238,7 +238,8 @@
+ 						Error_behavior errb);
+   Lisp_Object (*font_instance_properties_method) (Lisp_Font_Instance *);
+   Lisp_Object (*list_fonts_method) (Lisp_Object pattern,
+-				    Lisp_Object device);
++				    Lisp_Object device,
++                                    Lisp_Object maxnumber);
+   Lisp_Object (*find_charset_font_method) (Lisp_Object device,
+ 					   Lisp_Object font,
+ 					   Lisp_Object charset);
+--- xemacs21-21.4.15.orig/src/dumper.c
++++ xemacs21-21.4.15/src/dumper.c
+@@ -1322,9 +1322,24 @@
+ }
+ #endif /* !WIN32_NATIVE */
+ 
++static int
++pdump_file_doc_dir_try (char *exe_path)
++{
++  char *w = exe_path + strlen (exe_path);
++
++  sprintf (w, "%s", "DUMP");
++
++  if (pdump_file_get (exe_path))
++    {
++      if (pdump_load_check ())
++        return 1;
++      pdump_free ();
++    }
++  return 0;
++}
+ 
+ static int
+-pdump_file_try (char *exe_path)
++pdump_file_exe_path_try (char *exe_path)
+ {
+   char *w = exe_path + strlen (exe_path);
+ 
+@@ -1439,9 +1454,16 @@
+ 
+   /* Save exe_path because pdump_file_try() modifies it */
+   strcpy(real_exe_path, exe_path);
+-  if (pdump_file_try (exe_path)
++  if (pdump_file_exe_path_try (exe_path)
+       || (xrealpath(real_exe_path, real_exe_path)
+-	  && pdump_file_try (real_exe_path)))
++	  && pdump_file_exe_path_try (real_exe_path)))
++    {
++      pdump_load_finish ();
++      return 1;
++    }
++
++  sprintf(exe_path, "%s", DOCDIR);
++  if (pdump_file_doc_dir_try (exe_path))
+     {
+       pdump_load_finish ();
+       return 1;
+--- xemacs21-21.4.15.orig/src/glyphs-gtk.c
++++ xemacs21-21.4.15/src/glyphs-gtk.c
+@@ -2103,6 +2104,21 @@
+ 	    }
+ 	  GTK_WIDGET_FLAGS(FRAME_GTK_TEXT_WIDGET (f)) = old_flags;
+ 	}
++      else
++	{
++	  if (IMAGE_INSTANCE_GTK_ALREADY_PUT(p))
++	    {
++	      /* Do nothing... */
++	    }
++	  else
++	    {
++	      /* Must make sure we have put the image at least once! */
++	      IMAGE_INSTANCE_GTK_ALREADY_PUT(p) = TRUE;
++	      gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)),
++			     wid,
++			     -dga->xoffset, -dga->yoffset);
++	    }
++	}
+ 
+       if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
+ 	{
+@@ -2219,7 +2235,6 @@
+   /* This function can GC */
+   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+   Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
+-  Lisp_Object frame = DOMAIN_FRAME (domain);
+ 
+   if (!DEVICE_GTK_P (XDEVICE (device)))
+     signal_simple_error ("Not a GTK device", device);
+--- xemacs21-21.4.15.orig/src/objects-gtk.c
++++ xemacs21-21.4.15/src/objects-gtk.c
+@@ -369,7 +369,7 @@
+ }
+ 
+ static Lisp_Object
+-gtk_list_fonts (Lisp_Object pattern, Lisp_Object device)
++gtk_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber)
+ {
+   const char *patternext;
+ 
+--- xemacs21-21.4.15.orig/src/objects-msw.c
++++ xemacs21-21.4.15/src/objects-msw.c
+@@ -1592,7 +1592,8 @@
+ }
+ 
+ static Lisp_Object
+-mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device)
++mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device,
++                      Lisp_Object maxnumber)
+ {
+   Lisp_Object fonttail, result = Qnil;
+   char *extpattern;
+--- xemacs21-21.4.15.orig/src/objects-tty.c
++++ xemacs21-21.4.15/src/objects-tty.c
+@@ -275,7 +275,7 @@
+ }
+ 
+ static Lisp_Object
+-tty_list_fonts (Lisp_Object pattern, Lisp_Object device)
++tty_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber)
+ {
+   return list1 (build_string ("normal"));
+ }
+--- xemacs21-21.4.15.orig/src/objects-x.c
++++ xemacs21-21.4.15/src/objects-x.c
+@@ -862,17 +862,23 @@
+ }
+ 
+ static Lisp_Object
+-x_list_fonts (Lisp_Object pattern, Lisp_Object device)
++x_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber)
+ {
+   Extbyte **names;
+   int count = 0;
++  int max_number = MAX_FONT_COUNT;
+   Lisp_Object result = Qnil;
+   const Extbyte *patternext;
+ 
+   LISP_STRING_TO_EXTERNAL (pattern, patternext, Qx_font_name_encoding);
+ 
++  if (!NILP(maxnumber) && INTP(maxnumber))
++  {
++      max_number = XINT(maxnumber);
++  }
++
+   names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
+-		      patternext, MAX_FONT_COUNT, &count);
++		      patternext, maxnumber, &count);
+   while (count--)
+     result = Fcons (build_ext_string (names[count], Qx_font_name_encoding),
+ 		    result);
+--- xemacs21-21.4.15.orig/src/objects.c
++++ xemacs21-21.4.15/src/objects.c
+@@ -459,17 +459,18 @@
+ 			     font_instance_properties, (f));
+ }
+ 
+-DEFUN ("list-fonts", Flist_fonts, 1, 2, 0, /*
++DEFUN ("list-fonts", Flist_fonts, 1, 3, 0, /*
+ Return a list of font names matching the given pattern.
+ DEVICE specifies which device to search for names, and defaults to the
+ currently selected device.
+ */
+-       (pattern, device))
++       (pattern, device, maxnumber))
+ {
+   CHECK_STRING (pattern);
+   XSETDEVICE (device, decode_device (device));
+ 
+-  return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device));
++  return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device,
++                                                            maxnumber));
+ }
+ 
+ 
--- xemacs21-21.4.17.orig/debian/patches/02_m68k_stat.dpatch
+++ xemacs21-21.4.17/debian/patches/02_m68k_stat.dpatch
@@ -0,0 +1,235 @@
+#! /bin/sh -e
+## 02_m68k_stat.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS problem. See BTS #206667
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+diff -ruN xemacs21-21.4.15.old/configure.in xemacs21-21.4.15/configure.in
+--- xemacs21-21.4.15.old/configure.in	2004-06-29 00:11:49.000000000 +0900
++++ xemacs21-21.4.15/configure.in	2004-07-12 21:49:32.000000000 +0900
+@@ -1952,6 +1952,8 @@
+     dnl glibc is intentionally not `-Wpointer-arith'-clean.
+     dnl Ulrich Drepper has rejected patches to fix the glibc header files.
+     test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
++    dnl for m68k
++    test "$machine" == "m68k" && CFLAGS="$CFLAGS -malign-int"
+     dnl I'm not convinced this is a good idea any more. -sb
+     dnl test "$opsys $machine" = "linux intel386" && \
+     dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+diff -ruN xemacs21-21.4.15.old/src/Makefile.in.in xemacs21-21.4.15/src/Makefile.in.in
+--- xemacs21-21.4.15.old/src/Makefile.in.in	2004-06-29 00:11:54.000000000 +0900
++++ xemacs21-21.4.15/src/Makefile.in.in	2004-07-13 21:44:38.000000000 +0900
+@@ -146,6 +146,10 @@
+ profile_objs=profile.o
+ #endif
+ 
++#ifdef m68k
++m68k_objs=m68k-fix.o
++#endif
++
+ ## -Demacs is needed to make some files produce the correct version
+ ## for use in Emacs.
+ 
+@@ -206,7 +210,7 @@
+  rangetab.o redisplay.o redisplay-output.o regex.o\
+  search.o select.o $(sheap_objs) signal.o sound.o\
+  specifier.o strftime.o symbols.o syntax.o sysdep.o\
+- undo.o $(x_objs) widget.o window.o $(win32_objs)
++ undo.o $(x_objs) widget.o window.o $(win32_objs) $(m68k_objs)
+ 
+ obj_rtl = $(objs:.o=.c.rtl)
+ 
+@@ -716,6 +720,11 @@
+ extra_doc_files=emacs-widget-accessors.c ui-byhand.c $(glade_files)
+ #endif
+ 
++#ifdef m68k
++m68k-fix.o : ${srcdir}/m68k-fix.c ${srcdir}/m68k-fix.h ${srcdir}/config.h
++	$(CC) -c $(cflags) -mno-align-int ${srcdir}/m68k-fix.c
++#endif
++
+ xemacs_res.o: ${srcdir}/../nt/xemacs.rc
+ 	windres --include-dir ${srcdir}/../nt -i ${srcdir}/../nt/xemacs.rc -o $@
+ 
+diff -ruN xemacs21-21.4.15.old/src/m68k-fix.c xemacs21-21.4.15/src/m68k-fix.c
+--- xemacs21-21.4.15.old/src/m68k-fix.c	1970-01-01 09:00:00.000000000 +0900
++++ xemacs21-21.4.15/src/m68k-fix.c	2004-07-15 08:19:54.000000000 +0900
+@@ -0,0 +1,90 @@
++#include <config.h>
++#include <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include "lisp.h"
++#include "buffer.h"
++#include "sysfile.h"
++#include "m68k-fix.h"
++
++static struct stat *st_buf;
++
++int xemacs_stat_m68k (const char *path)
++{
++  int ret;
++
++  st_buf = xmalloc(sizeof(struct stat));
++  ret=stat (path, st_buf);
++  return ret;
++}
++
++dev_t xemacs_stat_st_dev (void)
++{
++  return st_buf->st_dev;
++}
++
++ino_t xemacs_stat_st_ino (void)
++{
++  return st_buf->st_ino;
++}
++
++mode_t xemacs_stat_st_mode (void)
++{
++  return st_buf->st_mode;
++}
++
++nlink_t xemacs_stat_st_nlink (void)
++{
++  return st_buf->st_nlink;
++}
++
++uid_t xemacs_stat_st_uid (void)
++{
++  return st_buf->st_uid;
++}
++
++gid_t xemacs_stat_st_gid (void)
++{
++  return st_buf->st_gid;
++}
++
++dev_t xemacs_stat_st_rdev (void)
++{
++  return st_buf->st_rdev;
++}
++
++blksize_t xemacs_stat_st_blksize (void)
++{
++  return st_buf->st_blksize;
++}
++
++blkcnt_t xemacs_stat_st_blocks (void)
++{
++  return st_buf->st_blocks;
++}
++
++off_t xemacs_stat_st_size (void)
++{
++  return st_buf->st_size;
++}
++
++time_t xemacs_stat_st_atime (void)
++{
++  return st_buf->st_atime;
++}
++
++time_t xemacs_stat_st_mtime (void)
++{
++  return st_buf->st_mtime;
++}
++
++time_t xemacs_stat_st_ctime (void)
++{
++  return st_buf->st_ctime;
++}
++
++void xemacs_stat_m68k_free (void)
++{
++  xfree(st_buf);
++}
+diff -ruN xemacs21-21.4.15.old/src/m68k-fix.h xemacs21-21.4.15/src/m68k-fix.h
+--- xemacs21-21.4.15.old/src/m68k-fix.h	1970-01-01 09:00:00.000000000 +0900
++++ xemacs21-21.4.15/src/m68k-fix.h	2004-07-14 19:36:23.000000000 +0900
+@@ -0,0 +1,18 @@
++#ifndef INCLUDED_m68k_fix_h_
++#define INCLUDED_m68k_fix_h_
++int xemacs_stat_m68k (const char *path);
++dev_t xemacs_stat_st_dev (void);
++ino_t xemacs_stat_st_ino (void);
++mode_t xemacs_stat_st_mode (void);
++nlink_t xemacs_stat_st_nlink (void);
++uid_t xemacs_stat_st_uid (void);
++gid_t xemacs_stat_st_gid (void);
++dev_t xemacs_stat_st_rdev (void);
++blksize_t xemacs_stat_st_blksize (void);
++blkcnt_t xemacs_stat_st_blocks (void);
++off_t xemacs_stat_st_size (void);
++time_t xemacs_stat_st_atime (void);
++time_t xemacs_stat_st_mtime (void);
++time_t xemacs_stat_st_ctime (void);
++void xemacs_stat_m68k_free (void);
++#endif /* INCLUDED_m68k_fix_h_ */
+diff -ruN xemacs21-21.4.15.old/src/sysdep.c xemacs21-21.4.15/src/sysdep.c
+--- xemacs21-21.4.15.old/src/sysdep.c	2004-06-29 00:11:56.000000000 +0900
++++ xemacs21-21.4.15/src/sysdep.c	2004-07-14 19:41:18.000000000 +0900
+@@ -94,6 +94,10 @@
+ #include "nt.h"
+ #endif
+ 
++#ifdef m68k
++#include "m68k-fix.h"
++#endif
++
+ /* ------------------------------- */
+ /*         TTY definitions         */
+ /* ------------------------------- */
+@@ -3111,10 +3115,32 @@
+ #ifdef WIN32_NATIVE
+   return mswindows_stat (path, buf);
+ #else
++#ifdef m68k
++  int ret;
++
++  ret=xemacs_stat_m68k (path);
++
++  buf->st_dev=xemacs_stat_st_dev ();
++  buf->st_ino=xemacs_stat_st_ino ();
++  buf->st_mode=xemacs_stat_st_mode ();
++  buf->st_nlink=xemacs_stat_st_nlink ();
++  buf->st_uid=xemacs_stat_st_uid ();
++  buf->st_gid=xemacs_stat_st_gid ();
++  buf->st_dev=xemacs_stat_st_rdev ();
++  buf->st_blksize=xemacs_stat_st_blksize ();
++  buf->st_blocks=xemacs_stat_st_blocks ();
++  buf->st_size=xemacs_stat_st_size ();
++  buf->st_atime=xemacs_stat_st_atime ();
++  buf->st_mtime=xemacs_stat_st_mtime ();
++  buf->st_ctime=xemacs_stat_st_ctime ();
++
++  xemacs_stat_m68k_free();
++  return ret;
++#else
+   return stat (path, buf);
+ #endif
++#endif
+ }
+-
+ /****************** file-manipulation calls *****************/
+ 
+ #ifdef ENCAPSULATE_CHMOD
--- xemacs21-21.4.17.orig/debian/patches/03_hppa_undefined_symbols.dpatch
+++ xemacs21-21.4.17/debian/patches/03_hppa_undefined_symbols.dpatch
@@ -0,0 +1,151 @@
+#! /bin/sh -e
+## 03_hppa_undefined_symbols.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS problem for hppa. See BTS #133682
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/configure.in xemacs21-21.4.15/configure.in
+--- /home/mohura/debsrc/xemacs21-21.4.15/configure.in	2004-07-25 17:37:11.000000000 +0900
++++ xemacs21-21.4.15/configure.in	2004-07-25 17:44:08.000000000 +0900
+@@ -888,6 +888,9 @@
+   sources may be found."])
+     fi
+   ;;
++  hppa*-*-linux-gnu* )
++    machine=hp800 opsys=gnu-linux
++  ;;
+ 
+   dnl Otherwise, check if the directory they specified is okay.
+   * )
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/lib-src/gnuclient.c xemacs21-21.4.15/lib-src/gnuclient.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/lib-src/gnuclient.c	2004-07-25 17:37:11.000000000 +0900
++++ xemacs21-21.4.15/lib-src/gnuclient.c	2004-07-25 17:44:08.000000000 +0900
+@@ -597,7 +597,7 @@
+ 		strcpy (remotepath, ptr);
+ 	    }
+ #if 0  /* This is really bogus... re-enable it if you must have it! */
+-#if defined (hp9000s300) || defined (hp9000s800)
++#if defined (__hpux)
+ 	  else if (strcmp (thishost,hostarg))
+ 	    {	/* try /net/thishost */
+ 	      strcpy (remotepath, "/net/");		/* (this fails using internet
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/emacs.c xemacs21-21.4.15/src/emacs.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/emacs.c	2004-07-25 17:37:11.000000000 +0900
++++ xemacs21-21.4.15/src/emacs.c	2004-07-25 17:44:08.000000000 +0900
+@@ -2368,7 +2368,7 @@
+ #if defined (WIN32_NATIVE) || defined (CYGWIN)
+   init_win32 ();
+ #endif
+-#if defined (HAVE_NATIVE_SOUND) && defined (hp9000s800)
++#if defined (HAVE_NATIVE_SOUND) && defined (__hpux)
+   init_hpplay ();
+ #endif
+ #ifdef HAVE_TTY
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/m/hp800.h xemacs21-21.4.15/src/m/hp800.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/m/hp800.h	2004-07-25 17:37:11.000000000 +0900
++++ xemacs21-21.4.15/src/m/hp800.h	2004-07-25 17:44:08.000000000 +0900
+@@ -24,16 +24,8 @@
+    operating system this machine is likely to run.
+    USUAL-OPSYS="hpux"  */
+ 
+-/* Now define a symbol for the cpu type, if your compiler
+-   does not define it automatically:
+-   Ones defined so far include vax, m68000, ns16000, pyramid,
+-   orion, tahoe, APOLLO and many others */
+-#ifndef hp9000s800
+-#	define hp9000s800
+-#endif
+-
+ 
+-#ifdef __hpux
++#if defined(__hpux) || defined(__linux__)
+ /* Now define a symbol for the cpu type, if your compiler
+    does not define it automatically:
+    Ones defined so far include vax, m68000, ns16000, pyramid,
+@@ -42,6 +34,15 @@
+ #     define hp9000s800
+ #endif
+ 
++#ifdef __linux__
++/* Data type of load average, as read out of kmem.  */
++
++#define LOAD_AVE_TYPE long
++
++/* Convert that into an integer that is 100 for a load average of 1.0  */
++
++#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
++#else
+ /* Data type of load average, as read out of kmem.  */
+ 
+ #define LOAD_AVE_TYPE double
+@@ -49,7 +50,7 @@
+ /* Convert that into an integer that is 100 for a load average of 1.0  */
+ 
+ #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
+-
++#endif
+ 
+ /* Define CANNOT_DUMP on machines where unexec does not work.
+    Then the function dump-emacs will not be defined
+@@ -57,6 +58,7 @@
+ 
+ #undef CANNOT_DUMP
+ 
++#ifdef __hpux
+ /* Define C_ALLOCA if this machine does not support a true alloca
+    and the one written in C should be used instead.
+    Define HAVE_ALLOCA to say that the system provides a properly
+@@ -82,6 +84,9 @@
+ 
+ #define DATA_START    0x40000000
+ #define TEXT_START    0x00000000
++#else
++#define HAVE_ALLOCA
++#endif
+ 
+ #define STACK_DIRECTION 1 
+ 
+@@ -95,6 +100,7 @@
+ /* This machine requires completely different unexec code
+    which lives in a separate file.  Specify the file name.  */
+ 
++#ifdef __hpux
+ #define UNEXEC "unexhp9k800.o"
+ 
+ #define LIBS_MACHINE
+@@ -124,3 +130,4 @@
+ #endif
+ 
+ #endif /* __hpux */
++#endif /* __hpux || __linux */
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/sound.c xemacs21-21.4.15/src/sound.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/sound.c	2004-07-25 17:37:11.000000000 +0900
++++ xemacs21-21.4.15/src/sound.c	2004-07-25 17:44:08.000000000 +0900
+@@ -653,7 +653,7 @@
+ */ );
+   Vnative_sound_only_on_console = Qt;
+ 
+-#if defined (HAVE_NATIVE_SOUND) && defined (hp9000s800)
++#if defined (HAVE_NATIVE_SOUND) && defined (__hpux)
+   {
+     void vars_of_hpplay (void);
+     vars_of_hpplay ();
--- xemacs21-21.4.17.orig/debian/patches/10_info_el_with_line_number.dpatch
+++ xemacs21-21.4.17/debian/patches/10_info_el_with_line_number.dpatch
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_info_el_with_line_number.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix info.el to support info-index with the line number
+## DP: BTS#275795
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad xemacs21-21.4.15/lisp/info.el /tmp/dpep.TykuSy/xemacs21-21.4.15/lisp/info.el
+--- xemacs21-21.4.15/lisp/info.el	2004-01-27 11:58:12.000000000 +0900
++++ /tmp/dpep.TykuSy/xemacs21-21.4.15/lisp/info.el	2004-10-19 00:13:07.000000000 +0900
+@@ -2268,7 +2268,7 @@
+   (interactive "sIndex topic: ")
+   (let ((pattern (format "\n\\* \\([^\n:]*%s[^\n:]*\\):[ \t]*%s"
+ 			 (regexp-quote topic)
+-			 "\\(.*\\)\\.[ \t]*\\([0-9]*\\)$"))
++			 "\\(.*\\)\\.[ \t]*\\((line[ \t]*\\([0-9]*\\))\\)?$"))
+ 	node)
+     (message "Searching index for `%s'..." topic)
+     (Info-goto-node "Top")
+@@ -2298,8 +2298,8 @@
+ 				    Info-current-node
+ 				    (string-to-int (concat "0"
+ 							   (buffer-substring
+-							    (match-beginning 3)
+-							    (match-end 3)))))
++							    (match-beginning 4)
++							    (match-end 4)))))
+ 			      matches)))
+ 		(and (setq node (Info-extract-pointer "next" t))
+ 		     (string-match "\\<Index\\>" node)))
+@@ -2331,7 +2331,7 @@
+ 	  num (1- num)))
+   (Info-goto-node (nth 1 (car Info-index-alternatives)))
+   (if (> (nth 3 (car Info-index-alternatives)) 0)
+-      (forward-line (nth 3 (car Info-index-alternatives)))
++      (forward-line (- (nth 3 (car Info-index-alternatives)) 1))
+     (forward-line 3)  ; don't search in headers
+     (let ((name (car (car Info-index-alternatives))))
+       (if (or (re-search-forward (format
--- xemacs21-21.4.17.orig/debian/patches/10_itimer_error_with_de.dpatch
+++ xemacs21-21.4.17/debian/patches/10_itimer_error_with_de.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+## 10_itimer_error_with_de.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix `itimer timeout' error with de_DE locale.
+## DP: Bug#228883
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/mohura/debsrc/xemacs21/xemacs21-21.4.15/src/device-gtk.c xemacs21-21.4.15/src/device-gtk.c
+--- /home/mohura/debsrc/xemacs21/xemacs21-21.4.15/src/device-gtk.c	2002-05-01 01:06:28.000000000 +0900
++++ xemacs21-21.4.15/src/device-gtk.c	2004-09-12 00:28:36.000000000 +0900
+@@ -54,6 +54,8 @@
+ #include <bonobo.h>
+ #endif
+ 
++#include <locale.h>
++
+ Lisp_Object Vdefault_gtk_device;
+ 
+ /* Qdisplay in general.c */
+@@ -182,6 +184,9 @@
+ 
+   speed_up_interrupts ();
+ 
++  /* Reset the numeric locale because gtk_init change it */
++  setlocale(LC_NUMERIC,"C");
++
+   free_argc_argv (argv);
+   return (Qt);
+ }
--- xemacs21-21.4.17.orig/debian/patches/00list
+++ xemacs21-21.4.17/debian/patches/00list
@@ -0,0 +1,8 @@
+01_debian_patch
+02_m68k_stat
+03_hppa_undefined_symbols
+04_ia64_not_export_dynamic
+10_gnuserv_disable_inet
+10_info_el_with_line_number
+10_itimer_error_with_de
+20_gcc_4.0_compiling
--- xemacs21-21.4.17.orig/debian/patches/04_ia64_segv.dpatch
+++ xemacs21-21.4.17/debian/patches/04_ia64_segv.dpatch
@@ -0,0 +1,2326 @@
+#! /bin/sh -e
+## 04_ia64_segv.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix ia64 dependent segv problem. BTS #207412, #149088, #218241
+## DP: Borrow this patch from xemacs21 package of SUSE Linux.
+## DP: See http://lists.debian.org/debian-ia64/2003/10/msg00050.html
+## DP: Disable now.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/chartab.c xemacs21-21.4.15/src/chartab.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/chartab.c	2001-04-13 03:23:27.000000000 +0900
++++ xemacs21-21.4.15/src/chartab.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1861,6 +1861,19 @@
+   define_structure_type_keyword (st, Qdata, chartab_data_validate);
+ }
+ 
++#ifdef __ia64__
++void
++structure_type_reinit_chartab (void)
++{
++  struct structure_type *st;
++
++  st = reinit_structure_type (Qchar_table, 0, chartab_instantiate);
++
++  reinit_structure_type_keyword (st, Qtype, chartab_type_validate);
++  reinit_structure_type_keyword (st, Qdata, chartab_data_validate);
++}
++#endif
++
+ void
+ complex_vars_of_chartab (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/console-gtk.c xemacs21-21.4.15/src/console-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/console-gtk.c	2001-04-13 03:23:29.000000000 +0900
++++ xemacs21-21.4.15/src/console-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -113,6 +113,14 @@
+ {
+   INITIALIZE_CONSOLE_TYPE (gtk, "gtk", "console-gtk-p");
+ 
++#ifdef __ia64__
++  console_type_reinit_gtk ();
++}
++
++void
++console_type_reinit_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, semi_canonicalize_console_connection);
+   CONSOLE_HAS_METHOD (gtk, canonicalize_console_connection);
+   CONSOLE_HAS_METHOD (gtk, semi_canonicalize_device_connection);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/console-msw.c xemacs21-21.4.15/src/console-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/console-msw.c	2001-04-13 03:23:29.000000000 +0900
++++ xemacs21-21.4.15/src/console-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -655,6 +655,14 @@
+ {
+   INITIALIZE_CONSOLE_TYPE (mswindows, "mswindows", "console-mswindows-p");
+ 
++#ifdef __ia64__
++  console_type_reinit_mswindows ();
++}
++
++void
++console_type_reinit_mswindows (void)
++{
++#endif
+   /* console methods */
+ /*  CONSOLE_HAS_METHOD (mswindows, init_console); */
+ /*  CONSOLE_HAS_METHOD (mswindows, mark_console); */
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/console-stream.c xemacs21-21.4.15/src/console-stream.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/console-stream.c	2001-04-13 03:23:30.000000000 +0900
++++ xemacs21-21.4.15/src/console-stream.c	2004-07-25 18:31:43.000000000 +0900
+@@ -242,6 +242,14 @@
+ {
+   INITIALIZE_CONSOLE_TYPE (stream, "stream", "console-stream-p");
+ 
++#ifdef __ia64__
++  console_type_reinit_stream ();
++}
++
++void
++console_type_reinit_stream (void)
++{
++#endif
+   /* console methods */
+   CONSOLE_HAS_METHOD (stream, init_console);
+   CONSOLE_HAS_METHOD (stream, initially_selected_for_input);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/console-tty.c xemacs21-21.4.15/src/console-tty.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/console-tty.c	2001-04-13 03:23:30.000000000 +0900
++++ xemacs21-21.4.15/src/console-tty.c	2004-07-25 18:31:43.000000000 +0900
+@@ -355,6 +355,14 @@
+ {
+   INITIALIZE_CONSOLE_TYPE (tty, "tty", "console-tty-p");
+ 
++#ifdef __ia64__
++  console_type_reinit_tty ();
++}
++
++void
++console_type_reinit_tty (void)
++{
++#endif
+   /* console methods */
+   CONSOLE_HAS_METHOD (tty, init_console);
+   CONSOLE_HAS_METHOD (tty, mark_console);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/console-x.c xemacs21-21.4.15/src/console-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/console-x.c	2001-04-13 03:23:30.000000000 +0900
++++ xemacs21-21.4.15/src/console-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -301,6 +301,14 @@
+ {
+   INITIALIZE_CONSOLE_TYPE (x, "x", "console-x-p");
+ 
++#ifdef __ia64__
++  console_type_reinit_x ();
++}
++
++void
++console_type_reinit_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, semi_canonicalize_console_connection);
+   CONSOLE_HAS_METHOD (x, canonicalize_console_connection);
+   CONSOLE_HAS_METHOD (x, semi_canonicalize_device_connection);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/device-gtk.c xemacs21-21.4.15/src/device-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/device-gtk.c	2002-05-01 01:06:28.000000000 +0900
++++ xemacs21-21.4.15/src/device-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -715,6 +715,14 @@
+ void
+ console_type_create_device_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_device_gtk ();
++}
++
++void
++console_type_reinit_device_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, init_device);
+   CONSOLE_HAS_METHOD (gtk, finish_init_device);
+   CONSOLE_HAS_METHOD (gtk, mark_device);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/device-msw.c xemacs21-21.4.15/src/device-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/device-msw.c	2002-08-20 20:36:45.000000000 +0900
++++ xemacs21-21.4.15/src/device-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1314,6 +1314,14 @@
+ void
+ console_type_create_device_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_device_mswindows ();
++}
++
++void
++console_type_reinit_device_mswindows (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (mswindows, init_device);
+   CONSOLE_HAS_METHOD (mswindows, finish_init_device);
+   CONSOLE_HAS_METHOD (mswindows, mark_device);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/device-tty.c xemacs21-21.4.15/src/device-tty.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/device-tty.c	2001-04-13 03:23:33.000000000 +0900
++++ xemacs21-21.4.15/src/device-tty.c	2004-07-25 18:31:43.000000000 +0900
+@@ -196,6 +196,14 @@
+ void
+ console_type_create_device_tty (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_device_tty ();
++}
++
++void
++console_type_reinit_device_tty (void)
++{
++#endif
+   /* device methods */
+   CONSOLE_HAS_METHOD (tty, init_device);
+   CONSOLE_HAS_METHOD (tty, delete_device);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/device-x.c xemacs21-21.4.15/src/device-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/device-x.c	2004-01-31 12:35:54.000000000 +0900
++++ xemacs21-21.4.15/src/device-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2018,6 +2018,15 @@
+ console_type_create_device_x (void)
+ {
+   reinit_console_type_create_device_x ();
++
++#ifdef __ia64__
++  console_type_reinit_device_x ();
++}
++
++void
++console_type_reinit_device_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, init_device);
+   CONSOLE_HAS_METHOD (x, finish_init_device);
+   CONSOLE_HAS_METHOD (x, mark_device);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-gtk.c xemacs21-21.4.15/src/dialog-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-gtk.c	2001-04-13 03:23:33.000000000 +0900
++++ xemacs21-21.4.15/src/dialog-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -53,6 +53,14 @@
+ void
+ console_type_create_dialog_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_dialog_gtk ();
++}
++
++void
++console_type_reinit_dialog_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, make_dialog_box_internal);
+ }
+ 
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-msw.c xemacs21-21.4.15/src/dialog-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-msw.c	2002-08-20 20:36:47.000000000 +0900
++++ xemacs21-21.4.15/src/dialog-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -823,6 +823,14 @@
+ void
+ console_type_create_dialog_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_dialog_mswindows ();
++}
++
++void
++console_type_reinit_dialog_mswindows (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (mswindows, make_dialog_box_internal);
+ }
+ 
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-x.c xemacs21-21.4.15/src/dialog-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/dialog-x.c	2001-04-13 03:23:34.000000000 +0900
++++ xemacs21-21.4.15/src/dialog-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -305,6 +305,14 @@
+ void
+ console_type_create_dialog_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_dialog_x ();
++}
++
++void
++console_type_reinit_dialog_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, make_dialog_box_internal);
+ }
+ 
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/elhash.c xemacs21-21.4.15/src/elhash.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/elhash.c	2003-10-23 11:03:57.000000000 +0900
++++ xemacs21-21.4.15/src/elhash.c	2004-07-25 18:31:43.000000000 +0900
+@@ -788,6 +788,30 @@
+   structure_type_create_hash_table_structure_name (Qhashtable); /* compat */
+ }
+ 
++#ifdef __ia64__
++static void
++structure_type_reinit_hash_table_structure_name (Lisp_Object structure_name)
++{
++  struct structure_type *st;
++
++  st = reinit_structure_type (structure_name, 0, hash_table_instantiate);
++  reinit_structure_type_keyword (st, Qtest, hash_table_test_validate);
++  reinit_structure_type_keyword (st, Qsize, hash_table_size_validate);
++  reinit_structure_type_keyword (st, Qrehash_size, hash_table_rehash_size_validate);
++  reinit_structure_type_keyword (st, Qrehash_threshold, hash_table_rehash_threshold_validate);
++  reinit_structure_type_keyword (st, Qweakness, hash_table_weakness_validate);
++  reinit_structure_type_keyword (st, Qdata, hash_table_data_validate);
++
++  reinit_structure_type_keyword (st, Qtype, hash_table_weakness_validate);
++}
++
++void
++structure_type_reinit_hash_table (void)
++{
++  structure_type_reinit_hash_table_structure_name (Qhash_table);
++  structure_type_reinit_hash_table_structure_name (Qhashtable); /* compat */
++}
++#endif
+ 
+ /************************************************************************/
+ /*		Definition of Lisp-visible methods			*/
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/emacs.c xemacs21-21.4.15/src/emacs.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/emacs.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/emacs.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2320,6 +2320,136 @@
+ #ifdef HAVE_POSTGRESQL
+       init_postgresql_from_environment();
+ #endif
++
++#ifdef __ia64__
++      /* Reinitialize all function pointers.  */
++      console_type_reinit_stream ();
++
++#ifdef HAVE_TTY
++      console_type_reinit_tty ();
++      console_type_reinit_device_tty ();
++      console_type_reinit_frame_tty ();
++      console_type_reinit_objects_tty ();
++      console_type_reinit_redisplay_tty ();
++#endif
++#ifdef HAVE_GTK
++      console_type_reinit_gtk ();
++      console_type_reinit_select_gtk ();
++      console_type_reinit_device_gtk ();
++      console_type_reinit_dialog_gtk ();
++      console_type_reinit_frame_gtk ();
++      console_type_reinit_objects_gtk ();
++      console_type_reinit_glyphs_gtk ();
++      console_type_reinit_redisplay_gtk ();
++#ifdef HAVE_MENUBARS
++      console_type_reinit_menubar_gtk ();
++#endif
++#ifdef HAVE_SCROLLBARS
++      console_type_reinit_scrollbar_gtk ();
++#endif
++#ifdef HAVE_TOOLBARS
++      console_type_reinit_toolbar_gtk ();
++#endif
++#endif
++#ifdef HAVE_X_WINDOWS
++      console_type_reinit_x ();
++      console_type_reinit_device_x ();
++      console_type_reinit_frame_x ();
++      console_type_reinit_glyphs_x ();
++      console_type_reinit_select_x ();
++#ifdef HAVE_MENUBARS
++      console_type_reinit_menubar_x ();
++#endif
++      console_type_reinit_objects_x ();
++      console_type_reinit_redisplay_x ();
++#ifdef HAVE_SCROLLBARS
++      console_type_reinit_scrollbar_x ();
++#endif
++#ifdef HAVE_TOOLBARS
++      console_type_reinit_toolbar_x ();
++#endif
++#ifdef HAVE_DIALOGS
++      console_type_reinit_dialog_x ();
++#endif
++#endif /* HAVE_X_WINDOWS */
++
++#ifdef HAVE_MS_WINDOWS
++      console_type_reinit_mswindows ();
++      console_type_reinit_device_mswindows ();
++      console_type_reinit_frame_mswindows ();
++      console_type_reinit_objects_mswindows ();
++      console_type_reinit_redisplay_mswindows ();
++      console_type_reinit_glyphs_mswindows ();
++# ifdef HAVE_SCROLLBARS
++      console_type_reinit_scrollbar_mswindows ();
++# endif
++#ifdef HAVE_MENUBARS
++      console_type_reinit_menubar_mswindows ();
++#endif
++#ifdef HAVE_TOOLBARS
++      console_type_reinit_toolbar_mswindows ();
++#endif
++#ifdef HAVE_DIALOGS
++      console_type_reinit_dialog_mswindows ();
++#endif
++#endif
++
++      specifier_type_reinit ();
++
++      specifier_type_reinit_image ();
++      specifier_type_reinit_gutter ();
++      specifier_type_reinit_objects ();
++#ifdef HAVE_TOOLBARS
++      specifier_type_reinit_toolbar ();
++#endif
++
++      structure_type_reinit_chartab ();
++      structure_type_reinit_faces ();
++      structure_type_reinit_rangetab ();
++      structure_type_reinit_hash_table ();
++
++      image_instantiator_format_reinit ();
++      image_instantiator_format_reinit_glyphs_eimage ();
++      image_instantiator_format_reinit_glyphs_widget ();
++#ifdef HAVE_GTK
++      image_instantiator_format_reinit_glyphs_gtk ();
++#endif
++#ifdef HAVE_X_WINDOWS
++      image_instantiator_format_reinit_glyphs_x ();
++#endif /* HAVE_X_WINDOWS */
++#ifdef HAVE_MS_WINDOWS
++      image_instantiator_format_reinit_glyphs_mswindows ();
++#endif /* HAVE_MSWINDOWS_WINDOWS */
++
++      lstream_type_reinit ();
++#ifdef FILE_CODING
++      lstream_type_reinit_file_coding ();
++#endif
++#if defined (HAVE_MS_WINDOWS) && !defined(HAVE_MSG_SELECT)
++      lstream_type_reinit_mswindows_selectable ();
++#endif
++
++#ifdef HAVE_UNIX_PROCESSES
++      process_type_reinit_unix ();
++#endif
++#ifdef HAVE_WIN32_PROCESSES
++      process_type_reinit_nt ();
++#endif
++
++      specifier_reinit_glyphs ();
++      specifier_reinit_gutter ();
++#ifdef HAVE_MENUBARS
++      specifier_reinit_menubar ();
++#endif
++      specifier_reinit_redisplay ();
++#ifdef HAVE_SCROLLBARS
++      specifier_reinit_scrollbar ();
++#endif
++#ifdef HAVE_TOOLBARS
++      specifier_reinit_toolbar ();
++#endif
++      specifier_reinit_window ();
++#endif /* __ia64__ */
+     }
+ 
+   /* Now do further initialization/setup of stuff that is not needed by the
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/event-msw.c xemacs21-21.4.15/src/event-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/event-msw.c	2003-10-24 12:49:57.000000000 +0900
++++ xemacs21-21.4.15/src/event-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -4284,6 +4284,14 @@
+ void
+ lstream_type_create_mswindows_selectable (void)
+ {
++#ifdef __ia64__
++  lstream_type_reinit_mswindows_selectable ();
++}
++
++void
++lstream_type_reinit_mswindows_selectable (void);
++}
++#endif
+   init_slurp_stream ();
+   init_shove_stream ();
+ #if defined (HAVE_SOCKETS) && !defined (HAVE_MSG_SELECT)
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/faces.c xemacs21-21.4.15/src/faces.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/faces.c	2001-04-13 03:23:43.000000000 +0900
++++ xemacs21-21.4.15/src/faces.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1870,6 +1870,18 @@
+   define_structure_type_keyword (st, Qname, face_name_validate);
+ }
+ 
++#ifdef __ia64__
++void
++structure_type_reinit_faces (void)
++{
++  struct structure_type *st;
++
++  st = reinit_structure_type (Qface, face_validate, face_instantiate);
++
++  reinit_structure_type_keyword (st, Qname, face_name_validate);
++}
++#endif
++
+ void
+ vars_of_faces (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/file-coding.c xemacs21-21.4.15/src/file-coding.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/file-coding.c	2002-11-01 00:07:50.000000000 +0900
++++ xemacs21-21.4.15/src/file-coding.c	2004-07-25 18:31:43.000000000 +0900
+@@ -5732,6 +5732,14 @@
+ void
+ lstream_type_create_file_coding (void)
+ {
++#ifdef __ia64__
++  lstream_type_reinit_file_coding ();
++}
++
++void
++lstream_type_reinit_file_coding (void)
++{
++#endif
+   LSTREAM_HAS_METHOD (decoding, reader);
+   LSTREAM_HAS_METHOD (decoding, writer);
+   LSTREAM_HAS_METHOD (decoding, rewinder);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/frame-gtk.c xemacs21-21.4.15/src/frame-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/frame-gtk.c	2001-10-23 17:35:33.000000000 +0900
++++ xemacs21-21.4.15/src/frame-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1410,6 +1410,14 @@
+ void
+ console_type_create_frame_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_frame_gtk ();
++}
++
++void
++console_type_reinit_frame_gtk (void)
++{
++#endif
+   /* frame methods */
+   CONSOLE_HAS_METHOD (gtk, init_frame_1);
+   CONSOLE_HAS_METHOD (gtk, init_frame_2);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/frame-msw.c xemacs21-21.4.15/src/frame-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/frame-msw.c	2003-03-20 12:53:37.000000000 +0900
++++ xemacs21-21.4.15/src/frame-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1064,6 +1064,14 @@
+ void
+ console_type_create_frame_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_frame_mswindows ();
++}
++
++void
++console_type_reinit_frame_mswindows (void)
++{
++#endif
+   /* Display frames */
+   CONSOLE_HAS_METHOD (mswindows, init_frame_1);
+   CONSOLE_HAS_METHOD (mswindows, init_frame_2);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/frame-tty.c xemacs21-21.4.15/src/frame-tty.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/frame-tty.c	2001-04-13 03:23:47.000000000 +0900
++++ xemacs21-21.4.15/src/frame-tty.c	2004-07-25 18:31:43.000000000 +0900
+@@ -188,6 +188,14 @@
+ void
+ console_type_create_frame_tty (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_frame_tty ();
++}
++
++void
++console_type_reinit_frame_tty (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (tty, init_frame_1);
+   CONSOLE_HAS_METHOD (tty, init_frame_3);
+   CONSOLE_HAS_METHOD (tty, after_init_frame);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/frame-x.c xemacs21-21.4.15/src/frame-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/frame-x.c	2003-10-24 12:49:57.000000000 +0900
++++ xemacs21-21.4.15/src/frame-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2796,6 +2796,14 @@
+ void
+ console_type_create_frame_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_frame_x ();
++}
++
++void
++console_type_reinit_frame_x (void)
++{
++#endif
+   /* frame methods */
+   CONSOLE_HAS_METHOD (x, init_frame_1);
+   CONSOLE_HAS_METHOD (x, init_frame_2);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-eimage.c xemacs21-21.4.15/src/glyphs-eimage.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-eimage.c	2003-02-01 10:11:47.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs-eimage.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1375,8 +1375,54 @@
+   IIFORMAT_VALID_KEYWORD (tiff, Q_data, check_valid_string);
+   IIFORMAT_VALID_KEYWORD (tiff, Q_file, check_valid_string);
+ #endif
++}
++
++#ifdef __ia64__
++void
++image_instantiator_format_reinit_glyphs_eimage (void)
++{
++  /* image-instantiator types */
++#ifdef HAVE_JPEG
++  IIFORMAT_HAS_METHOD (jpeg, validate);
++  IIFORMAT_HAS_METHOD (jpeg, normalize);
++  IIFORMAT_HAS_METHOD (jpeg, possible_dest_types);
++  IIFORMAT_HAS_METHOD (jpeg, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (jpeg, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (jpeg, Q_file, check_valid_string);
++#endif
++
++#ifdef HAVE_GIF
++  IIFORMAT_HAS_METHOD (gif, validate);
++  IIFORMAT_HAS_METHOD (gif, normalize);
++  IIFORMAT_HAS_METHOD (gif, possible_dest_types);
++  IIFORMAT_HAS_METHOD (gif, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (gif, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (gif, Q_file, check_valid_string);
++#endif
++
++#ifdef HAVE_PNG
++  IIFORMAT_HAS_METHOD (png, validate);
++  IIFORMAT_HAS_METHOD (png, normalize);
++  IIFORMAT_HAS_METHOD (png, possible_dest_types);
++  IIFORMAT_HAS_METHOD (png, instantiate);
+ 
++  IIFORMAT_REINIT_KEYWORD (png, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (png, Q_file, check_valid_string);
++#endif
++
++#ifdef HAVE_TIFF
++  IIFORMAT_HAS_METHOD (tiff, validate);
++  IIFORMAT_HAS_METHOD (tiff, normalize);
++  IIFORMAT_HAS_METHOD (tiff, possible_dest_types);
++  IIFORMAT_HAS_METHOD (tiff, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (tiff, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (tiff, Q_file, check_valid_string);
++#endif
+ }
++#endif /* __ia64__ */
+ 
+ void
+ vars_of_glyphs_eimage (void)
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-gtk.c xemacs21-21.4.15/src/glyphs-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-gtk.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2586,6 +2586,14 @@
+ void
+ console_type_create_glyphs_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_glyphs_gtk ();
++}
++
++void
++console_type_reinit_glyphs_gtk (void)
++{
++#endif
+   /* image methods */
+   CONSOLE_HAS_METHOD (gtk, print_image_instance);
+   CONSOLE_HAS_METHOD (gtk, finalize_image_instance);
+@@ -2722,6 +2730,78 @@
+   IIFORMAT_VALID_KEYWORD (autodetect, Q_data, check_valid_string);
+ }
+ 
++#ifdef __ia64__
++void
++image_instantiator_format_reinit_glyphs_gtk (void)
++{
++#ifdef HAVE_XPM
++  IIFORMAT_HAS_DEVMETHOD (gtk, xpm, instantiate);
++#endif
++
++  IIFORMAT_HAS_DEVMETHOD (gtk, subwindow, instantiate);
++
++#ifdef HAVE_WIDGETS
++  IIFORMAT_HAS_DEVMETHOD (gtk, native_layout, instantiate);
++
++  IIFORMAT_HAS_DEVMETHOD (gtk, button, property);
++  IIFORMAT_HAS_DEVMETHOD (gtk, button, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (gtk, button, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (gtk, widget, property);
++
++  IIFORMAT_HAS_DEVMETHOD (gtk, progress_gauge, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (gtk, progress_gauge, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (gtk, edit_field, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (gtk, combo_box, instantiate);
++  IIFORMAT_HAS_SHARED_DEVMETHOD (gtk, combo_box, redisplay, tab_control);
++  IIFORMAT_HAS_DEVMETHOD (gtk, tab_control, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (gtk, tab_control, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (gtk, label, instantiate);
++#endif
++
++  IIFORMAT_HAS_METHOD (cursor_font, validate);
++  IIFORMAT_HAS_METHOD (cursor_font, possible_dest_types);
++  IIFORMAT_HAS_METHOD (cursor_font, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_background, check_valid_string);
++
++  IIFORMAT_HAS_METHOD (font, validate);
++  IIFORMAT_HAS_METHOD (font, possible_dest_types);
++  IIFORMAT_HAS_METHOD (font, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (font, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (font, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (font, Q_background, check_valid_string);
++
++#ifdef HAVE_XPM
++  IIFORMAT_HAS_DEVMETHOD (gtk, xpm, instantiate);
++#endif
++
++#ifdef HAVE_XFACE
++  IIFORMAT_HAS_DEVMETHOD (gtk, xface, instantiate);
++#endif
++
++  IIFORMAT_HAS_DEVMETHOD (gtk, xbm, instantiate);
++
++  IIFORMAT_HAS_METHOD (gtk_resource, validate);
++  IIFORMAT_HAS_METHOD (gtk_resource, normalize);
++  IIFORMAT_HAS_METHOD (gtk_resource, possible_dest_types);
++  IIFORMAT_HAS_METHOD (gtk_resource, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (gtk_resource, Q_resource_type, check_valid_resource_symbol);
++  IIFORMAT_REINIT_KEYWORD (gtk_resource, Q_resource_id, check_valid_resource_id);
++  IIFORMAT_REINIT_KEYWORD (gtk_resource, Q_file, check_valid_string);
++
++  IIFORMAT_HAS_METHOD (autodetect, validate);
++  IIFORMAT_HAS_METHOD (autodetect, normalize);
++  IIFORMAT_HAS_METHOD (autodetect, possible_dest_types);
++  IIFORMAT_HAS_METHOD (autodetect, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (autodetect, Q_data, check_valid_string);
++}
++#endif
++
+ void
+ vars_of_glyphs_gtk (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-msw.c xemacs21-21.4.15/src/glyphs-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-msw.c	2002-11-01 00:08:09.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -3231,6 +3231,14 @@
+ void
+ console_type_create_glyphs_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_glyphs_mswindows ();
++}
++
++void
++console_type_reinit_glyphs_mswindows (void)
++{
++#endif
+   /* image methods - display */
+   CONSOLE_HAS_METHOD (mswindows, print_image_instance);
+   CONSOLE_HAS_METHOD (mswindows, finalize_image_instance);
+@@ -3358,6 +3366,32 @@
+   IIFORMAT_VALID_CONSOLE2 (mswindows, msprinter, mswindows_resource);
+ }
+ 
++#ifdef __ia64__
++void
++image_instantiator_format_reinit_glyphs_mswindows (void)
++{
++  /* image-instantiator types */
++
++  IIFORMAT_HAS_METHOD (bmp, validate);
++  IIFORMAT_HAS_METHOD (bmp, normalize);
++  IIFORMAT_HAS_METHOD (bmp, possible_dest_types);
++  IIFORMAT_HAS_METHOD (bmp, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (bmp, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (bmp, Q_file, check_valid_string);
++
++  IIFORMAT_HAS_METHOD (mswindows_resource, validate);
++  IIFORMAT_HAS_METHOD (mswindows_resource, normalize);
++  IIFORMAT_HAS_METHOD (mswindows_resource, possible_dest_types);
++  IIFORMAT_HAS_METHOD (mswindows_resource, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (mswindows_resource, Q_resource_type, 
++			  check_valid_resource_symbol);
++  IIFORMAT_REINIT_KEYWORD (mswindows_resource, Q_resource_id, check_valid_resource_id);
++  IIFORMAT_REINIT_KEYWORD (mswindows_resource, Q_file, check_valid_string);
++}
++#endif /* __ia64__ */
++
+ void
+ vars_of_glyphs_mswindows (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-widget.c xemacs21-21.4.15/src/glyphs-widget.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-widget.c	2002-11-07 15:04:44.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs-widget.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1713,10 +1713,58 @@
+   IIFORMAT_VALID_KEYWORD (type, Q_face, check_valid_face);		      \
+ } while (0)
+ 
++#ifdef __ia64__
++#define REINIT_GUI_KEYWORDS(type) do {					\
++  IIFORMAT_REINIT_KEYWORD (type, Q_active, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_suffix, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_keys, check_valid_string);		\
++  IIFORMAT_REINIT_KEYWORD (type, Q_style, check_valid_symbol);		\
++  IIFORMAT_REINIT_KEYWORD (type, Q_selected, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_filter, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_config, check_valid_symbol);		\
++  IIFORMAT_REINIT_KEYWORD (type, Q_included, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_initial_focus, check_valid_anything); \
++  IIFORMAT_REINIT_KEYWORD (type, Q_key_sequence, check_valid_string);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_accelerator, check_valid_string);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_label, check_valid_anything);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_callback, check_valid_callback);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_callback_ex, check_valid_callback);	\
++  IIFORMAT_REINIT_KEYWORD (type, Q_descriptor,				\
++			   check_valid_string_or_vector);		\
++} while (0)
++
++#define REINIT_WIDGET_KEYWORDS(type) do {				\
++  IIFORMAT_REINIT_KEYWORD (type, Q_width, check_valid_int);		\
++  IIFORMAT_REINIT_KEYWORD (type, Q_height, check_valid_int);		\
++  IIFORMAT_REINIT_KEYWORD (type, Q_pixel_width, check_valid_int_or_function); \
++  IIFORMAT_REINIT_KEYWORD (type, Q_pixel_height, check_valid_int_or_function); \
++  IIFORMAT_REINIT_KEYWORD (type, Q_face, check_valid_face);		\
++} while (0)
++
++static void image_instantiator_reinit_widget (void);
++static void image_instantiator_reinit_buttons (void);
++static void image_instantiator_reinit_edit_fields (void);
++static void image_instantiator_reinit_combo_box (void);
++static void image_instantiator_reinit_scrollbar (void);
++static void image_instantiator_reinit_progress_guage (void);
++static void image_instantiator_reinit_tree_view (void);
++static void image_instantiator_reinit_tab_control (void);
++static void image_instantiator_reinit_labels (void);
++static void image_instantiator_reinit_layout (void);
++static void image_instantiator_reinit_native_layout (void);
++#endif
+ 
+ static void image_instantiator_widget (void)
+ { /* we only do this for properties */
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT_NO_SYM (widget, "widget");
++#ifdef __ia64__
++  image_instantiator_reinit_widget ();
++}
++
++static void
++image_instantiator_reinit_widget (void)
++{
++#endif
+   IIFORMAT_HAS_METHOD (widget, property);
+   IIFORMAT_HAS_METHOD (widget, update);
+   IIFORMAT_HAS_METHOD (widget, query_geometry);
+@@ -1739,6 +1787,24 @@
+   VALID_GUI_KEYWORDS (button);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_buttons (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (button, validate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (button, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (button, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (button, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (button, normalize, widget);
++  IIFORMAT_HAS_SHARED_METHOD (button, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (button, query_geometry);
++  IIFORMAT_REINIT_KEYWORD (button,
++			   Q_image, check_valid_instantiator);
++  REINIT_WIDGET_KEYWORDS (button);
++  REINIT_GUI_KEYWORDS (button);
++}
++#endif
++
+ static void image_instantiator_edit_fields (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (edit_field, "edit-field");
+@@ -1752,6 +1818,20 @@
+   VALID_GUI_KEYWORDS (edit_field);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_edit_fields (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (edit_field, validate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (edit_field, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (edit_field, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (edit_field, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (edit_field, governing_domain, subwindow);
++  REINIT_WIDGET_KEYWORDS (edit_field);
++  REINIT_GUI_KEYWORDS (edit_field);
++}
++#endif
++
+ static void image_instantiator_combo_box (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (combo_box, "combo-box");
+@@ -1769,6 +1849,25 @@
+   IIFORMAT_VALID_KEYWORD (combo_box, Q_items, check_valid_item_list);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_combo_box (void)
++{
++  IIFORMAT_HAS_METHOD (combo_box, validate);
++  IIFORMAT_HAS_SHARED_METHOD (combo_box, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (combo_box, governing_domain, subwindow);
++
++  REINIT_GUI_KEYWORDS (combo_box);
++
++  IIFORMAT_REINIT_KEYWORD (combo_box, Q_width, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (combo_box, Q_height, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (combo_box, Q_pixel_width,
++			   check_valid_int_or_function);
++  IIFORMAT_REINIT_KEYWORD (combo_box, Q_face, check_valid_face);
++  IIFORMAT_REINIT_KEYWORD (combo_box, Q_items, check_valid_item_list);
++}
++#endif
++
+ static void image_instantiator_scrollbar (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (scrollbar, "scrollbar");
+@@ -1786,6 +1885,25 @@
+   IIFORMAT_VALID_KEYWORD (scrollbar, Q_face, check_valid_face);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_scrollbar (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (scrollbar, validate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (scrollbar, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (scrollbar, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (scrollbar, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (scrollbar, governing_domain, subwindow);
++  REINIT_GUI_KEYWORDS (scrollbar);
++
++  IIFORMAT_REINIT_KEYWORD (scrollbar, Q_pixel_width,
++			   check_valid_int_or_function);
++  IIFORMAT_REINIT_KEYWORD (scrollbar, Q_pixel_height,
++			   check_valid_int_or_function);
++  IIFORMAT_REINIT_KEYWORD (scrollbar, Q_face, check_valid_face);
++}
++#endif
++
+ static void image_instantiator_progress_guage (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (progress_gauge, "progress-gauge");
+@@ -1800,6 +1918,22 @@
+   IIFORMAT_VALID_KEYWORD (progress_gauge, Q_value, check_valid_int);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_progress_guage (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (progress_gauge, validate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (progress_gauge, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (progress_gauge, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (progress_gauge, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (progress_gauge, governing_domain, subwindow);
++  REINIT_WIDGET_KEYWORDS (progress_gauge);
++  REINIT_GUI_KEYWORDS (progress_gauge);
++
++  IIFORMAT_REINIT_KEYWORD (progress_gauge, Q_value, check_valid_int);
++}
++#endif
++
+ static void image_instantiator_tree_view (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (tree_view, "tree-view");
+@@ -1814,6 +1948,22 @@
+   IIFORMAT_VALID_KEYWORD (tree_view, Q_items, check_valid_item_list);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_tree_view (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (tree_view, validate, combo_box);
++  IIFORMAT_HAS_SHARED_METHOD (tree_view, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tree_view, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tree_view, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tree_view, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (tree_view, query_geometry);
++  REINIT_WIDGET_KEYWORDS (tree_view);
++  REINIT_GUI_KEYWORDS (tree_view);
++  IIFORMAT_REINIT_KEYWORD (tree_view, Q_items, check_valid_item_list);
++}
++#endif
++
+ static void image_instantiator_tab_control (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (tab_control, "tab-control");
+@@ -1830,6 +1980,24 @@
+   IIFORMAT_VALID_KEYWORD (tab_control, Q_items, check_valid_item_list);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_tab_control (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (tab_control, validate, combo_box);
++  IIFORMAT_HAS_SHARED_METHOD (tab_control, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tab_control, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tab_control, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (tab_control, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (tab_control, query_geometry);
++  REINIT_WIDGET_KEYWORDS (tab_control);
++  REINIT_GUI_KEYWORDS (tab_control);
++  IIFORMAT_REINIT_KEYWORD (tab_control, Q_orientation,
++			   check_valid_tab_orientation);
++  IIFORMAT_REINIT_KEYWORD (tab_control, Q_items, check_valid_item_list);
++}
++#endif
++
+ static void image_instantiator_labels (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (label, "label");
+@@ -1841,6 +2009,19 @@
+   IIFORMAT_VALID_KEYWORD (label, Q_descriptor, check_valid_string);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_labels (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (label, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (label, instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (label, post_instantiate, widget);
++  IIFORMAT_HAS_SHARED_METHOD (label, governing_domain, subwindow);
++  REINIT_WIDGET_KEYWORDS (label);
++  IIFORMAT_REINIT_KEYWORD (label, Q_descriptor, check_valid_string);
++}
++#endif
++
+ #define VALID_LAYOUT_KEYWORDS(layout)					   \
+   VALID_WIDGET_KEYWORDS (layout);					   \
+   IIFORMAT_VALID_KEYWORD (layout, Q_orientation, check_valid_orientation); \
+@@ -1852,6 +2033,17 @@
+   IIFORMAT_VALID_KEYWORD (layout, Q_items,				   \
+ 			  check_valid_instantiator_list)
+ 
++#ifdef __ia64__
++#define REINIT_LAYOUT_KEYWORDS(layout)					    \
++  REINIT_WIDGET_KEYWORDS (layout);					    \
++  IIFORMAT_REINIT_KEYWORD (layout, Q_orientation, check_valid_orientation); \
++  IIFORMAT_REINIT_KEYWORD (layout, Q_justify, check_valid_justification);   \
++  IIFORMAT_REINIT_KEYWORD (layout, Q_border, check_valid_border);	    \
++  IIFORMAT_REINIT_KEYWORD (layout, Q_margin_width, check_valid_int);	    \
++  IIFORMAT_REINIT_KEYWORD (layout, Q_items,				    \
++			   check_valid_instantiator_list)
++#endif
++
+ static void image_instantiator_layout (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (layout, "layout");
+@@ -1869,6 +2061,25 @@
+   VALID_LAYOUT_KEYWORDS (layout);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_layout (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (layout, possible_dest_types, widget);
++  IIFORMAT_HAS_METHOD (layout, instantiate);
++  IIFORMAT_HAS_METHOD (layout, post_instantiate);
++  IIFORMAT_HAS_SHARED_METHOD (layout, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (layout, normalize);
++  IIFORMAT_HAS_METHOD (layout, query_geometry);
++  IIFORMAT_HAS_METHOD (layout, layout);
++  IIFORMAT_HAS_METHOD (layout, update);
++  IIFORMAT_HAS_METHOD (layout, property);
++
++  REINIT_GUI_KEYWORDS (layout);
++  REINIT_LAYOUT_KEYWORDS (layout);
++}
++#endif
++
+ static void image_instantiator_native_layout (void)
+ {
+   INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (native_layout, "native-layout");
+@@ -1886,6 +2097,25 @@
+   VALID_LAYOUT_KEYWORDS (native_layout);
+ }
+ 
++#ifdef __ia64__
++static void
++image_instantiator_reinit_native_layout (void)
++{
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, possible_dest_types, widget);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, instantiate, layout);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, post_instantiate, layout);
++  IIFORMAT_HAS_METHOD (native_layout, layout);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, governing_domain, subwindow);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, normalize, layout);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, query_geometry, layout);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, layout, layout);
++  IIFORMAT_HAS_SHARED_METHOD (native_layout, property, layout);
++
++  REINIT_GUI_KEYWORDS (native_layout);
++  REINIT_LAYOUT_KEYWORDS (native_layout);
++}
++#endif
++
+ void
+ image_instantiator_format_create_glyphs_widget (void)
+ {
+@@ -1902,6 +2132,24 @@
+   image_instantiator_native_layout();
+ }
+ 
++#ifdef __ia64__
++void
++image_instantiator_format_reinit_glyphs_widget (void)
++{
++  image_instantiator_reinit_widget();
++  image_instantiator_reinit_buttons();
++  image_instantiator_reinit_edit_fields();
++  image_instantiator_reinit_combo_box();
++  image_instantiator_reinit_scrollbar();
++  image_instantiator_reinit_progress_guage();
++  image_instantiator_reinit_tree_view();
++  image_instantiator_reinit_tab_control();
++  image_instantiator_reinit_labels();
++  image_instantiator_reinit_layout();
++  image_instantiator_reinit_native_layout();
++}
++#endif
++
+ void
+ reinit_vars_of_glyphs_widget (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-x.c xemacs21-21.4.15/src/glyphs-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs-x.c	2002-11-01 00:08:15.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2892,6 +2892,14 @@
+ void
+ console_type_create_glyphs_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_glyphs_x ();
++}
++
++void
++console_type_reinit_glyphs_x (void)
++{
++#endif
+   /* image methods */
+ 
+   CONSOLE_HAS_METHOD (x, print_image_instance);
+@@ -3022,6 +3030,64 @@
+   IIFORMAT_VALID_KEYWORD (autodetect, Q_data, check_valid_string);
+ }
+ 
++#ifdef __ia64__
++void
++image_instantiator_format_reinit_glyphs_x (void)
++{
++#ifdef HAVE_XPM
++  IIFORMAT_HAS_DEVMETHOD (x, xpm, instantiate);
++#endif
++  IIFORMAT_HAS_DEVMETHOD (x, xbm, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (x, subwindow, instantiate);
++#ifdef HAVE_WIDGETS
++  IIFORMAT_HAS_DEVMETHOD (x, native_layout, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (x, button, property);
++  IIFORMAT_HAS_DEVMETHOD (x, button, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (x, button, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (x, widget, property);
++  IIFORMAT_HAS_DEVMETHOD (x, progress_gauge, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (x, progress_gauge, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (x, edit_field, instantiate);
++#if defined (LWLIB_WIDGETS_MOTIF) && XmVERSION > 1
++  IIFORMAT_HAS_DEVMETHOD (x, combo_box, instantiate);
++  IIFORMAT_HAS_SHARED_DEVMETHOD (x, combo_box, redisplay, tab_control);
++#endif
++  IIFORMAT_HAS_DEVMETHOD (x, tab_control, instantiate);
++  IIFORMAT_HAS_DEVMETHOD (x, tab_control, redisplay);
++  IIFORMAT_HAS_DEVMETHOD (x, label, instantiate);
++#endif
++
++  IIFORMAT_HAS_METHOD (cursor_font, validate);
++  IIFORMAT_HAS_METHOD (cursor_font, possible_dest_types);
++  IIFORMAT_HAS_METHOD (cursor_font, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (cursor_font, Q_background, check_valid_string);
++
++  IIFORMAT_HAS_METHOD (font, validate);
++  IIFORMAT_HAS_METHOD (font, possible_dest_types);
++  IIFORMAT_HAS_METHOD (font, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (font, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (font, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (font, Q_background, check_valid_string);
++
++#ifdef HAVE_XFACE
++  IIFORMAT_HAS_DEVMETHOD (x, xface, instantiate);
++#endif
++
++  IIFORMAT_HAS_METHOD (autodetect, validate);
++  IIFORMAT_HAS_METHOD (autodetect, normalize);
++  IIFORMAT_HAS_METHOD (autodetect, possible_dest_types);
++
++  IIFORMAT_HAS_SHARED_METHOD (autodetect, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (autodetect, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (autodetect, Q_data, check_valid_string);
++}
++#endif /* __ia64__ */
++
+ void
+ vars_of_glyphs_x (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs.c xemacs21-21.4.15/src/glyphs.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs.c	2003-01-03 18:59:46.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs.c	2004-07-25 18:31:43.000000000 +0900
+@@ -5100,6 +5100,14 @@
+ 
+   INITIALIZE_SPECIFIER_TYPE_WITH_DATA (image, "image", "imagep");
+ 
++#ifdef __ia64__
++  specifier_type_reinit_image ();
++}
++
++void
++specifier_type_reinit_image (void)
++{
++#endif
+   SPECIFIER_HAS_METHOD (image, create);
+   SPECIFIER_HAS_METHOD (image, mark);
+   SPECIFIER_HAS_METHOD (image, instantiate);
+@@ -5280,6 +5288,84 @@
+ #endif /* HAVE_XPM */
+ }
+ 
++#ifdef __ia64__
++void
++image_instantiator_format_reinit (void)
++{
++  IIFORMAT_HAS_METHOD (nothing, possible_dest_types);
++  IIFORMAT_HAS_METHOD (nothing, instantiate);
++
++  IIFORMAT_HAS_METHOD (inherit, validate);
++  IIFORMAT_HAS_METHOD (inherit, normalize);
++  IIFORMAT_HAS_METHOD (inherit, possible_dest_types);
++  IIFORMAT_HAS_METHOD (inherit, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (inherit, Q_face, check_valid_face);
++
++  IIFORMAT_HAS_METHOD (string, validate);
++  IIFORMAT_HAS_SHARED_METHOD (string, governing_domain, subwindow);
++  IIFORMAT_HAS_METHOD (string, possible_dest_types);
++  IIFORMAT_HAS_METHOD (string, instantiate);
++
++  IIFORMAT_REINIT_KEYWORD (string, Q_data, check_valid_string);
++
++  IIFORMAT_HAS_METHOD (text, update);
++  IIFORMAT_HAS_METHOD (text, query_geometry);
++
++  IIFORMAT_HAS_METHOD (formatted_string, validate);
++  IIFORMAT_HAS_METHOD (formatted_string, possible_dest_types);
++  IIFORMAT_HAS_METHOD (formatted_string, instantiate);
++  IIFORMAT_REINIT_KEYWORD (formatted_string, Q_data, check_valid_string);
++
++  IIFORMAT_HAS_SHARED_METHOD (pointer, query_geometry, subwindow);
++
++  IIFORMAT_HAS_METHOD (subwindow, possible_dest_types);
++  IIFORMAT_HAS_METHOD (subwindow, governing_domain);
++  IIFORMAT_HAS_METHOD (subwindow, instantiate);
++  IIFORMAT_HAS_METHOD (subwindow, query_geometry);
++  IIFORMAT_REINIT_KEYWORD (subwindow, Q_pixel_width, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (subwindow, Q_pixel_height, check_valid_int);
++
++#ifdef HAVE_WINDOW_SYSTEM
++  IIFORMAT_HAS_METHOD (xbm, validate);
++  IIFORMAT_HAS_METHOD (xbm, normalize);
++  IIFORMAT_HAS_METHOD (xbm, possible_dest_types);
++
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_data, check_valid_xbm_inline);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_file, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_mask_data, check_valid_xbm_inline);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_mask_file, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_hotspot_x, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_hotspot_y, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xbm, Q_background, check_valid_string);
++#endif /* HAVE_WINDOW_SYSTEM */
++
++#ifdef HAVE_XFACE
++  IIFORMAT_HAS_METHOD (xface, validate);
++  IIFORMAT_HAS_METHOD (xface, normalize);
++  IIFORMAT_HAS_METHOD (xface, possible_dest_types);
++
++  IIFORMAT_REINIT_KEYWORD (xface, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xface, Q_file, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xface, Q_hotspot_x, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (xface, Q_hotspot_y, check_valid_int);
++  IIFORMAT_REINIT_KEYWORD (xface, Q_foreground, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xface, Q_background, check_valid_string);
++#endif
++
++#ifdef HAVE_XPM
++  IIFORMAT_HAS_METHOD (xpm, validate);
++  IIFORMAT_HAS_METHOD (xpm, normalize);
++  IIFORMAT_HAS_METHOD (xpm, possible_dest_types);
++
++  IIFORMAT_REINIT_KEYWORD (xpm, Q_data, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xpm, Q_file, check_valid_string);
++  IIFORMAT_REINIT_KEYWORD (xpm, Q_color_symbols, check_valid_xpm_color_symbols);
++#endif /* HAVE_XPM */
++}
++#endif
++
+ void
+ reinit_vars_of_glyphs (void)
+ {
+@@ -5435,6 +5521,15 @@
+ 			 0, 0, 0);
+ }
+ 
++#ifdef __ia64__
++void
++specifier_reinit_glyphs (void)
++{
++  reinit_specifier_caching (Vcurrent_display_table,
++			    some_window_value_changed, 0);
++}
++#endif
++
+ void
+ complex_vars_of_glyphs (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs.h xemacs21-21.4.15/src/glyphs.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/glyphs.h	2002-11-01 00:08:19.000000000 +0900
++++ xemacs21-21.4.15/src/glyphs.h	2004-07-25 18:31:43.000000000 +0900
+@@ -267,6 +267,22 @@
+ 		entry);						\
+   } while (0)
+ 
++#ifdef __ia64__
++#define IIFORMAT_REINIT_KEYWORD(format, keyw, validate_fun)		\
++  do {									\
++    int j;								\
++    struct image_instantiator_methods *meths;				\
++									\
++    meths = format##_image_instantiator_methods;			\
++    for (j = 0; j < Dynarr_length (meths->keywords); j++)		\
++      if (EQ (keyw, Dynarr_at (meths->keywords, j).keyword))		\
++	{								\
++	  Dynarr_at (meths->keywords, j).validate = validate_fun;	\
++	  break;							\
++	}								\
++  } while (0)
++#endif
++
+ #define IIFORMAT_VALID_KEYWORD(format, keyw, validate_fun)	\
+ IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, 1, 0)
+ 
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/gutter.c xemacs21-21.4.15/src/gutter.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/gutter.c	2002-08-20 20:37:31.000000000 +0900
++++ xemacs21-21.4.15/src/gutter.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1168,6 +1168,19 @@
+   SPECIFIER_HAS_METHOD (gutter_visible, validate);
+ }
+ 
++#ifdef __ia64__
++void
++specifier_type_reinit_gutter (void)
++{
++  SPECIFIER_HAS_METHOD (gutter, validate);
++  SPECIFIER_HAS_METHOD (gutter, after_change);
++
++  SPECIFIER_HAS_METHOD (gutter_size, validate);
++
++  SPECIFIER_HAS_METHOD (gutter_visible, validate);
++}
++#endif
++
+ void
+ reinit_specifier_type_create_gutter (void)
+ {
+@@ -1608,3 +1621,50 @@
+   set_specifier_fallback (Vgutter_visible_p[LEFT_GUTTER],   fb);
+   set_specifier_fallback (Vgutter_visible_p[RIGHT_GUTTER],  fb);
+ }
++
++#ifdef __ia64
++void
++specifier_reinit_gutter (void)
++{
++  reinit_specifier_caching (Vgutter[TOP_GUTTER],
++			    top_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter[BOTTOM_GUTTER],
++			    bottom_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter[LEFT_GUTTER],
++			    left_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter_visible_p[RIGHT_GUTTER],
++			    right_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vdefault_gutter_height,
++			    default_gutter_size_changed_in_window, 0);
++  reinit_specifier_caching (Vdefault_gutter_width,
++			    default_gutter_size_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_size[TOP_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_size[BOTTOM_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_size[LEFT_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_size[RIGHT_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vdefault_gutter_border_width,
++			    default_gutter_border_width_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_border_width[TOP_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_border_width[BOTTOM_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_border_width[LEFT_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_border_width[RIGHT_GUTTER],
++			    gutter_geometry_changed_in_window, 0);
++  reinit_specifier_caching (Vdefault_gutter_visible_p,
++			    default_gutter_visible_p_changed_in_window, 0);
++  reinit_specifier_caching (Vgutter_visible_p[TOP_GUTTER],
++			    top_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter_visible_p[BOTTOM_GUTTER],
++			    bottom_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter_visible_p[LEFT_GUTTER],
++			    left_gutter_specs_changed, 0);
++  reinit_specifier_caching (Vgutter_visible_p[RIGHT_GUTTER],
++			    right_gutter_specs_changed, 0);
++}
++#endif
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/lisp.h xemacs21-21.4.15/src/lisp.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/lisp.h	2003-03-21 12:36:27.000000000 +0900
++++ xemacs21-21.4.15/src/lisp.h	2004-07-25 18:31:43.000000000 +0900
+@@ -1628,6 +1628,20 @@
+ 						     Lisp_Object value,
+ 						     Error_behavior errb));
+ 
++#ifdef __ia64__
++struct structure_type *reinit_structure_type (Lisp_Object type,
++					      int (*validate)
++					      (Lisp_Object data,
++					       Error_behavior errb),
++					      Lisp_Object (*instantiate)
++					      (Lisp_Object data));
++void reinit_structure_type_keyword (struct structure_type *st,
++				    Lisp_Object keyword,
++				    int (*validate) (Lisp_Object keyword,
++						     Lisp_Object value,
++						     Error_behavior errb));
++#endif
++
+ /*---------------------------- weak lists ------------------------------*/
+ 
+ enum weak_list_type
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/lread.c xemacs21-21.4.15/src/lread.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/lread.c	2002-08-12 23:56:39.000000000 +0900
++++ xemacs21-21.4.15/src/lread.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2096,6 +2096,49 @@
+   Dynarr_add (st->keywords, en);
+ }
+ 
++#ifdef __ia64__
++struct structure_type *
++reinit_structure_type (Lisp_Object type,
++		       int (*validate) (Lisp_Object data,
++					Error_behavior errb),
++		       Lisp_Object (*instantiate) (Lisp_Object data))
++{
++  int i;
++
++  for (i = 0; i < Dynarr_length (the_structure_type_dynarr); i++)
++    {
++      struct structure_type *st = Dynarr_atp (the_structure_type_dynarr, i);
++      if (EQ (st->type, type))
++	{
++	  st->validate = validate;
++	  st->instantiate = instantiate;
++	  return st;
++	}
++    }
++
++  return 0;
++}
++
++void
++reinit_structure_type_keyword (struct structure_type *st, Lisp_Object keyword,
++			       int (*validate) (Lisp_Object keyword,
++						Lisp_Object value,
++						Error_behavior errb))
++{
++  int i;
++
++  for (i = 0; i < Dynarr_length (st->keywords); i++)
++    {
++      struct structure_keyword_entry *en = Dynarr_atp (st->keywords, i);
++      if (EQ (en->keyword, keyword))
++	{
++	  en->validate = validate;
++	  break;
++	}
++    }
++}
++#endif
++
+ static struct structure_type *
+ recognized_structure_type (Lisp_Object type)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/lstream.c xemacs21-21.4.15/src/lstream.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/lstream.c	2001-04-13 03:24:00.000000000 +0900
++++ xemacs21-21.4.15/src/lstream.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1674,6 +1674,14 @@
+ void
+ lstream_type_create (void)
+ {
++#ifdef __ia64__
++  lstream_type_reinit ();
++}
++
++void
++lstream_type_reinit (void)
++{
++#endif
+   LSTREAM_HAS_METHOD (stdio, reader);
+   LSTREAM_HAS_METHOD (stdio, writer);
+   LSTREAM_HAS_METHOD (stdio, rewinder);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-gtk.c xemacs21-21.4.15/src/menubar-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-gtk.c	2002-05-01 01:06:43.000000000 +0900
++++ xemacs21-21.4.15/src/menubar-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1286,6 +1286,14 @@
+ void
+ console_type_create_menubar_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_menubar_gtk ();
++}
++
++void
++console_type_reinit_menubar_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, update_frame_menubars);
+   CONSOLE_HAS_METHOD (gtk, free_frame_menubars);
+   CONSOLE_HAS_METHOD (gtk, popup_menu);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-msw.c xemacs21-21.4.15/src/menubar-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-msw.c	2002-11-01 00:08:25.000000000 +0900
++++ xemacs21-21.4.15/src/menubar-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -985,6 +985,14 @@
+ void
+ console_type_create_menubar_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_menubar_mswindows ();
++}
++
++void
++console_type_reinit_menubar_mswindows (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (mswindows, update_frame_menubars);
+   CONSOLE_HAS_METHOD (mswindows, free_frame_menubars);
+   CONSOLE_HAS_METHOD (mswindows, popup_menu);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-x.c xemacs21-21.4.15/src/menubar-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/menubar-x.c	2001-04-13 03:24:02.000000000 +0900
++++ xemacs21-21.4.15/src/menubar-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1362,6 +1362,14 @@
+ void
+ console_type_create_menubar_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_menubar_x ();
++}
++
++void
++console_type_reinit_menubar_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, update_frame_menubars);
+   CONSOLE_HAS_METHOD (x, free_frame_menubars);
+   CONSOLE_HAS_METHOD (x, popup_menu);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/menubar.c xemacs21-21.4.15/src/menubar.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/menubar.c	2001-04-13 03:24:02.000000000 +0900
++++ xemacs21-21.4.15/src/menubar.c	2004-07-25 18:31:43.000000000 +0900
+@@ -743,6 +743,16 @@
+ 			 menubar_visible_p_changed_in_frame, 0);
+ }
+ 
++#ifdef __ia64__
++void
++specifier_reinit_menubar (void)
++{
++  reinit_specifier_caching (Vmenubar_visible_p,
++			    menubar_visible_p_changed,
++			    menubar_visible_p_changed_in_frame);
++}
++#endif
++
+ void
+ complex_vars_of_menubar (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/native-gtk-toolbar.c xemacs21-21.4.15/src/native-gtk-toolbar.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/native-gtk-toolbar.c	2001-04-13 03:24:06.000000000 +0900
++++ xemacs21-21.4.15/src/native-gtk-toolbar.c	2004-07-25 18:31:43.000000000 +0900
+@@ -238,6 +238,14 @@
+ void
+ console_type_create_toolbar_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_toolbar_gtk ();
++}
++
++void
++console_type_reinit_toolbar_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, output_frame_toolbars);
+   CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars);
+ }
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/objects-gtk.c xemacs21-21.4.15/src/objects-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/objects-gtk.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/objects-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -448,6 +448,14 @@
+ void
+ console_type_create_objects_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_objects_gtk ();
++}
++
++void
++console_type_reinit_objects_gtk (void)
++{
++#endif
+   /* object methods */
+ 
+   CONSOLE_HAS_METHOD (gtk, initialize_color_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/objects-msw.c xemacs21-21.4.15/src/objects-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/objects-msw.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/objects-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1715,6 +1715,14 @@
+ void
+ console_type_create_objects_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_objects_mswindows ();
++}
++
++void
++console_type_reinit_objects_mswindows (void)
++{
++#endif
+   /* object methods */
+   CONSOLE_HAS_METHOD (mswindows, initialize_color_instance);
+ /*  CONSOLE_HAS_METHOD (mswindows, mark_color_instance); */
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/objects-tty.c xemacs21-21.4.15/src/objects-tty.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/objects-tty.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/objects-tty.c	2004-07-25 18:31:43.000000000 +0900
+@@ -353,6 +353,14 @@
+ void
+ console_type_create_objects_tty (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_objects_tty ();
++}
++
++void
++console_type_reinit_objects_tty (void)
++{
++#endif
+   /* object methods */
+   CONSOLE_HAS_METHOD (tty, initialize_color_instance);
+   CONSOLE_HAS_METHOD (tty, mark_color_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/objects-x.c xemacs21-21.4.15/src/objects-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/objects-x.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/objects-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -991,6 +991,14 @@
+ void
+ console_type_create_objects_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_objects_x ();
++}
++
++void
++console_type_reinit_objects_x (void)
++{
++#endif
+   /* object methods */
+ 
+   CONSOLE_HAS_METHOD (x, initialize_color_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/objects.c xemacs21-21.4.15/src/objects.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/objects.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/objects.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1049,6 +1049,14 @@
+   INITIALIZE_SPECIFIER_TYPE_WITH_DATA (face_boolean, "face-boolean",
+ 					 "face-boolean-specifier-p");
+ 
++#ifdef __ia64__
++  specifier_type_reinit_objects ();
++}
++
++void
++specifier_type_reinit_objects (void)
++{
++#endif
+   SPECIFIER_HAS_METHOD (color, instantiate);
+   SPECIFIER_HAS_METHOD (font, instantiate);
+   SPECIFIER_HAS_METHOD (face_boolean, instantiate);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/process-nt.c xemacs21-21.4.15/src/process-nt.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/process-nt.c	2002-08-20 20:37:45.000000000 +0900
++++ xemacs21-21.4.15/src/process-nt.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1355,6 +1355,14 @@
+ void
+ process_type_create_nt (void)
+ {
++#ifdef __ia64__
++  process_type_reinit_nt ();
++}
++
++void
++process_type_reinit_nt (void)
++{
++#endif
+   PROCESS_HAS_METHOD (nt, alloc_process_data);
+   PROCESS_HAS_METHOD (nt, finalize_process_data);
+   PROCESS_HAS_METHOD (nt, init_process);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/process-unix.c xemacs21-21.4.15/src/process-unix.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/process-unix.c	2003-03-05 12:28:40.000000000 +0900
++++ xemacs21-21.4.15/src/process-unix.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2105,6 +2105,14 @@
+ void
+ process_type_create_unix (void)
+ {
++#ifdef __ia64__
++  process_type_reinit_unix ();
++}
++
++void
++process_type_reinit_unix (void)
++{
++#endif
+   PROCESS_HAS_METHOD (unix, alloc_process_data);
+   PROCESS_HAS_METHOD (unix, mark_process_data);
+ #ifdef SIGCHLD
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/ralloc.c xemacs21-21.4.15/src/ralloc.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/ralloc.c	2002-08-20 20:37:50.000000000 +0900
++++ xemacs21-21.4.15/src/ralloc.c	2004-07-25 18:31:43.000000000 +0900
+@@ -117,7 +117,11 @@
+                        & ~(page_size - 1))
+ #define ROUND_TO_PAGE(addr) (addr & (~(page_size - 1)))
+ 
++#ifdef __ia64__
++#define MEM_ALIGN (2*sizeof(double))
++#else
+ #define MEM_ALIGN sizeof(double)
++#endif
+ #define MEM_ROUNDUP(addr) (((unsigned long int)(addr) + MEM_ALIGN - 1) \
+ 				   & ~(MEM_ALIGN - 1))
+ 
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/rangetab.c xemacs21-21.4.15/src/rangetab.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/rangetab.c	2001-04-13 03:24:13.000000000 +0900
++++ xemacs21-21.4.15/src/rangetab.c	2004-07-25 18:31:43.000000000 +0900
+@@ -766,3 +766,16 @@
+ 
+   define_structure_type_keyword (st, Qdata, rangetab_data_validate);
+ }
++
++#ifdef __ia64__
++
++void
++structure_type_reinit_rangetab (void)
++{
++  struct structure_type *st;
++
++  st = reinit_structure_type (Qrange_table, 0, rangetab_instantiate);
++
++  reinit_structure_type_keyword (st, Qdata, rangetab_data_validate);
++}
++#endif
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-gtk.c xemacs21-21.4.15/src/redisplay-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-gtk.c	2002-08-20 20:37:52.000000000 +0900
++++ xemacs21-21.4.15/src/redisplay-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1935,6 +1935,14 @@
+ void
+ console_type_create_redisplay_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_redisplay_gtk ();
++}
++
++void
++console_type_reinit_redisplay_gtk (void)
++{
++#endif
+   /* redisplay methods */
+   CONSOLE_HAS_METHOD (gtk, text_width);
+   CONSOLE_HAS_METHOD (gtk, output_display_block);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-msw.c xemacs21-21.4.15/src/redisplay-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-msw.c	2002-08-20 20:37:55.000000000 +0900
++++ xemacs21-21.4.15/src/redisplay-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1383,6 +1383,14 @@
+ void
+ console_type_create_redisplay_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_redisplay_mswindows ();
++}
++
++void
++console_type_reinit_redisplay_mswindows (void)
++{
++#endif
+   /* redisplay methods - display*/
+   CONSOLE_HAS_METHOD (mswindows, text_width);
+   CONSOLE_HAS_METHOD (mswindows, output_display_block);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-tty.c xemacs21-21.4.15/src/redisplay-tty.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-tty.c	2001-04-13 03:24:14.000000000 +0900
++++ xemacs21-21.4.15/src/redisplay-tty.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1484,6 +1484,14 @@
+ void
+ console_type_create_redisplay_tty (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_redisplay_tty ();
++}
++
++void
++console_type_reinit_redisplay_tty (void)
++{
++#endif
+   /* redisplay methods */
+   CONSOLE_HAS_METHOD (tty, text_width);
+   CONSOLE_HAS_METHOD (tty, output_display_block);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-x.c xemacs21-21.4.15/src/redisplay-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay-x.c	2003-01-15 21:18:01.000000000 +0900
++++ xemacs21-21.4.15/src/redisplay-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2090,6 +2090,14 @@
+ void
+ console_type_create_redisplay_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_redisplay_x ();
++}
++
++void
++console_type_reinit_redisplay_x (void)
++{
++#endif
+   /* redisplay methods */
+   CONSOLE_HAS_METHOD (x, text_width);
+   CONSOLE_HAS_METHOD (x, output_display_block);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay.c xemacs21-21.4.15/src/redisplay.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/redisplay.c	2002-11-01 00:08:34.000000000 +0900
++++ xemacs21-21.4.15/src/redisplay.c	2004-07-25 18:31:43.000000000 +0900
+@@ -9741,3 +9741,26 @@
+ 			 0, 0, 0);
+ 
+ }
++
++#ifdef __ia64__
++void
++specifier_reinit_redisplay (void)
++{
++  reinit_specifier_caching (Vleft_margin_width,
++			    some_window_value_changed,
++			    margin_width_changed_in_frame);
++  reinit_specifier_caching (Vright_margin_width,
++			    some_window_value_changed,
++			    margin_width_changed_in_frame);
++  reinit_specifier_caching (Vminimum_line_ascent,
++			    some_window_value_changed, 0);
++  reinit_specifier_caching (Vminimum_line_descent,
++			    some_window_value_changed, 0);
++  reinit_specifier_caching (Vuse_left_overflow,
++			    some_window_value_changed, 0);
++  reinit_specifier_caching (Vuse_right_overflow,
++			    some_window_value_changed, 0);
++  reinit_specifier_caching (Vtext_cursor_visible_p,
++			    text_cursor_visible_p_changed, 0);
++}
++#endif
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-gtk.c xemacs21-21.4.15/src/scrollbar-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-gtk.c	2001-07-25 16:45:35.000000000 +0900
++++ xemacs21-21.4.15/src/scrollbar-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -470,6 +470,14 @@
+ void
+ console_type_create_scrollbar_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_scrollbar_gtk ();
++}
++
++void
++console_type_reinit_scrollbar_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, inhibit_scrollbar_slider_size_change);
+   CONSOLE_HAS_METHOD (gtk, free_scrollbar_instance);
+   CONSOLE_HAS_METHOD (gtk, release_scrollbar_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-msw.c xemacs21-21.4.15/src/scrollbar-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-msw.c	2002-08-20 20:38:07.000000000 +0900
++++ xemacs21-21.4.15/src/scrollbar-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -468,6 +468,14 @@
+ void
+ console_type_create_scrollbar_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_scrollbar_mswindows ();
++}
++
++void
++console_type_reinit_scrollbar_mswindows (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (mswindows, create_scrollbar_instance);
+   CONSOLE_HAS_METHOD (mswindows, free_scrollbar_instance);
+   CONSOLE_HAS_METHOD (mswindows, release_scrollbar_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-x.c xemacs21-21.4.15/src/scrollbar-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar-x.c	2001-04-13 03:24:17.000000000 +0900
++++ xemacs21-21.4.15/src/scrollbar-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -727,6 +727,14 @@
+ void
+ console_type_create_scrollbar_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_scrollbar_x ();
++}
++
++void
++console_type_reinit_scrollbar_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, inhibit_scrollbar_slider_size_change);
+   CONSOLE_HAS_METHOD (x, free_scrollbar_instance);
+   CONSOLE_HAS_METHOD (x, release_scrollbar_instance);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar.c xemacs21-21.4.15/src/scrollbar.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/scrollbar.c	2001-04-13 03:24:17.000000000 +0900
++++ xemacs21-21.4.15/src/scrollbar.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1039,6 +1039,33 @@
+ 			 frame_size_slipped, 0);
+ }
+ 
++#ifdef __ia64__
++void
++specifier_reinit_scrollbar (void)
++{
++  reinit_specifier_caching (Vscrollbar_width,
++			    vertical_scrollbar_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vscrollbar_height,
++			    some_window_value_changed,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vhorizontal_scrollbar_visible_p,
++			    some_window_value_changed,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vvertical_scrollbar_visible_p,
++			    vertical_scrollbar_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vscrollbar_on_left_p,
++			    vertical_scrollbar_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vscrollbar_on_top_p,
++			    some_window_value_changed,
++			    frame_size_slipped);
++  reinit_specifier_caching (XGLYPH (Vscrollbar_pointer_glyph)->image,
++			    scrollbar_pointer_changed_in_window, 0);
++}
++#endif
++
+ void
+ complex_vars_of_scrollbar (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/select-gtk.c xemacs21-21.4.15/src/select-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/select-gtk.c	2002-05-01 01:06:45.000000000 +0900
++++ xemacs21-21.4.15/src/select-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -951,6 +951,14 @@
+ void
+ console_type_create_select_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_select_gtk ();
++}
++
++void
++console_type_reinit_select_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, own_selection);
+   CONSOLE_HAS_METHOD (gtk, disown_selection);
+   CONSOLE_HAS_METHOD (gtk, selection_exists_p);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/select-x.c xemacs21-21.4.15/src/select-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/select-x.c	2002-08-20 20:38:10.000000000 +0900
++++ xemacs21-21.4.15/src/select-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1732,6 +1732,14 @@
+ void
+ console_type_create_select_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_select_x ();
++}
++
++void
++console_type_reinit_select_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, own_selection);
+   CONSOLE_HAS_METHOD (x, disown_selection);
+   CONSOLE_HAS_METHOD (x, get_foreign_selection);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/specifier.c xemacs21-21.4.15/src/specifier.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/specifier.c	2002-12-12 15:21:32.000000000 +0900
++++ xemacs21-21.4.15/src/specifier.c	2004-07-25 18:31:43.000000000 +0900
+@@ -2855,6 +2855,24 @@
+   recompute_cached_specifier_everywhere (specifier);
+ }
+ 
++#ifdef __ia64__
++void
++reinit_specifier_caching (Lisp_Object specifier,
++			  void (*value_changed_in_window)
++			  (Lisp_Object specifier, struct window *w,
++			   Lisp_Object oldval),
++			  void (*value_changed_in_frame)
++			  (Lisp_Object specifier, struct frame *f,
++			   Lisp_Object oldval))
++{
++  struct Lisp_Specifier *sp = XSPECIFIER (specifier);
++  assert (!GHOST_SPECIFIER_P (sp));
++
++  sp->caching->value_changed_in_window = value_changed_in_window;
++  sp->caching->value_changed_in_frame = value_changed_in_frame;
++}
++#endif
++
+ static void
+ recompute_one_cached_specifier_in_window (Lisp_Object specifier,
+ 					  struct window *w)
+@@ -3296,6 +3314,20 @@
+   SPECIFIER_HAS_METHOD (display_table, validate);
+ }
+ 
++#ifdef __ia64__
++void
++specifier_type_reinit (void)
++{
++  SPECIFIER_HAS_METHOD (integer, validate);
++
++  SPECIFIER_HAS_METHOD (natnum, validate);
++
++  SPECIFIER_HAS_METHOD (boolean, validate);
++
++  SPECIFIER_HAS_METHOD (display_table, validate);
++}
++#endif
++
+ void
+ reinit_specifier_type_create (void)
+ {
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/specifier.h xemacs21-21.4.15/src/specifier.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/specifier.h	2001-04-13 03:24:19.000000000 +0900
++++ xemacs21-21.4.15/src/specifier.h	2004-07-25 18:31:43.000000000 +0900
+@@ -484,6 +484,15 @@
+ 			    (Lisp_Object specifier, struct frame *f,
+ 			     Lisp_Object oldval),
+ 			    int always_recompute);
++#ifdef __ia64__
++void reinit_specifier_caching (Lisp_Object specifier,
++			       void (*value_changed_in_window)
++			       (Lisp_Object specifier, struct window *w,
++				Lisp_Object oldval),
++			       void (*value_changed_in_frame)
++			       (Lisp_Object specifier, struct frame *f,
++				Lisp_Object oldval));
++#endif
+ void set_specifier_fallback (Lisp_Object specifier,
+ 			     Lisp_Object fallback);
+ void recompute_all_cached_specifiers_in_window (struct window *w);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/symsinit.h xemacs21-21.4.15/src/symsinit.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/symsinit.h	2002-11-01 00:08:50.000000000 +0900
++++ xemacs21-21.4.15/src/symsinit.h	2004-07-25 18:31:43.000000000 +0900
+@@ -491,4 +491,82 @@
+ void complex_vars_of_glyphs_gtk (void);
+ void init_event_gtk_late (void);
+ 
++#ifdef __ia64__
++/* We need to reinitialize all function pointers. Sigh. */
++
++void console_type_reinit_stream (void);
++void console_type_reinit_tty (void);
++void console_type_reinit_device_tty (void);
++void console_type_reinit_frame_tty (void);
++void console_type_reinit_objects_tty (void);
++void console_type_reinit_redisplay_tty (void);
++void console_type_reinit_gtk (void);
++void console_type_reinit_select_gtk (void);
++void console_type_reinit_device_gtk (void);
++void console_type_reinit_dialog_gtk (void);
++void console_type_reinit_frame_gtk (void);
++void console_type_reinit_objects_gtk (void);
++void console_type_reinit_glyphs_gtk (void);
++void console_type_reinit_redisplay_gtk (void);
++void console_type_reinit_menubar_gtk (void);
++void console_type_reinit_scrollbar_gtk (void);
++void console_type_reinit_toolbar_gtk (void);
++void console_type_reinit_x (void);
++void console_type_reinit_device_x (void);
++void console_type_reinit_frame_x (void);
++void console_type_reinit_glyphs_x (void);
++void console_type_reinit_select_x (void);
++void console_type_reinit_menubar_x (void);
++void console_type_reinit_objects_x (void);
++void console_type_reinit_redisplay_x (void);
++void console_type_reinit_scrollbar_x (void);
++void console_type_reinit_toolbar_x (void);
++void console_type_reinit_dialog_x (void);
++void console_type_reinit_mswindows (void);
++void console_type_reinit_device_mswindows (void);
++void console_type_reinit_frame_mswindows (void);
++void console_type_reinit_menubar_mswindows (void);
++void console_type_reinit_objects_mswindows (void);
++void console_type_reinit_redisplay_mswindows (void);
++void console_type_reinit_scrollbar_mswindows (void);
++void console_type_reinit_toolbar_mswindows (void);
++void console_type_reinit_glyphs_mswindows (void);
++void console_type_reinit_dialog_mswindows (void);
++
++void specifier_type_reinit (void);
++void specifier_type_reinit_image (void);
++void specifier_type_reinit_gutter (void);
++void specifier_type_reinit_objects (void);
++void specifier_type_reinit_toolbar (void);
++
++void structure_type_reinit_chartab (void);
++void structure_type_reinit_faces (void);
++void structure_type_reinit_rangetab (void);
++void structure_type_reinit_hash_table (void);
++
++void image_instantiator_format_reinit (void);
++void image_instantiator_format_reinit_glyphs_eimage (void);
++void image_instantiator_format_reinit_glyphs_widget (void);
++void image_instantiator_format_reinit_glyphs_gtk (void);
++void image_instantiator_format_reinit_glyphs_x (void);
++void image_instantiator_format_reinit_glyphs_mswindows (void);
++
++void lstream_type_reinit (void);
++void lstream_type_reinit_file_coding (void);
++void lstream_type_reinit_print (void);
++void lstream_type_reinit_mswindows_selectable (void);
++
++void process_type_reinit_nt (void);
++void process_type_reinit_unix (void);
++
++void specifier_reinit_glyphs (void);
++void specifier_reinit_gutter (void);
++void specifier_reinit_menubar (void);
++void specifier_reinit_redisplay (void);
++void specifier_reinit_scrollbar (void);
++void specifier_reinit_toolbar (void);
++void specifier_reinit_window (void);
++
++#endif /* __ia64__ */
++
+ #endif /* INCLUDED_symsinit_h_ */
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-gtk.c xemacs21-21.4.15/src/toolbar-gtk.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-gtk.c	2002-08-20 20:38:18.000000000 +0900
++++ xemacs21-21.4.15/src/toolbar-gtk.c	2004-07-25 18:31:43.000000000 +0900
+@@ -671,6 +671,14 @@
+ void
+ console_type_create_toolbar_gtk (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_toolbar_gtk ();
++}
++
++void
++console_type_reinit_toolbar_gtk (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (gtk, output_frame_toolbars);
+   CONSOLE_HAS_METHOD (gtk, clear_frame_toolbars);
+   CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-msw.c xemacs21-21.4.15/src/toolbar-msw.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-msw.c	2002-08-20 20:38:19.000000000 +0900
++++ xemacs21-21.4.15/src/toolbar-msw.c	2004-07-25 18:31:43.000000000 +0900
+@@ -648,6 +648,14 @@
+ void
+ console_type_create_toolbar_mswindows (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_toolbar_mswindows ();
++}
++
++void
++console_type_reinit_toolbar_mswindows (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (mswindows, output_frame_toolbars);
+   CONSOLE_HAS_METHOD (mswindows, clear_frame_toolbars);
+   CONSOLE_HAS_METHOD (mswindows, initialize_frame_toolbars);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-x.c xemacs21-21.4.15/src/toolbar-x.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar-x.c	2002-08-20 20:38:20.000000000 +0900
++++ xemacs21-21.4.15/src/toolbar-x.c	2004-07-25 18:31:43.000000000 +0900
+@@ -801,6 +801,14 @@
+ void
+ console_type_create_toolbar_x (void)
+ {
++#ifdef __ia64__
++  console_type_reinit_toolbar_x ();
++}
++
++void
++console_type_reinit_toolbar_x (void)
++{
++#endif
+   CONSOLE_HAS_METHOD (x, output_frame_toolbars);
+   CONSOLE_HAS_METHOD (x, clear_frame_toolbars);
+   CONSOLE_HAS_METHOD (x, initialize_frame_toolbars);
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar.c xemacs21-21.4.15/src/toolbar.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/toolbar.c	2002-08-20 20:38:21.000000000 +0900
++++ xemacs21-21.4.15/src/toolbar.c	2004-07-25 18:31:43.000000000 +0900
+@@ -1322,6 +1322,14 @@
+ {
+   INITIALIZE_SPECIFIER_TYPE (toolbar, "toolbar", "toolbar-specifier-p");
+ 
++#ifdef __ia64__
++  specifier_type_reinit_toolbar ();
++}
++
++void
++specifier_type_reinit_toolbar (void)
++{
++#endif
+   SPECIFIER_HAS_METHOD (toolbar, validate);
+   SPECIFIER_HAS_METHOD (toolbar, after_change);
+ }
+@@ -1911,3 +1919,70 @@
+   set_specifier_fallback (Vtoolbar_buttons_captioned_p,
+ 			  list1 (Fcons (Qnil, Qt)));
+ }
++
++#ifdef __ia64__
++void
++specifier_reinit_toolbar (void)
++{
++  reinit_specifier_caching (Vdefault_toolbar,
++			    default_toolbar_specs_changed, 0);
++  reinit_specifier_caching (Vtoolbar[TOP_TOOLBAR],
++			    toolbar_specs_changed, 0);
++  reinit_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
++			    toolbar_specs_changed, 0);
++  reinit_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
++			    toolbar_specs_changed, 0);
++  reinit_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
++			    toolbar_specs_changed, 0);
++  reinit_specifier_caching (Vdefault_toolbar_height,
++			    default_toolbar_size_changed_in_window,
++			    default_toolbar_size_changed_in_frame);
++  reinit_specifier_caching (Vdefault_toolbar_width,
++			    default_toolbar_size_changed_in_window,
++			    default_toolbar_size_changed_in_frame);
++  reinit_specifier_caching (Vtoolbar_size[TOP_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vdefault_toolbar_border_width,
++			    default_toolbar_border_width_changed_in_window,
++			    default_toolbar_border_width_changed_in_frame);
++  reinit_specifier_caching (Vtoolbar_border_width[TOP_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_border_width[BOTTOM_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_border_width[LEFT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_border_width[RIGHT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vdefault_toolbar_visible_p,
++			    default_toolbar_visible_p_changed_in_window,
++			    default_toolbar_visible_p_changed_in_frame);
++  reinit_specifier_caching (Vtoolbar_visible_p[TOP_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_visible_p[BOTTOM_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_visible_p[LEFT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_visible_p[RIGHT_TOOLBAR],
++			    toolbar_geometry_changed_in_window,
++			    frame_size_slipped);
++  reinit_specifier_caching (Vtoolbar_buttons_captioned_p,
++			    toolbar_buttons_captioned_p_changed, 0);
++}
++#endif
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/src/window.c xemacs21-21.4.15/src/window.c
+--- /home/mohura/debsrc/xemacs21-21.4.15/src/window.c	2004-07-25 17:57:51.000000000 +0900
++++ xemacs21-21.4.15/src/window.c	2004-07-25 18:31:43.000000000 +0900
+@@ -6415,3 +6415,22 @@
+ 			 vertical_divider_changed_in_window,
+ 			 0, 0, 0);
+ }
++
++#ifdef __ia64__
++void
++specifier_reinit_window (void)
++{
++  reinit_specifier_caching (Vmodeline_shadow_thickness,
++			    modeline_shadow_thickness_changed, 0);
++  reinit_specifier_caching (Vhas_modeline_p,
++			    some_window_value_changed, 0);
++  reinit_specifier_caching (Vvertical_divider_always_visible_p,
++			    vertical_divider_changed_in_window, 0);
++  reinit_specifier_caching (Vvertical_divider_shadow_thickness,
++			    vertical_divider_changed_in_window, 0);
++  reinit_specifier_caching (Vvertical_divider_line_width,
++			    vertical_divider_changed_in_window, 0);
++  reinit_specifier_caching (Vvertical_divider_spacing,
++			    vertical_divider_changed_in_window, 0);
++}
++#endif
--- xemacs21-21.4.17.orig/debian/patches/04_ia64_not_export_dynamic.dpatch
+++ xemacs21-21.4.17/debian/patches/04_ia64_not_export_dynamic.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## 04_ia64_not_export_dynamic.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix ia64 dependent SEGV problem. BTS #207412, #149088, #218241.
+## DP: Link without -export-dynamic option.
+## DP: I borrow this solution from redhat Bugzilla;
+## DP: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106744
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/aclocal.m4 xemacs21-21.4.15/aclocal.m4
+--- /home/mohura/debsrc/xemacs21-21.4.15/aclocal.m4	2003-10-21 09:22:56.000000000 +0900
++++ xemacs21-21.4.15/aclocal.m4	2004-08-09 21:29:45.000000000 +0900
+@@ -531,7 +531,7 @@
+ dnl
+ 
+ if test "$xe_gnu_ld" = yes; then
+-  if test "$ld_shlibs" = yes; then
++  if test "$ld_shlibs" = yes && test "$xehost_cpu" != "ia64" ; then
+     ld_dynamic_link_flags="${wl}-export-dynamic"
+   fi
+ fi
--- xemacs21-21.4.17.orig/debian/patches/10_gnuserv_disable_inet.dpatch
+++ xemacs21-21.4.17/debian/patches/10_gnuserv_disable_inet.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+## 10_gnuserv_disable_inet.dpatch by OHURA Makoto <ohura@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable INTERNET_DOMAIN_SOCKETS for security issue.
+## DP: Fix BTS #177236
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/mohura/debsrc/xemacs21-21.4.15/lib-src/gnuserv.h xemacs21-21.4.15/lib-src/gnuserv.h
+--- /home/mohura/debsrc/xemacs21-21.4.15/lib-src/gnuserv.h	2001-04-13 03:21:02.000000000 +0900
++++ xemacs21-21.4.15/lib-src/gnuserv.h	2004-08-28 11:25:18.000000000 +0900
+@@ -52,7 +52,7 @@
+  */
+ 
+ 
+-#define INTERNET_DOMAIN_SOCKETS
++/* #define INTERNET_DOMAIN_SOCKETS */
+ #ifdef HAVE_SYS_UN_H
+ #define UNIX_DOMAIN_SOCKETS 
+ /* #define SYSV_IPC  */
--- xemacs21-21.4.17.orig/debian/gnudoit.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/gnudoit.xemacs@MAJVERSION@.1.in
@@ -0,0 +1 @@
+.so man1/gnuserv.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+set -e
+
+OLDDATADIR=/@PREFIX@/lib/xemacs-21.4.17
+NEWDATADIR=/@PREFIX@/share/xemacs-21.4.17
+
+test -d ${OLDDATADIR}/etc && rm -r ${OLDDATADIR}/etc
+test -d ${OLDDATADIR}/lisp && rm -r ${OLDDATADIR}/lisp
+
+test -L ${OLDDATADIR}/etc || ln -s ${NEWDATADIR}/etc ${OLDDATADIR}/etc
+test -L ${OLDDATADIR}/lisp || ln -s ${NEWDATADIR}/lisp ${OLDDATADIR}/lisp
+
+install-info --quiet --section "Emacs" "XEmacs@VERSION@" /@PREFIX@/share/info/xemacs@MAJVERSION@/xemacs@MAJVERSION@.info
+
+mkdir -p /usr/local/lib/xemacs/site-lisp > /dev/null 2>&1 || true
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.postrm.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.postrm.in
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+set -e
+
+OLDDATADIR=/@PREFIX@/lib/xemacs-21.4.17
+
+test -L ${OLDDATADIR}/etc && rm ${OLDDATADIR}/etc
+test -L ${OLDDATADIR}/lisp && rm ${OLDDATADIR}/lisp
+
+rmdir  /usr/local/lib/xemacs/site-lisp > /dev/null 2>&1 || true 
+rmdir  /usr/local/lib/xemacs > /dev/null 2>&1 || true 
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/postinst-base
+++ xemacs21-21.4.17/debian/postinst-base
@@ -0,0 +1,41 @@
+#!/bin/sh -e
+set -e
+
+# oops.  Needed to check version on upgrade.  Now just need to remove old ones.
+for i in 1 2 3 4 5 6 ; do
+    update-alternatives --remove xemacs21 /usr/bin/xemacs-21.4.$i-REPLACE_ME
+done
+
+update-alternatives --install /usr/bin/xemacs@MAJVERSION@ xemacs@MAJVERSION@ /usr/bin/xemacs@MAJVERSION@-REPLACE_ME 70
+
+# Ok we dont' want to compile these files when we already have another
+# installed.
+ALREADY_MULE=0
+ALREADY_NOMULE=0
+for i in mule mule-canna-wnn gnome-mule gnome-mule-canna-wnn ; do
+  STAT=`dpkg -s xemacs@MAJVERSION@-$i 2> /dev/null | perl -ne 'next if $_ !~ m/^Status/; $_ =~ s/^Status:\s*(.*)/$1/; print;'`
+  if [ "REPLACE_ME" != "$i" -a "$STAT" = "install ok installed" ] ; then
+    ALREADY_MULE=1
+  fi
+done
+
+for i in nomule gnome-nomule ; do
+  STAT=`dpkg -s xemacs@MAJVERSION@-$i 2> /dev/null | perl -ne 'next if $_ !~ m/^Status/; $_ =~ s/^Status:\s*(.*)/$1/; print;'`
+  if [ "REPLACE_ME" != "$i" -a "$STAT" = "install ok installed" ] ; then
+    ALREADY_NOMULE=1
+  fi
+done
+
+#if [ "$ALREADY_MULE" = "0" ] ; then
+   #/usr/lib/emacsen-common/emacs-install xemacs@MAJVERSION@-mule
+#fi
+
+#if [ "$ALREADY_NOMULE" = "0" ] ; then
+   #/usr/lib/emacsen-common/emacs-install xemacs@MAJVERSION@-nomule
+#fi
+
+if [ "$ALREADY_NOMULE" = "0" -a "$ALREADY_MULE" = "0" ] ; then
+   /usr/lib/emacsen-common/emacs-install xemacs@MAJVERSION@
+fi
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/preinst-base
+++ xemacs21-21.4.17/debian/preinst-base
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+set -e
+
+# update-alternatives --auto xemacs@MAJVERSION@
+
+# echo 'I apologize if I\'ve just blown away a site setup alternative.'
+# echo 'But due to problems in previous xemacs21 packages this seems'
+# echo 'like the only solution.'
+
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-mule
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-nomule
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-mule-canna-wnn
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.prerm.in
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+set -e
+
+install-info --quiet --remove xemacs@MAJVERSION@.info
+
+rmdir /usr/local/lib/xemacs/site-lisp > /dev/null 2>&1 && \
+   rmdir /usr/local/lib/xemacs > /dev/null 2>&1 || \
+   true 
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/prerm-base
+++ xemacs21-21.4.17/debian/prerm-base
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+  update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs@MAJVERSION@-REPLACE_ME
+fi
+
+# Ok we dont' want to deinstall these files when we already have another
+# installed.
+ALREADY=0
+for i in mule nomule mule-canna-wnn gnome-mule gnome-nomule gnome-mule-canna-wnn ; do
+  STAT=`dpkg -s xemacs@MAJVERSION@-$i 2>/dev/null | perl -ne 'next if $_ !~ m/^Status/; $_ =~ s/^Status:\s*(.*)/$1/; print;'`
+  if [ "REPLACE_ME" != "$i" -a "$STAT" = "install ok installed" ] ; then
+    ALREADY=1
+  fi
+done
+
+if [ "$ALREADY" = "0" ] ; then
+  /usr/lib/emacsen-common/emacs-remove xemacs@MAJVERSION@
+fi
+
+if [ -L /usr/doc/xemacs@MAJVERSION@-REPLACE_ME ]; then
+	rm -f /usr/doc/xemacs@MAJVERSION@-REPLACE_ME
+fi
+
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/get_menu_part.in
+++ xemacs21-21.4.17/debian/get_menu_part.in
@@ -0,0 +1,80 @@
+#!/usr/bin/perl -w
+
+use strict;
+use diagnostics;
+
+my $top_file = shift(@ARGV);
+my $output_file = shift(@ARGV);
+
+die "No menu file given" if(not defined($top_file));
+
+my $top = '\input texinfo
+@c -*-texinfo-*-
+@c Copyright (C) 1997 Free Software Foundation, Inc.
+@c overall xemacs@MAJVERSION@ pointers for debian info abstraction
+@settitle Overall XEmacs @VERSION@ documentation
+@setfilename xemacs@MAJVERSION@.info
+
+@ifinfo
+This file documents XEmacs @VERSION@
+@end ifinfo
+
+@direntry
+* XEmacs21: (xemacs21/xemacs21). Documentation for XEmacs @VERSION@
+@end direntry
+
+@ifinfo
+@node Top
+@top XEmacs @MAJVERSION@ Documentation
+@end ifinfo
+
+Here is all the documentation for XEmacs version @VERSION@.
+
+@menu
+
+XEmacs Docs
+
+';
+
+my $bottom = '
+@end menu
+';
+
+open(TOP_FILE, $top_file);
+
+my $menu_text = "";
+my $getting_menu = 0;
+
+my $header_format = "%-30s %s\n";
+
+while(<TOP_FILE>) {
+  $getting_menu = not $getting_menu
+    if(m/^\s*\* Menu:\s*$/ or m/^\s*\* Locals:\s*/);
+
+  next if not $getting_menu;
+  next if m/\* Menu:/;
+
+  if(m/^\s*\* (.*):(:|\s*\(.*\)\.)\s*(.*)/) {
+    my $info_file = "xemacs@MAJVERSION@/\L$1";
+    my $first_part = "* $1: ($info_file).";
+    my $second_part = $3 || "";
+    $first_part .= "\n" if((length($first_part) > 30)
+                           and ($second_part !~ m/\s*/));
+    $_ = sprintf($header_format, $first_part, $second_part);
+  }
+
+  if(m/^\s+(.*)$/) {
+    $_ = sprintf($header_format, "", $1);
+  }
+  $menu_text .= $_;
+}
+
+close(TOP_FILE);
+
+open(OUT_FILE, "> $output_file");
+
+print OUT_FILE $top, $menu_text, $bottom;
+
+close(OUT_FILE);
+
+exit 0;
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.docs.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.docs.in
@@ -0,0 +1 @@
+BUGS CHANGES-release ChangeLog README README.packages PROBLEMS
--- xemacs21-21.4.17.orig/debian/convert-in-file
+++ xemacs21-21.4.17/debian/convert-in-file
@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+
+my $vf = shift(@ARGV);
+
+require "$vf";
+
+my $input_file = shift(@ARGV);
+my $clean = 0;
+
+if($input_file eq "CLEAN") {
+  $clean = 1;
+  $input_file = shift(@ARGV);
+}
+
+if($#ARGV != -1) {
+  print STDERR "Too many arguments for file $input_file (@ARGV ($#ARGV))... Exiting...\n";
+  exit 1;
+}
+
+my $output_file = $input_file;
+
+foreach (keys %{$reps}) {
+  $output_file =~ s/\@$_\@/$$reps{$_}/gi;
+}
+$output_file =~ s/\.in$//;
+
+
+if($clean) {
+  print STDERR "Removing file $output_file\n";
+  system("rm", "-f", $output_file);
+}
+else {
+  print STDERR "Converting from $input_file to $output_file\n";
+  open(IN, $input_file);
+  open(OUT, "> $output_file");
+  while(<IN>) {
+    foreach $key (keys %{$reps}) {
+      s/\@$key\@/$$reps{$key}/gi;
+    }
+    print OUT $_;
+  }
+  close(OUT);
+  close(IN);
+}
+
+
--- xemacs21-21.4.17.orig/debian/find-version
+++ xemacs21-21.4.17/debian/find-version
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+
+# echo out the version of xemacs currently being dealt with
+
+# export srcdir=`pwd`
+# export version=`grep 'defconst[         ]*emacs-version'\
+#  ${srcdir}/lisp/version.el \
+#  | sed -ne 's/^(defconst emacs-version "\([0-9][0-9]\.[0-9]*\).*/\1/p'`
+# export beta=`grep '" XEmacs Lucid' ${srcdir}/lisp/version.el \
+#  | sed -ne 's/^.*" XEmacs Lucid (beta\([^)]*\)).*/\1/p'`
+# export alpha=`grep '" XEmacs Lucid' ${srcdir}/lisp/version.el \
+#  | sed -ne 's/^.*" XEmacs Lucid (alpha\([^)]*\)).*/\1/p'`
+
+# # echo $srcdir
+# # echo $version
+# # echo $beta
+# # echo $alpha
+
+# if [ ${beta:-""} != "" ] ; then
+#   echo ${version}b${beta}
+# elif [ ${alpha:-""} != "" ] ; then
+#   echo ${version}a${alpha}
+# else
+#   echo ${version}
+# fi
+
+# 19.16 puts it in configure script how.  Hard code output
+#echo "19.16"
+
+#DIR=`pwd`
+
+#echo `echo $DIR | perl -pe 's/.*xemacs[0-9]*-(.*)/$1/;'`
+
+#echo `dpkg-parsechangelog | egrep "^Version:" | perl -pe 's/Version:\s*([0-9]+)(\.[0-9]+)?(-.*)?-([0-9]+)/$1$2/;'`
+
+. ./version.sh
+
+if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
+
+version="${emacs_major_version}.${emacs_minor_version}"
+
+if test -n "$emacs_beta_version" ; then
+  if test "$beta" = "yes"; then
+  	version="${version}-b${emacs_beta_version}"
+  else
+	version="${version}.${emacs_beta_version}"
+  fi
+fi
+
+echo $version
--- xemacs21-21.4.17.orig/debian/ellcc.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/ellcc.xemacs@MAJVERSION@.1.in
@@ -0,0 +1,73 @@
+.TH ELLCC 1
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+ellcc \- Program to compile an emacs dynamic module
+.SH SYNOPSIS
+.B ellcc
+[--mode={compile,link,init,verbose}] [--mod-name=NAME] [--mod-title=TITLE]
+[--mod-version=VERSION] [Any compiler command line args]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR ellcc ,
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+The following is taken directly from the comments in the source.
+.PP
+Here's the scoop. We would really like this to be a shell script, but
+the various Windows platforms don't have reliable scripting that suits
+our needs. We don't want to rely on perl or some other such language
+so we have to roll our own executable to act as a front-end for the
+compiler.
+.PP
+This program is used to invoke the compiler, the linker and to generate
+the module specific documentation and initialization code.  We assume we
+are in 'compile' mode unless we encounter an argument which tells us
+that we're not.  We take all arguments and pass them on directly to the
+compiler, except for a few which are specific to this program:
+.PP
+The idea is that Makefiles will use ellcc as the compiler for making
+dynamic Emacs modules, and life should be as simple as:
+.PP
+  make CC=ellcc LD='ellcc --mode=link'
+.PP
+The only additional requirement is an entry in the Makefile to produce
+the module initialization file, which will usually be something along
+the lines of:
+.PP
+
+.SH OPTIONS
+.TP 8
+.BI \--mode=VALUE
+This sets the program mode. VALUE can be one of
+compile, link, init or verbose.
+.TP 8
+.BI \--mod-name=NAME
+Sets the module name to the string NAME.
+.TP 8
+.BI \--mod-title=TITLE
+Sets the module title to the string TITLE.
+.TP 8
+.BI \--mod-version=VERSION
+Sets the module version to the string VER.
+.br
+.\" .SH SEE ALSO
+.SH EXAMPLE
+.RS 4
+modinit.c: $(SRCS)
+.br
+             ellcc --mode=init --mod-name=\"$(MODNAME)\" \
+.br
+               --mod-title=\"$(MODTITLE)\" --mod-version=\"$(MODVERSION)\" \
+.br
+               -o $@ $(SRCS)
+.br
+See the samples for more details.
+.br
+
+.SH AUTHOR
+This manual page was written by James LewisMoss <dres@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.dirs.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.dirs.in
@@ -0,0 +1,10 @@
+etc/xemacs@MAJVERSION@/site-start.d
+@PREFIX@/share/info
+@PREFIX@/share/xemacs/site-lisp-@MAJVERSION@
+@PREFIX@/share/xemacs/site-lisp
+@PREFIX@/share/xemacs@MAJVERSION@/site-packages/lisp
+@PREFIX@/share/xemacs@MAJVERSION@/site-packages/info
+@PREFIX@/share/xemacs@MAJVERSION@/site-lisp
+@PREFIX@/lib/xemacs/site-lisp-@MAJVERSION@
+@PREFIX@/lib/xemacs/site-lisp
+@PREFIX@/share/icons
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-support.files.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-support.files.in
@@ -0,0 +1,4 @@
+@PREFIX@/share/xemacs-@VERSION@/etc/
+@PREFIX@/share/xemacs-@VERSION@/lisp/
+@PREFIX@/share/info/
+@PREFIX@/bin/editclient
--- xemacs21-21.4.17.orig/debian/generate-postinst
+++ xemacs21-21.4.17/debian/generate-postinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CLEAN=0
+
+if test "$1" = "CLEAN" ; then
+    shift
+    CLEAN=1
+fi
+
+for i in $@ ; do
+    if test "$CLEAN" = "1" ; then
+        rm -f xemacs@MAJVERSION@@SUBNAME@-$i.postinst.in
+    else
+        cat postinst-base | sed -e "s/REPLACE_ME/$i/g" > xemacs@MAJVERSION@@SUBNAME@-$i.postinst.in
+    fi
+done
+
--- xemacs21-21.4.17.orig/debian/generate-prerm
+++ xemacs21-21.4.17/debian/generate-prerm
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CLEAN=0
+
+if test "$1" = "CLEAN" ; then
+    shift
+    CLEAN=1
+fi
+
+for i in $@ ; do
+    if test "$CLEAN" = "1" ; then
+        rm -f xemacs@MAJVERSION@@SUBNAME@-$i.prerm.in
+    else
+        cat prerm-base | sed -e "s/REPLACE_ME/$i/g" > xemacs@MAJVERSION@@SUBNAME@-$i.prerm.in
+    fi
+done
+
--- xemacs21-21.4.17.orig/debian/xemacs21.info
+++ xemacs21-21.4.17/debian/xemacs21.info
@@ -0,0 +1,51 @@
+This is xemacs21.info, produced by makeinfo version 4.7 from
+xemacs21.texi.
+
+   This file documents XEmacs 21.4.17
+
+START-INFO-DIR-ENTRY
+* XEmacs21: (xemacs21/xemacs21). Documentation for XEmacs 21.4.17
+END-INFO-DIR-ENTRY
+
+
+File: xemacs21.info,  Node: Top,  Up: (dir)
+
+XEmacs 21 Documentation
+***********************
+
+   Here is all the documentation for XEmacs version 21.4.17.
+
+* Menu:
+
+
+XEmacs Docs
+
+
+XEmacs 21.4
+===========
+* XEmacs: (xemacs21/xemacs).   XEmacs User's Manual.
+* Lispref: (xemacs21/lispref). XEmacs Lisp Reference Manual.
+* New-Users-Guide: (xemacs21/new-users-guide). Getting Started with XEmacs.
+* XEmacs-FAQ: (xemacs21/xemacs-faq). XEmacs Frequently Asked Questions for 21.4.
+* Info: (xemacs21/info).       Guide to Info, the XEmacs online documentation system.
+* Internals: (xemacs21/internals). Guide to the internals of XEmacs.
+
+Other Documentation:
+
+* CL: (xemacs21/cl).           A Common Lisp compatibility package for Emacs-Lisp.
+* Custom: (xemacs21/custom).   Customization Library for Emacs.
+* Emodules: (xemacs21/emodules). XEmacs dynamic loadable module support.
+* External-Widget: (xemacs21/external-widget). Use XEmacs as a text widget inside of another program.
+* Standards: (xemacs21/standards). GNU coding standards.
+* Term: (xemacs21/term).       A mode to control inferior processes (a comint replacement)
+* Termcap: (xemacs21/termcap). The termcap library, which enables application programs
+                               to handle all types of character-display terminals.
+* Texinfo: (xemacs21/texinfo). The GNU documentation format.
+* Widget: (xemacs21/widget).   An Emacs Lisp widget library.
+
+
+
+Tag Table:
+Node: Top223
+
+End Tag Table
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-supportel.prerm.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-supportel.prerm.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ -L /usr/doc/xemacs@MAJVERSION@-supportel ]; then
+	rm -f /usr/doc/xemacs@MAJVERSION@-supportel
+fi
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/generate-menus
+++ xemacs21-21.4.17/debian/generate-menus
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+CLEAN=0
+
+if test "$1" = "CLEAN" ; then
+    shift
+    CLEAN=1
+fi
+
+for i in $@ ; do
+    if test "$CLEAN" = "1" ; then
+        rm -f xemacs@MAJVERSION@@SUBNAME@-$i.menu.in
+    else
+        ( echo "?package(xemacs@MAJVERSION@-$i):\\"
+          echo "  needs=\"X11\"\\"
+          echo "  section=\"Apps/Editors\"\\"
+          echo "  title=\"XEmacs@MAJVERSION@-$i\"\\"
+          echo "  command=\"/usr/bin/xemacs@MAJVERSION@-$i\"\\"
+          echo "  hints=\"Text\""
+          echo ""
+          echo "?package(xemacs@MAJVERSION@-$i):\\"
+          echo "  needs=\"text\"\\"
+          echo "  section=\"Apps/Editors\"\\"
+          echo "  title=\"XEmacs@MAJVERSION@-$i\"\\"
+          echo "  command=\"/usr/bin/xemacs@MAJVERSION@-$i -nw\"\\"
+          echo "  hints=\"Text\""
+          echo ""
+        ) > xemacs@MAJVERSION@@SUBNAME@-$i.menu.in
+    fi
+done
+
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@-nomule.1.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@-nomule.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/00debian.el
+++ xemacs21-21.4.17/debian/00debian.el
@@ -0,0 +1,98 @@
+
+(defvar debian-xemacs-major-version
+  (number-to-string emacs-major-version)
+  "XEMacs' Major Version as string")
+(defvar debian-xemacs-version
+  emacs-program-version
+  "XEmacs' Full Version as string")
+
+(loop for entry in load-history
+  if (string-match "^/home/.*xemacs21/xemacs\\(21\\)?-\\([.0-9]+/\\)"
+                   (car entry))
+  do (setf (car entry)
+           (replace-match "/usr/share/xemacs-\\2" t nil (car entry))))
+
+;; from bugreport #76139
+(setq TeX-lisp-directory "/usr/share/xemacs21/xemacs-packages/etc/auctex/")
+
+;;; From BTS #288807
+(mwheel-install)
+(setq mwheel-follow-mouse t)
+
+;;; PSGML section
+(setq-default
+ sgml-local-ecat-files (quote ("ECAT" "~/sgml/ECAT"
+                               "/usr/share/sgml/ECAT"
+                               "/usr/local/share/sgml/ECAT"
+                               "/usr/local/lib/sgml/ECAT"))
+ sgml-local-catalogs (quote ("/etc/sgml/catalog"
+                             "/usr/share/xemacs21/xemacs-packages/etc/psgml-dtds/CATALOG")))
+
+(setq-default
+ sgml-auto-activate-dtd t
+ sgml-data-directory "/usr/share/sgml/declaration/"
+ sgml-custom-markup '(("Version1" "<![%Version1[\r]]>")
+                      ("New page"  "<?NewPage>"))
+ sgml-xml-declaration "/usr/share/sgml/declaration/xml.dcl"
+ sgml-public-map '("%S"  "/usr/share/sgml/%S" "/usr/share/sgml/%o/%c/%d"
+		   "/usr/local/share/sgml/%o/%c/%d"
+                   "/usr/local/lib/sgml/%o/%c/%d")
+ sgml-set-face t
+ sgml-system-path '("/usr/share/sgml"
+                    "/usr/share/sgml/cdtd"
+		    "/usr/local/share/sgml"
+                    "/usr/local/lib/sgml")
+ sgml-validate-command "onsgmls -s -m /etc/sgml/catalog %s %s ")
+
+;;; END PSGML section
+
+(setq module-load-path '("/usr/lib/xemacs/site-modules"))
+
+(setq news-path "/var/spool/news")
+
+(when (functionp 'make-coding-system)
+    (make-coding-system 'us-ascii nil))
+
+(global-set-key [iso-left-tab] [(shift tab)])
+(global-set-key [(control iso-left-tab)] [(control shift tab)])
+
+(defun dir-and-all-good-subs (this-directory)
+  "Returns list of argument and all subdirectories of argument not
+starting with a '.'"
+  (if (file-exists-p this-directory)
+      (append (list (expand-file-name this-directory))
+              (mapcar '(lambda (dir-string)
+                         (concat dir-string "/"))
+                      (directory-files
+                       (expand-file-name this-directory)
+                       t "^[^\\.]" nil 1)))
+    nil))
+
+(setq load-path
+      (append
+       (dir-and-all-good-subs
+        (expand-file-name "~/.xemacs/xemacs-packages"))
+       (dir-and-all-good-subs
+        (expand-file-name "~/.xemacs/packages"))
+       (list (concat "/etc/xemacs" debian-xemacs-major-version))
+       '("/etc/emacs")
+       (list (concat "/usr/local/share/emacs/xemacs-" debian-xemacs-version
+                     "/site-lisp"))
+       '("/usr/local/share/emacs/site-lisp")
+       `(,@(dir-and-all-good-subs "/usr/local/lib/xemacs/site-lisp")
+           ,@(dir-and-all-good-subs
+              (concat "/usr/share/xemacs/site-lisp-"
+                      debian-xemacs-major-version "/"))
+           ,@(dir-and-all-good-subs "/usr/share/xemacs/site-lisp/")
+           ,@(dir-and-all-good-subs
+              (concat "/usr/share/xemacs" debian-xemacs-major-version
+                      "/site-lisp/"))
+           )
+       load-path
+       '("/usr/share/emacs/site-lisp")))
+
+;; should now load from one of the /etc dirs since they are first in
+;; the path now.
+(load "site-start" t)
+
+;;; end 00debian.el
--- xemacs21-21.4.17.orig/debian/PackagesMakefile.in
+++ xemacs21-21.4.17/debian/PackagesMakefile.in
@@ -0,0 +1,632 @@
+#!/usr/bin/make -f
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  DEB_CFLAGS += -g
+endif
+
+b = @TOPDIR@/debian/build
+t = @TMP_FILE_LOC@
+
+docdir_start = /@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@
+
+all:
+
+build: pre-internal-build canna-wnn-build  gnome-canna-wnn-build gnome-mule-build gnome-nomule-build mule-build nomule-build general-build
+
+binary-indep: xemacs@MAJVERSION@@SUBNAME@ xemacs@MAJVERSION@@SUBNAME@-supportel xemacs@MAJVERSION@@SUBNAME@-support #xemacs@MAJVERSION@@SUBNAME@-dochtml
+
+binary-arch: xemacs@MAJVERSION@@SUBNAME@-nomule xemacs@MAJVERSION@@SUBNAME@-mule xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn xemacs@MAJVERSION@@SUBNAME@-gnome-nomule xemacs@MAJVERSION@@SUBNAME@-gnome-mule xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn xemacs@MAJVERSION@@SUBNAME@-bin
+
+clean:
+	-rm -rf @TOPDIR@/debian/build
+	-rm -f html-build-stamp
+	-rm -f canna-wnn-build-stamp mule-build-stamp nomule-build-stamp
+	-rm -f gnome-canna-wnn-build-stamp gnome-mule-build-stamp gnome-nomule-build-stamp
+	-rm -f general-build-stamp
+	-rm -f debian/xemacs@MAJVERSION@.info.gz
+	# this makes sure we don't get a HUGE (meg size) .diff.gz and
+	# causes no harm since we have to run autoconf at the begining
+	#-rm -f configure
+	for i in mule nomule mule-canna-wnn gnome-mule gnome-nomule gnome-mule-canna-wnn ; do \
+	  rm -f lib-src/DOC-@VERSION@-$$i ; \
+	  rm -f src/xemacs-@VERSION@-$$i ; \
+	  rm -f src/xemacs-@VERSION@-dmp-$$i ; \
+	  rm -f src/xemacs-@VERSION@-$$i-config.values ; \
+	done
+	cd man ; sh ../debian/convert-texi-files CLEAN
+	-rm -f `find . -name '*.elc' -print`
+	-rm -f debian/xemacs@MAJVERSION@.texi
+	-rm -f debian/*-info
+	-rm -f info/*info*
+	-rm -f lwlib/*.o
+	-rm -f lwlib/*.a
+	-rm -f src/NEEDTODUMP src/dump-id.c
+
+installit:
+	$(MAKE) install prefix=@TOPDIR@/@TMP_FILE_LOC@/@PREFIX@ infodir=/@TOPDIR@/@TMP_FILE_LOC@/@PREFIX@/share/info/xemacs@MAJVERSION@ datadir=@TOPDIR@/@TMP_FILE_LOC@/@PREFIX@/share
+	cp @TOPDIR@/@TMP_FILE_LOC@/@PREFIX@/share/xemacs-@VERSION@/etc/editclient.sh @TOPDIR@/@TMP_FILE_LOC@/@PREFIX@/bin/editclient
+
+
+xemacs@MAJVERSION@@SUBNAME@:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_installdocs -p$@ -P$(b)/$@
+	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_compress -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	# dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+xemacs@MAJVERSION@@SUBNAME@-support:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+	cp $(b)/$@/@PREFIX@/share/xemacs-@VERSION@/etc/xemacs-icon*.* $(b)/$@/@PREFIX@/share/icons
+	cp debian/00debian.el $(b)/$@/etc/xemacs@MAJVERSION@/site-start.d/
+	cp debian/site-start.el $(b)/$@/@PREFIX@/share/xemacs@MAJVERSION@/site-packages/lisp
+	cp debian/debian-rundir.el $(b)/$@/@PREFIX@/share/xemacs@MAJVERSION@/site-packages/lisp
+	perl debian/get_menu_part info/dir debian/xemacs@MAJVERSION@.texi
+	( cd debian ; makeinfo xemacs@MAJVERSION@.texi )
+	cp debian/xemacs@MAJVERSION@.info $(b)/$@/@PREFIX@/share/info/xemacs@MAJVERSION@
+#	( cd $(b)/$@/@PREFIX@/share/info/xemacs@MAJVERSION@ ; rm dir ; ln -s xemacs@MAJVERSION@.info dir )
+	rm -f $(b)/$@/@PREFIX@/share/info/xemacs@MAJVERSION@/dir*
+#       remove files causing lintian errors
+	( cd $(b)/$@ ; find . -name .cvsignore | xargs rm -f )
+#       remove file used only by windows version that causes lintian errors
+	rm $(b)/$@/@PREFIX@/share/xemacs-@VERSION@/etc/check_cygwin_setup.sh
+#	mv $(b)/$@/@PREFIX@/info/* $(b)/$@/@PREFIX@/share/info
+#	-rmdir $(b)/$@/@PREFIX@/info
+#	dh_testversion
+	dh_installdocs --package=$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+#	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+	dh_undocumented -p$@ -P$(b)/$@
+	dh_installchangelogs -p$@ -P$(b)/$@
+	mv $(b)/$@/@PREFIX@/share/doc/$@/ChangeLog $(b)/$@/@PREFIX@/share/doc/$@/changelog
+	dh_strip -p$@ -P$(b)/$@
+	dh_compress -p$@ -P$(b)/$@
+#	gunzip $(b)/$@/@PREFIX@/share/info/xemacs@MAJVERSION@/xemacs@MAJVERSION@.info.gz
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_link -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+xemacs@MAJVERSION@@SUBNAME@-bin:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+#	dh_testversion
+#	dh_installdocs --package=$@ -P$(b)/$@
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	rm -f $(t)/@PREFIX@/bin/ootags
+	set -e ; for i in @SUPPORT_BINS@ ; do cp $(t)/@PREFIX@/bin/$$i $(b)/$@/@PREFIX@/bin/$$i.xemacs@MAJVERSION@ ; done
+	set -e ; for i in gnuattach gnuclient gnudoit ellcc b2m rcs-checkin ; do cp debian/$$i.xemacs@MAJVERSION@.1 $(b)/$@/@PREFIX@/share/man/man1 ; done
+	set -e ; for i in etags gnuserv xemacs ; do cp $(t)/@PREFIX@/man/man1/$$i.1 $(b)/$@/@PREFIX@/share/man/man1/$$i.xemacs@MAJVERSION@.1 ; done
+	gzip -9fr $(b)/$@/@PREFIX@/share/man/man1 || exit 0
+
+#	dh_installexamples  -p$@ -P$(b)/$@
+#	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	chown root.mail \
+	    $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/movemail
+	chmod 2755 $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/movemail
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-supportel:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+	sh debian/move-el-files $(t)/@PREFIX@/share/xemacs-@VERSION@/lisp $(b)/$@/@PREFIX@/share/xemacs-@VERSION@/lisp
+	gzip -9fr $(b)/$@/@PREFIX@/share/xemacs-@VERSION@ || exit 0
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+#	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-nomule:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/nomule
+	cp lib-src/DOC-@VERSION@-nomule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/nomule/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=nomule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=nomule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-nomule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-nomule
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-nomule xemacs@MAJVERSION@-nomule )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs@MAJVERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-mule:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/mule
+	cp lib-src/DOC-@VERSION@-mule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/mule/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=mule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=mule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-mule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-mule
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-mule xemacs@MAJVERSION@-mule )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs@MAJVERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/mule-canna-wnn
+	cp lib-src/DOC-@VERSION@-mule-canna-wnn $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/mule-canna-wnn/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=mule-canna-wnn ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=mule-canna-wnn ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-mule-canna-wnn $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-mule-canna-wnn
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-mule-canna-wnn xemacs@MAJVERSION@-mule-canna-wnn )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs@MAJVERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+######################################################################
+# Gnome section
+xemacs@MAJVERSION@@SUBNAME@-gnome-nomule:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-nomule
+	cp lib-src/DOC-@VERSION@-gnome-nomule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-nomule/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=gnome-nomule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=gnome-nomule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-gnome-nomule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-nomule
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-nomule xemacs@MAJVERSION@-gnome-nomule )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-nomule.1
+	cp debian/xemacs@MAJVERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-nomule.1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-gnome-mule:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule
+	cp lib-src/DOC-@VERSION@-gnome-mule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=gnome-mule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=gnome-mule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-gnome-mule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-mule
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-mule xemacs@MAJVERSION@-gnome-mule )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-mule.1
+	cp debian/xemacs@MAJVERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-mule.1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+
+xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+	dh_movefiles -p$@ -P$(b)/$@
+
+	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule-canna-wnn
+	cp lib-src/DOC-@VERSION@-gnome-mule-canna-wnn $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule-canna-wnn/DOC
+	-mkdir -p $(b)/$@/@PREFIX@/bin
+	V=gnome-mule-canna-wnn ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
+	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
+	fi
+	V=gnome-mule-canna-wnn ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
+	cp src/xemacs-@VERSION@-gnome-mule-canna-wnn $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-mule-canna-wnn
+	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-mule-canna-wnn xemacs@MAJVERSION@-gnome-mule-canna-wnn )
+
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
+	cp debian/xemacs-@VERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-mule-canna-wnn.1
+	cp debian/xemacs@MAJVERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-mule-canna-wnn.1
+	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+	dh_strip -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+######################################################################
+
+xemacs@MAJVERSION@@SUBNAME@-htmldoc:
+	dh_testroot
+	dh_installdirs -p$@ -P$(b)/$@
+#	dh_movefiles -p$@ -P$(b)/$@
+#	dh_testversion
+	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-support $@ )
+#	dh_installdocs -p$@ -P$(b)/$@
+#	dh_installexamples  -p$@ -P$(b)/$@
+#	dh_installmenu  -p$@ -P$(b)/$@
+#	dh_installemacsen  -p$@ -P$(b)/$@
+#	dh_installinit  -p$@ -P$(b)/$@
+#	dh_installcron  -p$@ -P$(b)/$@
+#	dh_installmanpages  -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_undocumented -p$@ -P$(b)/$@
+#	dh_installchangelogs -p$@ -P$(b)/$@
+#	dh_compress -p$@ -P$(b)/$@
+#	dh_fixperms -p$@ -P$(b)/$@
+	dh_installdeb -p$@ -P$(b)/$@
+	dh_shlibdeps -p$@ -P$(b)/$@
+	dh_gencontrol -p$@ -P$(b)/$@
+	dh_makeshlibs -p$@ -P$(b)/$@
+	dh_md5sums -p$@ -P$(b)/$@
+	dh_builddeb -p$@ -P$(b)/$@
+
+pre-internal-build:
+	autoconf2.13
+	echo
+
+general-build: general-build-stamp
+general-build-stamp:
+	cd man ; sh ../debian/convert-texi-files
+	$(MAKE) info
+
+# let's set up a couple things here for only one version
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+error_opts = \
+	--debug \
+	--error-checking=gc,malloc,typecheck
+else
+error_opts = \
+	--error-checking=none \
+	--debug=no
+endif
+
+
+non_ver_specific_opts = \
+	--with-sound=none,native \
+	--with-x11 \
+	--extra-verbose \
+	--with-site-lisp \
+	--with-database=berkdb \
+	--statedir="/var/lib" \
+	--infodir="/@PREFIX@/share/info/xemacs-@VERSION@" \
+	--prefix="/@PREFIX@" \
+	--dynamic \
+	$(error_opts) \
+	--with-pop \
+	--with-gpm=no \
+	--with-file-coding \
+	--pdump
+#	--cflags="-DREGEX_MALLOC"
+# 	--ldflags="-s -znocombreloc" \
+#	--cflags="-O2 -Wall -fno-strict-aliasing ${DEB_CFLAGS} ${EXTRA_COMPILE_OPTS}" \
+#	--use-regex-malloc=no \
+
+lucid_athena_opts = \
+	--with_menubars=lucid \
+	--with_scrollbars=lucid \
+	--with_dialogs=athena
+
+gnome_opts = \
+	--with-gtk --with-gnome
+
+
+
+#	--package-path="~/.xemacs::/@PREFIX@/share/xemacs@MAJVERSION@/packages:/@PREFIX@/share/xemacs@MAJVERSION@/mule-packages:/@PREFIX@/share/xemacs@MAJVERSION@/site-packages"
+
+######################################################################
+
+USER_PACKAGES_DIRS = ~/.xemacs:~/.xemacs/packages:~/.xemacs/xemacs-packages
+MULE_PACKAGES_DIRS = $(USER_PACKAGES_DIRS)::/@PREFIX@/share/xemacs@MAJVERSION@/xemacs-packages:/@PREFIX@/share/xemacs@MAJVERSION@/mule-packages:/@PREFIX@/share/xemacs@MAJVERSION@/site-packages
+NOMULE_PACKAGES_DIRS = $(USER_PACKAGES_DIRS)::/@PREFIX@/share/xemacs@MAJVERSION@/xemacs-packages:/@PREFIX@/share/xemacs@MAJVERSION@/site-packages
+
+# this fixes a bug with ia64 compiles
+ifeq (@CONF_NAME@,ia64-debian-linux)
+  non_ver_specific_opts := $(non_ver_specific_opts) --with-system-malloc
+endif
+# maybe it also fixes m68k
+ifeq (@CONF_NAME@,m68k-debian-linux)
+  non_ver_specific_opts := $(non_ver_specific_opts) --with-system-malloc
+endif
+# alpha - same fix
+ifeq (@CONF_NAME@,alpha-debian-linux)
+  non_ver_specific_opts := $(non_ver_specific_opts) --with-system-malloc
+endif
+
+CONFIGURE = ./configure
+
+canna-wnn-build: canna-wnn-build-stamp
+canna-wnn-build-stamp:
+	$(CONFIGURE) ${non_ver_specific_opts} ${lucid_athena_opts} \
+	  --docdir="$(docdir_start)/mule-canna-wnn/" \
+	  --with-mule --with-canna --with-wnn6 --with-xim=xlib --with-xfs \
+	  --package-path="$(MULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	rm -f src/xemacs src/temacs
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-mule-canna-wnn
+	mv lib-src/config.values src/xemacs-@VERSION@-mule-canna-wnn-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-mule-canna-wnn ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-mule-canna-wnn
+	touch canna-wnn-build-stamp
+
+mule-build: mule-build-stamp
+mule-build-stamp:
+	# mule only
+	rm -f src/xemacs src/temacs
+	$(CONFIGURE) ${non_ver_specific_opts} ${lucid_athena_opts} \
+	  --docdir="$(docdir_start)/mule/" \
+	  --with-mule --with-canna=no --with-wnn=no \
+	  --with-xim=xlib --with-xfs \
+	  --package-path="$(MULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-mule
+	mv lib-src/config.values src/xemacs-@VERSION@-mule-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-mule ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-mule
+	touch mule-build-stamp
+
+nomule-build: nomule-build-stamp
+nomule-build-stamp:
+	# no mule
+	rm -f src/xemacs src/temacs
+	$(CONFIGURE) ${non_ver_specific_opts} ${lucid_athena_opts} \
+	  --docdir="$(docdir_start)/nomule/" --with-mule=no \
+	  --package-path="$(NOMULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-nomule
+	mv lib-src/config.values src/xemacs-@VERSION@-nomule-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-nomule ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-nomule
+	touch nomule-build-stamp
+
+######################################################################
+## Gnome Section
+gnome-canna-wnn-build: gnome-canna-wnn-build-stamp
+gnome-canna-wnn-build-stamp:
+	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
+	  --docdir="$(docdir_start)/gnome-mule-canna-wnn/" \
+	  --with-mule --with-canna --with-wnn6 --with-xim=xlib --with-xfs \
+	  --package-path="$(MULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-gnome-mule-canna-wnn
+	mv lib-src/config.values src/xemacs-@VERSION@-gnome-mule-canna-wnn-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-mule-canna-wnn ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-mule-canna-wnn
+	touch gnome-canna-wnn-build-stamp
+
+gnome-mule-build: gnome-mule-build-stamp
+gnome-mule-build-stamp:
+	# mule only
+	rm -f src/xemacs src/temacs
+	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
+	  --docdir="$(docdir_start)/gnome-mule/" \
+	  --with-mule --with-canna=no --with-wnn=no \
+	  --with-xim=xlib --with-xfs \
+	  --package-path="$(MULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-gnome-mule
+	mv lib-src/config.values src/xemacs-@VERSION@-gnome-mule-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-mule ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-mule
+	touch gnome-mule-build-stamp
+
+gnome-nomule-build: gnome-nomule-build-stamp
+gnome-nomule-build-stamp:
+	# no mule
+	rm -f src/xemacs src/temacs
+	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
+	  --docdir="$(docdir_start)/gnome-nomule/" --with-mule=no \
+	  --package-path="$(NOMULE_PACKAGES_DIRS)" \
+	  @CONF_NAME@
+	$(MAKE) all-elc
+	mv src/xemacs src/xemacs-@VERSION@-gnome-nomule
+	mv lib-src/config.values src/xemacs-@VERSION@-gnome-nomule-config.values
+	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-nomule ; fi
+	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-nomule
+	touch gnome-nomule-build-stamp
+######################################################################
+
+html-build: html-build-stamp
+html-build-stamp:
+	# html files
+	-mkdir -p @HTML_FILE_LOC@
+	set -e ; \
+	cd @HTML_FILE_LOC@ ; \
+	for i in `find @TOPDIR@/man -name '*.texi' -print` ; do \
+	  texi2html -split -l2h -I@TOPDIR@/man -number $$i ; exit 0 ; \
+	done
+	touch html-build-stamp
+
+# Local variables:
+# mode: makefile
+# End:
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@-mule.1.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@-mule.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/ctags.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/ctags.xemacs@MAJVERSION@.1.in
@@ -0,0 +1 @@
+.so man1/etags.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/debian-rundir.el
+++ xemacs21-21.4.17/debian/debian-rundir.el
@@ -0,0 +1,60 @@
+;;; debian-rundir.el --- run all lisp startup files in a directory.
+
+;; Copyright (C) 1996 Mark Eichin
+
+;; Maintainer: Mark Eichin <eichin@kitten.gen.ma.us>
+;; Keywords: debian
+
+;; This file is part of the debian release of GNU Emacs, and will
+;; be contributed to the FSF after testing. It is released under the same
+;; terms, namely the GPL v2 or later.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file provides functions to process a directory full of lisp
+;; files in the style of the System V "rc0.d" mechanism, namely the
+;; directory contents are sorted alphabetically, and the files are
+;; conventionally named 00program.el (default of 50, but allowing
+;; order.)
+
+(defvar emacs-debian-default-directory
+  (if (string-match ".*XEmacs.*" emacs-version)
+      (let ((point
+             (string-match "[0-9]*\.[0-9]*.*XEmacs.*" emacs-version)))
+        (concat "/etc/xemacs/site-start-"
+                (substring emacs-version point (+ point 2))
+                ".d"))
+  "/etc/emacs/site-start.d")
+  "The default directory for this version of XEmacs to load from")
+
+
+(defun debian-run-directory (&optional dir)
+  "Load each file in the form 00filename.el stored in the path.
+The files are sorted so order can be controlled."
+  (interactive "DConfiguration directory : ")
+  (let ((path (if dir dir emacs-debian-default-directory)))
+    (mapcar
+     (lambda (file)
+       (if debug-on-error
+	   (load-file file)
+	 (condition-case ()
+	     (progn
+	       (load file nil t t)
+	       (message "*** %s loaded ***" (file-name-nondirectory file)))
+	   (error (message "Error while loading %s" file)))))
+     (directory-files path t "^[0-9][0-9].*\\.el$" nil))))
--- xemacs21-21.4.17.orig/debian/README.debian.in
+++ xemacs21-21.4.17/debian/README.debian.in
@@ -0,0 +1,39 @@
+xemacs for DEBIAN
+----------------------
+
+This is XEmacs @VERSION@.  It is very much the same as GNU Emacs,
+except that it has better support for X.  It is larger than GNU Emacs
+so it requires more resources to run, but if you have them it is well
+worth it IMO. :)
+
+This version of XEmacs contains MULE support.  This is much better
+internationalization support.  It displays Japanese/Korean/etc
+characters.  You must have these fonts installed in order for this to
+be effective.
+
+James LewisMoss <dres@debian.org>, Sun, 21 Mar 1999 17:24:51 -0500
+
+Notes:
+
+1) To get auctex working please add "(require 'tex-site)" to your
+   ~/.xemacs/init.el file.
+
+2) You have to have xemacs@MAJVERSION@-basesupport and
+   xemacs@MAJVERSION@-mulesupport installed BEFORE you compile this
+   else bad things will happen.
+
+3) For mule binaries you must use "fontSet" rather than "font" in
+   Xresources to change the fonts used.  For example:
+Emacs*font: -*-lucidatypewriter-medium-r-normal-*-10-*
+
+becomes
+Emacs*fontSet: -*-lucidatypewriter-medium-r-normal-*-10-*
+
+4) Instead of "Emacs" as the Xresources class you can now use XEmacs,
+   but if an XEmacs resource exists no Emacs resource will be noticed.
+
+5) Please check out Help->Basics->News for other changes to the new
+   versions.
+
+6) Add "(setq-default font-menu-ignore-scaled-fonts nil)" to your
+   .emacs file so that all the fonts in Options->Fonts become active.
--- xemacs21-21.4.17.orig/debian/makevarfile
+++ xemacs21-21.4.17/debian/makevarfile
@@ -0,0 +1,24 @@
+#!/usr/bin/perl 
+# -*- perl -*-
+
+my $vf = shift(@ARGV);
+
+print "Making file $vf\n";
+
+open(VF, "> $vf");
+
+my %reps = @ARGV;
+
+print VF "\$reps = {\n" || die "Can't print";
+
+foreach (keys %reps) {
+  print VF "    '$_' => \"" . $reps{$_} . "\",\n" || die "Can't print";
+}
+
+print VF "};\n" || die "Can't print";
+
+close(VF);
+
+
+
+
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-bin.postinst.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-bin.postinst.in
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+set -e
+
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-mule
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-nomule
+update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/xemacs-21.1-p2-mule-canna-wnn
+
+update-alternatives --install /usr/bin/xemacs xemacs /usr/bin/xemacs@MAJVERSION@ -10 --slave /usr/share/man/man1/xemacs.1.gz xemacs.1.gz /usr/share/man/man1/xemacs.xemacs@MAJVERSION@.1.gz
+
+update-alternatives --install /usr/bin/movemail movemail /usr/lib/xemacs-@VERSION@/@CONF_NAME@/movemail 10
+
+update-alternatives --install /usr/bin/mmencode mmencode /usr/lib/xemacs-@VERSION@/@CONF_NAME@/mmencode 10
+
+update-alternatives --install /usr/bin/editor editor /usr/bin/xemacs@MAJVERSION@ -100
+
+for i in @SUPPORT_BINS@ ; do
+  update-alternatives --install /usr/bin/$i $i /usr/bin/$i.xemacs@MAJVERSION@ 40 --slave /usr/share/man/man1/$i.1.gz $i.1.gz /usr/share/man/man1/$i.xemacs@MAJVERSION@.1.gz
+done
+
+# remove ootags stuff.  oops. (Bug 159469)
+update-alternatives --remove ootags /usr/bin/ootags.xemacs21
+update-alternatives --remove ctags /usr/bin/ctags.xemacs21
+
+# setup gnuclient as an alternative making it easy to switch the link to it.
+#update-alternatives --install /usr/bin/xemacs xemacs /usr/bin/gnuclient.xemacs@MAJVERSION@ -20
+#update-alternatives --install /usr/bin/xemacs@MAJVERSION@ xemacs@MAJVERSION@ /usr/bin/gnuclient.xemacs@MAJVERSION@ -50
+
+#DEBHELPER#
--- xemacs21-21.4.17.orig/debian/changelog
+++ xemacs21-21.4.17/debian/changelog
@@ -0,0 +1,876 @@
+xemacs21 (21.4.17-0.backports.org.1) unstable; urgency=high
+
+  * recompiled for http://www.backports.org/
+    + built against libpng2-dev instead of libpng3-dev and libtiff3g-dev instead of
+      libtiff4-dev
+
+ -- Norbert Tretkowski <tretkowski@inittab.de>  Sat, 12 Feb 2005 01:31:25 +0100
+
+xemacs21 (21.4.17-1) unstable; urgency=high
+
+  * New upstream release
+    - Upstream authors withdraw previous release due to the critical
+    problem about regular expressions.  So, I set urgency=high.
+    (Closes: #293471).
+    - Fix Gnus regexp infloop (Closes: #288072).
+    - Add new section about cc-mode (Closes: #117096).
+  * debian/patches/01_debian_patch.dpatch: Sync with 21.4.17
+  * debian/patches/10_movemail_popfmt.dpatch: Delete.  This patch is
+    included in upstream source.
+
+ -- OHURA Makoto <ohura@debian.org>  Tue,  8 Feb 2005 01:05:27 +0900
+
+xemacs21 (21.4.16-2) unstable; urgency=high
+
+  * debian/00debian.el: Enable support of wheel mouse (Closes: #288807).
+  * debian/control.in:
+    - Rewrite short descriptions.
+    - Remove description of unpackaged stuff, xemacs21-htmldoc.
+  * debian/patches/20_gcc_4.0_compiling.dpatch: Fix compiling problem of
+    gcc-4.0 (Closes: #289294).
+  * debian/patches/10_movemail_popfmt.dpatch: Fix local privilege
+    escalation in movemail [CAN-2005-100].
+  * debian/generate-menus: Quote string in menu item.
+
+ -- OHURA Makoto <ohura@debian.org>  Sat,  5 Feb 2005 22:11:01 +0900
+
+xemacs21 (21.4.16-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- OHURA Makoto <ohura@debian.org>  Sun, 12 Dec 2004 15:41:58 +0900
+
+xemacs21 (21.4.15-8) unstable; urgency=low
+
+  * Remove alternatives for ootags and ctags in prerm. (Closes: #269177).
+  * debian/patches/10_itimer_error_with_de.dpatch: Fix `itimer timeout'
+    error with de_DE locale. (Closes: #228883).
+  * debian/patches/10_info_el_with_line_number.dpatch: Fix info.el to
+    support info-index with the line number. (Closes: #275795).
+  * debian/00debian.el: Rewrite.
+    - Fix path for psgml, because sgml-data package changes installation
+    directory for sgml stuff. (Closes: #240930).
+    - Remove settings for Info-directory-list.
+    - Remove auto-mode-alist related to psgml.
+    - Remove settings of some variables, whose values are system default
+    ones.
+    
+ -- OHURA Makoto <ohura@debian.org>  Fri, 22 Oct 2004 23:07:36 +0900
+
+xemacs21 (21.4.15-7) unstable; urgency=medium
+
+  * debian/00debian.el: Set sgml-local-catalogs to /etc/sgml/catalog
+    instead of /usr/lib/sgml/catalog.  (Closes: #265530).
+  * debian/control.in: Add `Conflicts: sgml-base (<< 1.23)' to
+    xemacs21-support.  The catalog directory for SGML was changed at
+    sgml-base package.
+  * debian/patches/10_gnuserv_disable_inet.dpatch: Disable internet domain
+    socket for gnuserv for security issues. (Closes: #177236)
+
+ -- OHURA Makoto <ohura@debian.org>  Sat, 28 Aug 2004 11:36:03 +0900
+
+xemacs21 (21.4.15-6) unstable; urgency=medium
+
+  * debian/xemacs@MAJVERSION@@SUBNAME@-support.postinst.in:
+    Make symbolic link to /usr/share/xemacs-21.4.15/{lisp,etc} at
+    /usr/lib/xemacs-21.4.15. (Closes: #265169, #265177, #265140).
+
+ -- OHURA Makoto <ohura@debian.org>  Thu, 12 Aug 2004 23:02:43 +0900
+
+xemacs21 (21.4.15-5) unstable; urgency=medium
+
+  * This release is the final release for Sarge, I hope.  Fix all RC bugs.
+  * debian/patches/04_ia64_segv.dpatch: Disable.  I don't know why but
+    patch from SuSE Linux doesn't work fine.
+  * debian/patches/04_ia64_not_export_dynamic.dpatch: New patch from
+    redhat Bugzilla.  This patch really fix SEGV problem on ia64.
+    (Closes: #207412, #149088, #218241).
+  * debian/00debian.el: Remove sgml-display-char-list-filename.
+    (Closes: #263469, #215900).
+  * debian/control.in: Update version dependency for xemacs21-basesupport
+    and xemacs21-mulesupport. (Closes: #263529).
+  * debian/PackagesMakefile.in: Install architecture-independent files to
+    /usr/share, not /usr/lib.
+
+ -- OHURA Makoto <ohura@debian.org>  Wed, 11 Aug 2004 00:07:40 +0900
+
+xemacs21 (21.4.15-4) unstable; urgency=low
+
+  * Rebuild with libtiff4.
+  * debian/control.in: Change Build-Depends: from libtiff3g-dev to
+    libtiff4-dev.
+  * PackagesMakefile.in: Remove src/NEEDTODUMP and src/dump-id.c in clean:
+    target.
+
+ -- OHURA Makoto <ohura@debian.org>  Fri, 30 Jul 2004 00:04:06 +0900
+
+xemacs21 (21.4.15-3) unstable; urgency=low
+
+  * Change over to dpatch system.
+    - debian/patches/04_ia64_segv.dpatch: Borrow patch for ia64 from
+      xemacs21 package of SUSE Linux.  I hope this patch will fix SEGV
+      problem on ia64.  Ia64 people, please test this package.
+  * debian/PackagesMakefile.in: Run autoconf2.13 in pre-internal-build:
+    target.
+  * debian/control.in: Add autoconf2.13 and dpatch (>= 1.11) to
+    Build-Depends.
+  * debian/onntrol.in: Update Standards-Version.
+  * Update config.guess and config.sub.
+
+ -- OHURA Makoto <ohura@debian.org>  Tue, 27 Jul 2004 22:10:50 +0900
+
+xemacs21 (21.4.15-2) unstable; urgency=low
+
+  * New maintainer, with previous maintainer's consent.
+  * Override previous NMU.
+  * debian/rules: Comment out export DEB_BUILD_OPTIONS=nostrip.
+  * Fix FTBFS problem on m68k (Closes: #127480, #206667).
+  * Remove info dir file in xemacs21-support. (Closes: #249672).
+
+ -- OHURA Makoto <ohura@debian.org>  Thu, 22 Jul 2004 21:42:42 +0900
+
+xemacs21 (21.4.15-1.1) unstable; urgency=low
+
+  * NMU.
+  * debian/rules: Comment out export DEB_BUILD_OPTIONS=nostrip.
+  * Fix FTBFS problem on m68k (Closes: #127480, #206667).
+  * Remove info dir file in xemacs21-support. (Closes: #249672).
+
+ -- OHURA Makoto <ohura@debian.org>  Sat, 17 Jul 2004 21:48:32 +0900
+
+xemacs21 (21.4.15-1) unstable; urgency=low
+
+  * New upstream release
+  * Add --with-mule=no to configure targets for nomule binaries.
+
+ -- James LewisMoss <dres@debian.org>  Mon,  9 Feb 2004 22:37:00 -0500
+
+xemacs21 (21.4.14-4) unstable; urgency=low
+
+  * Add var to specify the maximum number of fonts to load from the
+    server.
+
+ -- James LewisMoss <dres@debian.org>  Tue, 13 Jan 2004 22:55:31 -0500
+
+xemacs21 (21.4.14-3) unstable; urgency=low
+
+  * Patch from Neil Roeth to fix alpha compile. (Closes: #201657)
+  * Patch from anarcat to fix powerpc problems (Closes: #200430)
+
+ -- James LewisMoss <dres@debian.org>  Mon, 10 Nov 2003 10:25:23 -0500
+
+xemacs21 (21.4.14-2) unstable; urgency=low
+
+  * Remove specifying cflags in configure line and let xemacs do its own
+    thing.
+  * Remove --use_regex_malloc from configure line
+
+ -- James LewisMoss <dres@debian.org>  Fri,  3 Oct 2003 15:05:43 -0400
+
+xemacs21 (21.4.14-1) unstable; urgency=low
+
+  * New upstream release
+  * Apply patch from Stephen Turnbull to up malloc limits with REGEX_MALLOC.
+    OK revert to no regex malloc.  It's crashing with and without the patch.
+  * Copy xemacs icons to /usr/share/icons
+  * Apply hpux patch from Lamont Jones (Closes: #206671, #133682)
+  * Modify configure.in to handle db4.1's #define db_create db_create_4001
+  * Fix descriptions (Closes: #209848)
+  * Fix module-load-path (Closes: #206791)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 27 Sep 2003 11:02:36 -0400
+
+xemacs21 (21.4.13-4) unstable; urgency=low
+
+  * Remove -DREGEX_MALLOC from compile.  It's breaking other stuff badly.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 20 Jul 2003 17:39:31 -0400
+
+xemacs21 (21.4.13-3) unstable; urgency=low
+
+  * Apply patch to fix makefile rule (Closes: #200650) (thanks Eric
+    Schwartz)
+  * Oops.  Forgot to change /packages/ to /xemacs-packages/ in 00debian.el
+    (caused missing info pages)
+  * Add /usr/share/xemacs21/xemacs-packages/etc/psgml-dtds/CATALOG to
+    sgml-local-catalogs
+
+ -- James LewisMoss <dres@debian.org>  Thu, 17 Jul 2003 11:52:38 -0400
+
+xemacs21 (21.4.13-2) unstable; urgency=low
+
+  * Move gnome packages to section gnome (override warning)
+  * Remove libsasl-dev build-depend and let libldap2-dev do the depending
+    (Closes: #199870)
+  * Really add the editclient binary.
+  * Write a man page for ellcc.
+  * Random fixups to build depends.
+  * Make sure libldap2-dev is installed before compile.
+
+ -- James LewisMoss <dres@debian.org>  Tue,  8 Jul 2003 15:20:17 -0400
+
+xemacs21 (21.4.13-1) unstable; urgency=low
+
+  * New upstream release
+  * Copy editclient.sh to /usr/bin/editclient (Closes: #197160, #197151)
+  * Change xemacs to look in /xemacs-packages rather than /packages to
+    match upstream change.
+  * add start of, but disable because of errors:
+    call emacsen-install with xemacs21-mule, xemacs21-nomule and xemacs21
+    (per discussion on debian-emacsen)
+  * Fix compiles on ia64 by adding --with-system-malloc (Closes: #169553)
+  * Do same for m68k.
+  * Add -DREGEX_MALLOC to configure (Closes: #173423)
+  * Include ellcc (Closes: #192629)
+  * Add debhelper v4 build depends. (lintian)
+  * Copy new config.{guess,sub} (lintian)
+  * remove conffiles file. (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 24 Jun 2003 15:41:07 -0400
+
+xemacs21 (21.4.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- James LewisMoss <dres@debian.org>  Mon, 27 Jan 2003 12:28:22 -0500
+
+xemacs21 (21.4.11-1) unstable; urgency=low
+
+  * New upstream release
+  * Recompile to get new libpg deps.
+  * Remove conffile file.  Fix copyright (s). (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Fri, 10 Jan 2003 18:33:51 -0500
+
+xemacs21 (21.4.10-3) unstable; urgency=low
+
+  * Add gnuclient menu entry in -bin package (Closes: #171433)
+  * Recompile for new libpg interface.
+
+ -- James LewisMoss <dres@debian.org>  Fri,  3 Jan 2003 09:13:31 -0500
+
+xemacs21 (21.4.10-2) unstable; urgency=low
+
+  * Remove copied config.values files. (makes diff smaller)
+  * Change build-depends on libxaw-dev to libxaw7-dev. (Closes: #169997)
+  * Recompile to fix bonobo-activation crash (I hope)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 24 Nov 2002 10:58:21 -0500
+
+xemacs21 (21.4.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Add copyright notice from documentation (Closes: #161501)
+  * Add update-alt --remove ootags in bin postinst (Closes: #159469)
+  * Add --pdump option and handle the extra files.  Required by
+    incompatibility with glibc 2.3.1.
+  * Remove ctags from package.  Exuberant-ctags provides a better version
+    for the vi's of the world.
+  * Patch pdump code to look in docdir for DUMP additionally to the .dmp
+    file in /usr/bin.
+  * Remove /usr/doc link stuff.
+  * Include config.values in per type dirs.
+  * Move xemacs info files to /usr/share/info/xemacs21 and put the
+    xemacs21 info file there.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 11 Nov 2002 09:37:54 -0500
+
+xemacs21 (21.4.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- James LewisMoss <dres@debian.org>  Mon, 14 Oct 2002 10:22:18 -0400
+
+xemacs21 (21.4.8-3) unstable; urgency=low
+
+  * Add --with-file-coding opt to configure.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 14 Oct 2002 09:56:28 -0400
+
+xemacs21 (21.4.8-2) unstable; urgency=low
+
+  * Add --with-pop to configure line (Closes: #37854)
+  * Add DEB_BUILD_OPTIONS support for debug and depend on dh_strip to deal
+    with nostrip correctly (Policy change)
+  * Fix gnuclient/gtk problem (Closes: #)
+  * Revert setq -> custom-set-variables change from 21.4.6-9 in 00debian.el
+  * Add gtk as window-system for setting fonts in psgml.
+  * Add xemacs-21.4.8 to path for xemacs info files (Closes: #152288)
+  * Minor README changes.
+  * Switch to using /usr/share/info as the base info dir rather than
+    /usr/info.
+
+ -- James LewisMoss <dres@debian.org>  Tue,  6 Aug 2002 10:24:58 -0400
+
+xemacs21 (21.4.8-1) unstable; urgency=low
+
+  * New upstream.
+  * Fix texi modifying script to remove all the .old files (now .deb-old)
+  * Remove ootags from xemacs21-bin package so as not to conflict with
+    oo-browser package (which actually uses the program and xemacs doesn't
+    by default).
+
+ -- James LewisMoss <dres@debian.org>  Wed, 15 May 2002 23:46:14 -0400
+
+xemacs21 (21.4.6-9) unstable; urgency=low
+
+  * Remove /usr/info from Info-directory-list
+  * Wrap if file-directory-p's around /usr/local/info and add
+    /usr/share/info with same wrap.
+  * Remove usr/share/info/xemacs-.../dir.gz since we shouldn't ever be
+    using it.
+  * wrap mule-packages info file dir in a file-directory-p.
+  * Use custom-set-variables to set everything rather than setq and
+    setq-default.
+  * Remove duplicated info with let and use @@ replacements for
+    load-path.
+  * Move @@ stuff to two setqs at the top of the file and use those vars
+    everywhere.  More random elisp cleanups.
+  * Don't generate subdirectory ref in xemacs21.info file to avoid not
+    found warnings in search for subdir.  Use search path dir to catch it
+    instead.
+  * Fix texi file conversion (wasn't modifying files in subdirs)
+  * Maybe fix some of the psgml problems with the 00debian.el cleanup (use
+    local variables rather than overwriting xemacs system ones)
+  * Add DH_COMPAT=4 to rules.
+  * Minor rules file formatting changes.
+  * add install and pre-build to .PHONY tag in rules.
+  * add .PHONY to ConfigMakefile
+  * Remove the --without-postgresql cause postgresql is now in base.
+  * Add -f to all rm calls in the generate scripts.
+
+ -- James LewisMoss <dres@debian.org>  Thu,  2 May 2002 23:36:34 -0400
+
+xemacs21 (21.4.6-8) unstable; urgency=low
+
+  * Add (packages-reload-autoloads) to 00.debian.el.  This may fix a lot
+    of problems people are having.
+  * Reverse order of /etc/ dirs in path to comply with emacsen policy.
+  * Add /usr/local/share/emacs/{site-lisp,xemacs-@VERSION/site-lisp} to
+    load path to comply with emacsen policy. (Though I don't know why it's
+    policy :)
+
+ -- James LewisMoss <dres@debian.org>  Sun,  7 Apr 2002 10:40:44 -0400
+
+xemacs21 (21.4.6-7) unstable; urgency=low
+
+  * Recompile to fix libpng troubles (Closes: #130171)
+  * OK.  Now use the symlink xemacs21-<type> for the alternatives
+    mechanism so we track across minor version without breaking things.
+    Unfortunately that means we need to clean up past screwups, so
+    --remove for versions 1-5 in postinst. (Closes: #129499)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 20 Jan 2002 19:27:51 -0500
+
+xemacs21 (21.4.6-6) unstable; urgency=low
+
+  * Oops.  Added a couple too many )'s in 00debian.el (Closes: #127140)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 30 Dec 2001 22:02:40 -0500
+
+xemacs21 (21.4.6-5) unstable; urgency=low
+
+  * OK.  Ppc is broken with the current nocombreloc setup.  It needs
+    "-Wlinker -znocombreloc" rather than "-z nocombreloc".  Check if
+    everything will work with the former.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 30 Dec 2001 08:44:42 -0500
+
+xemacs21 (21.4.6-4) unstable; urgency=low
+
+  * Back out all the configure.in changes related to nocombreloc.
+  * Recompile to fix crash with nomule and mule (Closes: #126815)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 29 Dec 2001 17:32:22 -0500
+
+xemacs21 (21.4.6-3) unstable; urgency=low
+
+  * Add .xemacs/xemacs-packages .xemacs/packages to 00debian.el
+  * Redirect error output from dpkg in postinst.  Oops.  (Closes: #126011)
+  * Fix configure.in to use "-znocombreloc" rather than "-z nocombreloc"
+    (Closes: #126028)
+
+ -- James LewisMoss <dres@debian.org>  Thu, 27 Dec 2001 14:03:23 -0500
+
+xemacs21 (21.4.6-2) unstable; urgency=low
+
+  * Look for packages in ~/.xemacs/xemacs-packages (Closes: #125708)
+  * Clean up packages setup to remove double strings.
+
+ -- James LewisMoss <dres@debian.org>  Wed, 19 Dec 2001 12:25:18 -0500
+
+xemacs21 (21.4.6-1) unstable; urgency=low
+
+  * New upstream. (Closes: #119659)
+  * Remove .cvsignore and check_cygwin_setup.sh from -support package
+    (lintian warnings and errors)
+  * Only update-alternatives --remove on != upgrade (Closes: #120697,
+    #119910)
+  * Redirect stderr to make harmless error messages go away (Closes:
+    #120916)
+  * No longer uses esd (Closes: #112841)
+  * Apply patch from mailing list to fix random popping window with
+    gnome/gtk version (Closes: #101030, #106975)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 18 Dec 2001 00:06:10 -0500
+
+xemacs21 (21.4.5-1) unstable; urgency=low
+
+  * New upstream.
+  * Remove esd as compile for sound.
+  * Add --ldflags="-s -znocombreloc" to configure line.  Should fix
+    crashes. (Thanks Salman Ahmed)
+  * Fix copyright file to point to correct place for the GPL (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Thu, 15 Nov 2001 15:13:45 -0500
+
+xemacs21 (21.4.4-1) unstable; urgency=low
+
+  * New upstream. (Closes: #95382, #102731, #101758)
+  * Apply patch from Aaron Crane to fix file names in
+    load-history. (Closes: #58313, #65816)
+  * Apply patch to fix athena widget sensing (Peter Brown from xemacs ml)
+  * Add --with-ipv6-cname=no to configure line.  Closes slow startup times
+    bugs. (Closes: #104533)
+  * Remove --const-is-losing configure arg.
+  * README-beta -> README-release in support installed docs.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 30 Jul 2001 12:15:51 -0400
+
+xemacs21 (21.4.3-4) unstable; urgency=low
+
+  * Apply patch from Aaron Crane to fix file names in
+    load-history. (Closes: #58313, #65816)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 29 Jul 2001 22:24:37 -0400
+
+xemacs21 (21.4.3-3) unstable; urgency=low
+
+  * Change faces used in sgml (Closes: #105588)
+  * Add g to sed commands (Closes: #101512)
+  * Apply gtk scrollbar patch (Closes: 101482, #101202)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 24 Jul 2001 20:49:30 -0400
+
+xemacs21 (21.4.3-2) unstable; urgency=low
+
+  * Fix build depends libgnome32-dev -> libgnome-dev (Closes: #101210)
+  * Put a versioned depends on -basesupport and -mulesupport >=
+    2001.04.08-1 (Closes: #101035)
+  * Uploaded new version (Closes: #97990)
+  * Have menu files launch alternative xemacs names (Closes: #99074)
+
+ -- James LewisMoss <dres@debian.org>  Sun, 17 Jun 2001 15:14:50 -0400
+
+xemacs21 (21.4.3-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Fri,  8 Jun 2001 23:56:03 -0400
+
+xemacs21 (21.4.1-3) unstable; urgency=low
+
+  * Add gnome versions of mule, nomule, and mule-canna-wnn packages.
+  * Autogenerate the .menu.in, .postinst.in, prerm.in and preinst.in files
+    for all the xemacs bin packages.
+  * Add build depends on the gnome libraries for the new gnome packages.
+
+ -- James LewisMoss <dres@debian.org>  Thu, 24 May 2001 01:45:52 -0400
+
+xemacs21 (21.4.1-2) unstable; urgency=low
+
+  * add --without-postgresql to configure line (Closes: #98449, #98437)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 22 May 2001 22:25:10 -0400
+
+xemacs21 (21.4.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Change --lockdir to --statedir.
+  * Remove --with-session and --gung-ho (no longer supported by configure)
+
+ -- James LewisMoss <dres@debian.org>  Sun,  6 May 2001 02:17:21 -0400
+
+xemacs21 (21.1.14-5) unstable; urgency=low
+
+  * Add check for -ldb-3 in configure.in.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 30 Apr 2001 15:13:33 -0400
+
+xemacs21 (21.1.14-4) unstable; urgency=lwo
+
+  * Oops.  Forgot to really add libxaw-dev as build depends.
+  * Change build depends from libdb2-dev to libdb3-dev.
+
+ -- James LewisMoss <dres@debian.org>  Sat, 28 Apr 2001 23:38:31 -0400
+
+xemacs21 (21.1.14-3) unstable; urgency=low
+
+  * Add libxaw-dev as build depends (Closes: #92479)
+
+ -- James LewisMoss <dres@debian.org>  Fri, 27 Apr 2001 10:47:13 -0400
+
+xemacs21 (21.1.14-2) unstable; urgency=low
+
+  * Remove xpm4g build depends. (Closes: #91973)
+  * Fixes to sgml-base fixed psgml hang problems (Closes: #89190, #90472)
+  * Add ~/.xemacs/packages to the package path (Closes: 90351)
+  * Man page missing lines fixed. (Closes: #86071, #76180)
+  * Bug seems fixed.  Can't reproduce. (Closes: #77814)
+  * Add Text hints to menus (Closes: #80162, #80043)
+  * Include /usr/share/xemacs21/site-packages/info in -support package
+    (Closes: #88826)
+  * Up standards version to 3.1.0 (lintian)
+  * Move install-info call from postrm to prerm. (lintian)
+  * Add .so man pages for the xemacs21-{mule,mule-canna-wnn,nomule}
+    symlinks (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Thu, 29 Mar 2001 18:02:27 -0500
+
+xemacs21 (21.1.14-1) unstable; urgency=low
+
+  * New upstream.
+  * Closes gnuserv security problem. (Closes: #84628)
+  * Remove dh_suidregister calls.  Add conflicts.
+  * Add psgml code.  (Closes: #83051)
+  * Remove xemacs21-fake from -bin package.  It's outlived it's usefulness
+    (if it ever was)
+  * Strip xemacs binaries again.  Whatever troubles there were seem to be
+    gone again.
+
+ -- James LewisMoss <dres@debian.org>  Sun,  4 Feb 2001 18:36:54 -0500
+
+xemacs21 (21.1.13-1) unstable; urgency=low
+
+  * New upstream.
+  * Merge Chinese mule environment changes into upstream changes.  Someone
+    who knows something about this let me know if the upstream is good
+    enough on it's own.
+  * Upstream changes fixed (split-string "foo bar" "") problem (Closes:
+    #80851)
+
+ -- James LewisMoss <dres@debian.org>  Mon,  8 Jan 2001 02:03:05 -0500
+
+xemacs21 (21.1.12-4) unstable; urgency=low
+
+  * Set TeX-lisp-directory (Closes: #76139)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 16 Dec 2000 04:29:13 -0500
+
+xemacs21 (21.1.12-3) unstable; urgency=low
+
+  * Add Chinese mule fix to lisp/mule/mule-init.el  (Closes: #63805)
+  * New xemacs21-basesupport fixes psgml parsing problem (Closes: #69911)
+  * Someone else has put out a gtk version.  (Closes: #75370, #70518)
+  * Has been recompiled against new libdb/libc (Closes: #72682)
+  * Long fixed bug.  Recompiled with libwnn6-dev (Closes: #57016)
+  * Long fixed bug.  Debian README mentions fontset (Closes: #68380)
+  * Long fixed bug.  New version.  (Closes: #65483)
+  * Fix manpages whatis problem (Patch from Torsten thanks) (Closes:
+    #74275, #78102)
+  * Stop stripping the xemacs binaries.  It's breaking things.
+  * Update build-depends (add debhelper and some more libs) (lintian)
+
+ -- James LewisMoss <dres@debian.org>  Mon, 11 Dec 2000 18:10:49 -0500
+
+xemacs21 (21.1.12-2) unstable; urgency=low
+
+  * Recompile for libdb versioned symbols problem.
+
+ -- James LewisMoss <dres@debian.org>  Wed, 27 Sep 2000 02:10:12 -0400
+
+xemacs21 (21.1.12-1) unstable; urgency=low
+
+  * Remove remaking configure (patch to that has been applied upstream).
+  * Added texi2html to Build-Depends (though not technically neccessary
+    yet) (Closes: #66753)
+  * Added a alternative to /usr/lib/xemacs-@VERSION@/@CONF_NAME@/movemail
+    to /usr/bin/movemail.  I'm sure I'll regret it.  Anyway.
+    (Closes: #66423)
+  * Add alternative as above, but for mmencode (Closes: #64722, #66826)
+  * Add some more depends to make the packages tied together more strongly
+    (fixes problem with new upstream and other arches than first)
+  * New upstream.
+  * Add links from xemacs21-{mule,nomule,mule-canna-wnn} to
+    xemacs-@VERSION@-{mule,nomule,mule-canna-wnn}  (Make it easier on
+    upgrades to pick a type without worrying about minor version changes.)
+  * Fix cleanup of debian/xemacs@MAJVERSION@.texi (and add a trailing
+    newline to the file)
+
+ -- James LewisMoss <dres@debian.org>  Sun,  6 Aug 2000 14:37:27 -0400
+
+xemacs21 (21.1.10-4) frozen unstable; urgency=low
+
+  * Remove /usr/share/emacs/site-lisp (the subdir call, leaving the final
+    one) behind the default load path. (Closes: #66319) (RC bug)
+
+ -- James LewisMoss <dres@debian.org>  Wed, 28 Jun 2000 18:51:22 -0400
+
+xemacs21 (21.1.10-3) frozen unstable; urgency=low
+
+  * Revert setting debian-emacs-flavor in startup.el.in (change to
+    emacsen-common)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 20 Jun 2000 14:35:45 -0400
+
+xemacs21 (21.1.10-2) frozen unstable; urgency=low
+
+  * Comment out gnuclient as xemacs21 alternative.  It's just causing too
+    many troubles.  If anyone can tell me how I'm abusing
+    update-alternatives so that I can fix this problem I'd love it.
+
+ -- James LewisMoss <dres@debian.org>  Thu,  8 Jun 2000 19:43:31 -0400
+
+xemacs21 (21.1.10-1) frozen unstable; urgency=low
+
+  * Newest bug fix upstream.
+  * I'd stick with 21.1.8 for frozen, but it no longer compiles on potato
+    this one does, and this contains the pty security bug fix.
+  * Add a make-coding-system for us-ascii in 00debian.el.
+  * Revert coding-system configure option (make only major bug left in
+    21.1.9-3 go away)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 27 May 2000 16:53:14 -0400
+
+xemacs21 (21.1.9-3) unstable; urgency=low
+
+  * Add an xemacs21-fake binary to be installed by xemacs21-bin to avoid
+    the problem where there are no xemacs21 binaries and
+    update-alternatives doesn't create a link xemacs->xemacs21 (Closes:
+    #63207, #63326)
+  * Revert requiring emacsen-common >= 1.4.10 (So it'll install on a
+    potato system)
+
+ -- James LewisMoss <dres@debian.org>  Fri,  5 May 2000 22:04:42 -0400
+
+xemacs21 (21.1.9-2) unstable; urgency=low
+
+  * Make everything depend on (= ${Source-Version}) (Closes: #62026,
+    #61964, #62353)
+  * Make the xemacs21 package replace/conflict xemacs and
+    xemacs-widgets. (Closes: #61852)
+  * Compile with file coding support. (Closes: #48771, #49332)
+  * add "(setq delete-key-deletes-forward t)" to fix console
+    problem. (Closes: #24607, #20293, #43189)
+  * Add versioned depends on emacsen-common (emacsen policy)
+  * Add /etc/emacs and /etc/xemacs@MAJVERSION@ to load path and then load
+    "site-start" (emacsen policy)
+  * Add dir and subdirs of /usr/share/emacs/site-lisp (emacsen policy)
+  * Ignoring section 9 of emacsen policy.  The paths make no sense.
+  * The above three (Closes: #31650)
+  * mwheel included in 21.1.9 (Closes: #32771)
+  * Add Build-Depends (Closes: #53879, #62301)
+  * Apply pty security patch from lwn.net/daily/rc-emacs.html.
+  * run autoconf and remove configure.in because we had to mod
+    configure.in.  (pty patch above)
+  * Fix pty patch.  Used sigunblock which doesn't seem to exist.  Instead
+    save sigmask before calling sigblock and restore it at the end.
+
+ -- James LewisMoss <dres@debian.org>  Wed, 19 Apr 2000 23:36:39 -0400
+
+xemacs21 (21.1.9-1) unstable; urgency=low
+
+  * Fix defvar -> setq in site-start.el.in (fixes problems with changes to
+    emacsen-common) (Closes: #61102)
+  * Add gnuclient as an alternative to xemacs and xemacs21 (Closes: #57528)
+  * Remove pstogif refs.  It's been removed from the upstream.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 26 Mar 2000 11:28:27 -0500
+
+xemacs21 (21.1.8-2) unstable; urgency=low
+
+  * Remove code to ignore emacsen errors. (Closes #52167)
+  * Comment out setting of nnmail-spool-file in 00debian.el.in (Closes
+    #53740)
+  * Configure with --with-gpm=no (Closes #53741)
+  * Fix copyright location in copyright file (lintian error).
+  * Fix case of changelog in xemacs21-support (lintian error).
+
+ -- James LewisMoss <dres@debian.org>  Fri, 31 Dec 1999 10:04:37 -0500
+
+xemacs21 (21.1.8-1) unstable; urgency=low
+
+  * New upstream (removing emacs.c, unexelf.c, and japanese.el patches now
+    included upstream).
+  * Add a bunch of notes to README.Debian. Closes: #49055.
+  * Make package path build type specific (if specified it will make
+    non-mule compiles unhappy if it includes mule-packages).
+
+ -- James LewisMoss <dres@debian.org>  Wed,  3 Nov 1999 19:01:41 -0500
+
+xemacs21 (21.1.7-10) unstable; urgency=low
+
+  * Make dir-and-all-good-subs check for existence of directory before
+    trying to read it and return nil if it doesn't exist.
+  * Add preinst for mule, nomule, and mule-canna-wnn to remove old
+    alternatives for xemacs21.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 31 Oct 1999 21:48:01 -0500
+
+xemacs21 (21.1.7-9) unstable; urgency=low
+
+  * Apply Andreas Jaeger's malloc patch.
+
+ -- James LewisMoss <dres@debian.org>  Thu, 28 Oct 1999 20:05:30 -0400
+
+xemacs21 (21.1.7-8) unstable; urgency=low
+
+  * Added patch to fix japanese autodetection.  Closes: #47794.
+  * Back to 21.1.7 unexelf.c with patch from xemacs-patches.
+  * Add update-alternatives lines in -bin postinst to remove the old
+    alternatives from 21.1-p2.
+  * Adjust alternatives values for new packages so they overwrite any old
+    values hanging around.  This and above are all I can do to fix
+    47770. Closes: #47770.
+  * Add postinst to xemacs21 to add the /usr/doc link (gets rid of lintian
+    warning)
+
+ -- James LewisMoss <dres@debian.org>  Sat, 23 Oct 1999 23:33:27 -0400
+
+xemacs21 (21.1.7-7) unstable; urgency=low
+
+  * Fix path of chown in 00debian.el.in, Closes: #47728
+  * Fix depends line in xemacs21 package.  Closes: #47794
+  * Fixe xemacs21 to have full complement of doc files.
+
+ -- James LewisMoss <dres@debian.org>  Tue, 19 Oct 1999 19:51:25 -0400
+
+xemacs21 (21.1.7-6) unstable; urgency=low
+
+  * Make movemail properly chmoded.
+  * Add postinst/prerm actions for /usr/doc links.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 11 Oct 1999 22:54:38 -0400
+
+xemacs21 (21.1.7-5) unstable; urgency=low
+
+  * Add patches from
+    http://www.gohome.org/teranisi/patches/lwlib-Xaw.c.diff
+    http://www.gohome.org/teranisi/patches/xlwmenu.c.diff (Suggestion from
+    Takuo KITAME)
+  * Add /usr/lib/xemacs/site-lisp and /usr/lib/xemacs/site-lisp-21 to
+    support.  (Also from Takuo KITAME)
+  * Recompile against latest mulesupport and basesupport packages.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 10 Oct 1999 14:48:15 -0400
+
+xemacs21 (21.1.7-4) unstable; urgency=low
+
+  * Revert to the version of unexelf.c from 21.1.4.  Should fix the random
+    crashing problems.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 10 Oct 1999 00:35:46 -0400
+
+xemacs21 (21.1.7-3) unstable; urgency=low
+
+  * Recompiling hell.
+
+ -- James LewisMoss <dres@debian.org>  Wed,  6 Oct 1999 22:52:11 -0400
+
+xemacs21 (21.1.7-2) unstable; urgency=low
+
+  * Recompile without Xaw3d.  Let's hope this fixes the problem.
+
+ -- James LewisMoss <dres@debian.org>  Wed,  6 Oct 1999 08:12:24 -0400
+
+xemacs21 (21.1.7-1) unstable; urgency=low
+
+  * Recompile for the damn libc.
+
+ -- James LewisMoss <dres@debian.org>  Mon,  4 Oct 1999 23:10:54 -0400
+
+xemacs21 (21.1.7-0.1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Wed, 29 Sep 1999 22:41:21 -0400
+
+xemacs21 (21.1.6-0.7) unstable; urgency=low
+
+  * Recompile with new libc.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 26 Sep 1999 23:47:26 -0400
+
+xemacs21 (21.1.6-0.6) unstable; urgency=low
+
+  * Lower xemacs alternative till testing period is over with.
+
+ -- James LewisMoss <dres@debian.org>  Tue, 21 Sep 1999 07:41:31 -0400
+
+xemacs21 (21.1.6-0.5) unstable; urgency=low
+
+  * Recompile with new libc and ldso.
+
+ -- James LewisMoss <dres@debian.org>  Sat, 18 Sep 1999 00:06:51 -0400
+
+xemacs21 (21.1.6-0.4) unstable; urgency=low
+
+  * Fix "not loading /etc/xemacs21/site-start.d files at startup" problem
+    (copy site-start.el and debian-rundir.el to
+    /usr/share/xemacs21/site-packages/lisp).
+
+ -- James LewisMoss <dres@debian.org>  Thu, 16 Sep 1999 19:42:38 -0400
+
+xemacs21 (21.1.6-0.3) unstable; urgency=low
+
+  * Fix get_menu_part to use .in method, and fix the :: or :
+    (stuff). difference (should fix some of the info file oddness where
+    some didn't come back to the xemacs21 file.
+  * Move some stuff from rules to PackagesMakefile.in that belong there.
+  * Fix the /usr/info dir removal.
+
+ -- James LewisMoss <dres@debian.org>  Tue, 14 Sep 1999 22:18:51 -0400
+
+xemacs21 (21.1.6-0.2) unstable; urgency=low
+
+  * Fix site-lisp handling.
+  * Make manpages compressed.
+  * Change info path.
+  * Compress files in -supportel.
+  * Move only the lisp directory in -supportel.
+  * add -nw to text menu entries.
+  * Up update-alternatives number for this package above the xemacs20
+    packages (newer is better right?)
+  * Fix Info-additional-search-directory-list to look in /usr/share/info
+    rather than /usr/info.
+  * Add rmdir commands to -support prerm (for
+    /usr/local/lib/xemacs/site-lisp)
+  * Fix the .texi files so that the (dir) points to (xemacs21) instead.
+  * docdir patch from upstream. (Michael Sperber)
+  * Fix manpage update-alternatives calls in -bin postinst to go to
+    /usr/share/man rather than /usr/man.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 13 Sep 1999 23:54:26 -0400
+
+xemacs21 (21.1.6-0.1) unstable; urgency=low
+
+  * New upstream.
+  * Fix prerm to use xemacs@MAJVERSION@ rather than xemacs20 for
+    alternatives.  Oops. (Which is why old ones left around.)
+  * Add update-alternatives lines in -bin.postrm to get rid of
+    alternatives left from the above mistake.
+  * Fix copy locations for DOC files to the CONF_NAME path rather than
+    etc.
+  * Write man pages for b2m, pstogif, and rcs-checkin.  Add ootags info to
+    the etags manpage and create linking ootags manpage.  Modify the
+    ctags, gnuclient, gnudoit and gnuattach so that they point towards the
+    correct man pages.
+  * Add the binaries and manpages to -bin and fix handling of them in
+    {post,pre}{rm,inst}.
+  * Fix some buglets in the {post,pre}{rm,inst}s.
+  * Fix mkdir/cp commands to use $@.
+
+ -- James LewisMoss <dres@debian.org>  Thu,  9 Sep 1999 22:27:15 -0400
+
+xemacs21 (21.1.2-1) unstable; urgency=low
+
+  * New upstream
+
+ -- James LewisMoss <dres@debian.org>  Sat,  5 Jun 1999 21:41:00 -0400
+
+xemacs21 (21.0.67-1) unstable; urgency=low
+
+  * Initial Release.
+  * Never released.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 21 Mar 1999 17:07:12 -0500
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-bin.prerm.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-bin.prerm.in
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+set -e
+
+if [ "$1" != "upgrade" ] ; then
+  update-alternatives --remove xemacs /usr/bin/xemacs@MAJVERSION@
+  update-alternatives --remove editor /usr/bin/xemacs@MAJVERSION@
+
+  update-alternatives --remove xemacs /usr/bin/gnuclient.xemacs@MAJVERSION@
+  update-alternatives --remove xemacs@MAJVERSION@ /usr/bin/gnuclient.xemacs@MAJVERSION@
+
+  update-alternatives --remove movemail /usr/lib/xemacs-@VERSION@/@CONF_NAME@/movemail
+
+  update-alternatives --remove mmencode /usr/lib/xemacs-@VERSION@/@CONF_NAME@/mmencode
+
+  for i in @SUPPORT_BINS@ ; do
+    update-alternatives --remove $i /usr/bin/$i.xemacs@MAJVERSION@
+  done
+fi
+
+# Remove alternatives in prerm (See Bug#269177)
+update-alternatives --remove ootags /usr/bin/ootags.xemacs21
+update-alternatives --remove ctags /usr/bin/ctags.xemacs21
+
+# fixes an oopsy in an older prerm script.
+update-alternatives --remove xemacs21 /usr/bin/xemacs21-21.1.p2-mule
+update-alternatives --remove xemacs21 /usr/bin/xemacs21-21.1.p2-nomule
+update-alternatives --remove xemacs21 /usr/bin/xemacs21-21.1.p2-mule-canna-wnn
+
+if [ -L /usr/doc/xemacs@MAJVERSION@-bin ]; then
+	rm -f /usr/doc/xemacs@MAJVERSION@-bin
+fi
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/rules
+++ xemacs21-21.4.17/debian/rules
@@ -0,0 +1,137 @@
+#!/usr/bin/make -f
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Also some stuff taken from debmake scripts, by Cristopt Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DH_COMPAT=4
+#export DEB_BUILD_OPTIONS=nostrip
+
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+PACKAGE=xemacs21
+
+# this script moves directories so things can't be on separate
+# partitions ( no idea why they would be to begin with, but hey
+# doesn't hurt to warn :)
+package=xemacs
+version = $(shell /bin/sh debian/find-version)
+maj_version = $(shell /bin/sh debian/find-major-version)
+
+# any way to do this automatically since we'd like this to be
+# easily used with no changes on other architectures, but still
+# want to be able to specify.  Does this work OK?
+machine_type = $(shell dpkg --print-architecture)
+prefix=usr
+
+debianconfig = ${machine_type}-debian-linux
+tmp_file_loc = debian/tmp
+
+var_file = var_file.pl
+
+debian_config_scripts = debian/makevarfile
+topdir = $(shell pwd)
+
+XEMACS_TYPES = nomule mule mule-canna-wnn gnome-nomule gnome-mule gnome-mule-canna-wnn
+
+# these things should really not be here if this is to become a more
+# general packaging method.
+support_bins = b2m etags gnuclient gnuattach gnudoit rcs-checkin ellcc
+xemacs_ver = xemacs${maj_version}
+html_file_loc = debian/html
+
+build: pre-build build-stamp
+build-stamp: patch-stamp debian/PackagesMakefile
+	dh_testdir
+
+	$(MAKE) -f debian/PackagesMakefile build
+
+	touch build-stamp
+
+clean: unpatch debian/${var_file}
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp pre-build-stamp
+
+	-mv install.old install
+	-rm -f install
+
+	-rm -f debian/substvars
+	-rm -f debian/files
+	-rm -rf debian/tmp # `find debian/* -type d`
+
+	-$(MAKE) distclean
+
+	if [ -f debian/PackagesMakefile ] ; then \
+	  $(MAKE) -f debian/PackagesMakefile clean ; \
+	fi
+
+	-rm -f `find . -name "*~"`
+	-rm -f `find . -name '*.orig'`
+
+	dh_clean
+
+	# must be done last because it removes some utility scripts
+	set -e ; cd debian ; \
+	$(MAKE) -f ConfigMakefile \
+	  VAR_FILE=$(var_file) \
+	  XEMACS_TYPES="$(XEMACS_TYPES)" \
+	  clean
+	rm -f debian/$(var_file)
+
+install: install-stamp
+install-stamp: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	${MAKE} -f debian/PackagesMakefile installit
+
+	touch install-stamp
+
+debian/${var_file}:
+	chmod +x $(debian_config_scripts)
+	debian/makevarfile "debian/$(var_file)" \
+	    "MAJVERSION" "$(maj_version)" \
+	    "VERSION" "$(version)" \
+	    "SUBNAME" "" \
+	    "CONF_NAME" "$(debianconfig)" \
+	    "ARCH" "$(machine_type)" \
+	    "HTML_FILE_LOC" "$(html_file_loc)" \
+	    "TMP_FILE_LOC" "$(tmp_file_loc)" \
+	    "PREFIX" "$(prefix)" \
+	    "TOPDIR" "$(topdir)" \
+	    "SUPPORT_BINS" "$(support_bins)"
+
+debian/PackagesMakefile: debian/PackagesMakefile.in debian/${var_file}
+	set -e ; cd debian ; \
+	$(MAKE) -f ConfigMakefile \
+	  VAR_FILE=$(var_file) \
+	  XEMACS_TYPES="$(XEMACS_TYPES)"
+
+pre-build: pre-build-stamp
+pre-build-stamp: debian/${var_file} debian/PackagesMakefile
+	$(checkdir)
+
+	touch pre-build-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	-mv install install.old
+	$(MAKE) -f debian/PackagesMakefile binary-indep
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	-mv install install.old
+	$(MAKE) -f debian/PackagesMakefile binary-arch
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean install binary-indep binary-arch binary
+
+# Local variables:
+# mode: makefile
+# End:
+
--- xemacs21-21.4.17.orig/debian/convert-texi-files.in
+++ xemacs21-21.4.17/debian/convert-texi-files.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+TEXI_FILES="`find . -name '*.texi'`"
+
+if [ "$1" = "CLEAN" ] ; then
+    perl -i.deb-old -pe 's/\(xemacs@MAJVERSION@\/xemacs@MAJVERSION@\)/(dir)/g if m/^\@node/;' \
+      $TEXI_FILES
+else
+    perl -i.deb-old -pe 's/\(dir\)/(xemacs@MAJVERSION@\/xemacs@MAJVERSION@)/g if m/^\@node/;' \
+      $TEXI_FILES
+fi
+
+rm -f `find . -name '*.deb-old'`
--- xemacs21-21.4.17.orig/debian/gnuattach.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/gnuattach.xemacs@MAJVERSION@.1.in
@@ -0,0 +1 @@
+.so man1/gnuserv.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@-mule-canna-wnn.1.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@-mule-canna-wnn.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/b2m.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/b2m.xemacs@MAJVERSION@.1.in
@@ -0,0 +1,20 @@
+.TH B2M 1
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+b2m \- This program converts a babyl mailbox to a standard unix mailbox.
+.SH SYNOPSIS
+.B b2m
+.I "[options] < babylmailbox > unixmailbox"
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR b2m ,
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.SH OPTIONS
+None
+.\" .SH SEE ALSO
+.SH AUTHOR
+This manual page was written by James LewisMoss <dres@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- xemacs21-21.4.17.orig/debian/ConfigMakefile
+++ xemacs21-21.4.17/debian/ConfigMakefile
@@ -0,0 +1,48 @@
+#! /usr/bin/make -f
+
+IN_FILES = $(shell echo *.in)
+
+all: pre_tests generate_files convert_files
+
+pre_tests:
+	if test -z "$(VAR_FILE)" ; then \
+	  echo "No VAR_FILE set.  Quitting..." ; \
+	  exit 1 ; \
+	fi
+	if test "`pwd | perl -pe 's/.*(debian)$$/$$1/'`" != "debian" ; then \
+	  echo "Must be run in debian directory.  Quitting..." ; \
+	  exit 1 ; \
+	fi
+	if test -z "$(XEMACS_TYPES)" ; then \
+	  echo "No XEMACS_TYPES set.  Quitting..." ; \
+	  exit 1 ; \
+	fi
+
+clean:
+	for i in $(IN_FILES) ; do \
+	  if [ "$$i" = "control.in" ] ; then \
+	    perl convert-in-file $(VAR_FILE) $$i ; \
+	  else  \
+	    perl convert-in-file $(VAR_FILE) CLEAN $$i ; \
+	  fi \
+	done
+	sh ./generate-menus CLEAN $(XEMACS_TYPES)
+	sh ./generate-prerm CLEAN $(XEMACS_TYPES)
+	sh ./generate-postinst CLEAN $(XEMACS_TYPES)
+	sh ./generate-preinst CLEAN $(XEMACS_TYPES)
+	-rm -f convert_files.stamp
+
+generate_files:
+	sh ./generate-menus $(XEMACS_TYPES)
+	sh ./generate-prerm $(XEMACS_TYPES)
+	sh ./generate-postinst $(XEMACS_TYPES)
+	sh ./generate-preinst $(XEMACS_TYPES)
+
+convert_files: convert_files.stamp
+convert_files.stamp: $(IN_FILES)
+	for i in $(IN_FILES) ; do \
+	  perl convert-in-file $(VAR_FILE) $$i ; \
+	done
+	touch convert_files.stamp
+
+.PHONY: pre_tests clean generate_files convert_files
--- xemacs21-21.4.17.orig/debian/site-start.el.in
+++ xemacs21-21.4.17/debian/site-start.el.in
@@ -0,0 +1,47 @@
+;;; taken from emacs site-start.  Thanks Mark.
+
+;;; DO NOT EDIT THIS FILE.  THIS FILE IS AUTOMATICALLY REMOVED ON
+;;; UPGRADE OF XEMACS.
+
+;;; Instead check out /etc/xemacs{19,20,21}/site-start.d and edit files
+;;; in there.  This setup is similar to the SysV init boot
+;;; process. Put files like [0-9][0-9]*.el there and they will be
+;;; loaded in alphabetical order.  The first two characters of the
+;;; name must be numbers for this to work (so to disable a file you
+;;; can simply change it to say 'x<name of file>' and it will be
+;;; disabled.
+
+(defvar emacs-debian-default-directory
+  (if (string-match ".*XEmacs.*" emacs-version)
+      (let ((point
+             (string-match "[0-9]*\.[0-9]*.*XEmacs.*" emacs-version)))
+        (concat "/etc/xemacs/site-start-"
+                (substring emacs-version point (+ point 2))
+                ".d"))
+  "/etc/emacs/site-start.d")
+  "The default directory for this version of XEmacs to load from")
+
+
+(defun debian-run-directory (&optional dir)
+  "Load each file in the form 00filename.el stored in the path.
+The files are sorted so order can be controlled."
+  (interactive "DConfiguration directory : ")
+  (let ((path (if dir dir emacs-debian-default-directory)))
+    (mapcar
+     (lambda (file)
+       (if debug-on-error
+	   (load-file file)
+	 (condition-case ()
+	     (progn
+	       (load file nil t t)
+	       (message "*** %s loaded ***" (file-name-nondirectory file)))
+	   (error (message "Error while loading %s" file)))))
+     (directory-files path t "^[0-9][0-9].*\\.el$" nil))))
+
+(load "/usr/share/emacs/site-lisp/debian-startup")
+(setq debian-emacs-flavor 'xemacs@MAJVERSION@)
+(debian-startup debian-emacs-flavor)
+
+;; Local variables:
+;; mode: emacs-lisp
+;; End:
--- xemacs21-21.4.17.orig/debian/xemacs-@VERSION@-nomule.1.in
+++ xemacs21-21.4.17/debian/xemacs-@VERSION@-nomule.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/move-el-files
+++ xemacs21-21.4.17/debian/move-el-files
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+
+# here we get two arguments.  A start directory and an end directory.
+# we expect the start and end arguments given to be complete directories
+# from root
+
+if [ ! -d $1 ] ; then
+  echo Start directory given \( $1 \) is not there... quitting.
+  exit 10 
+else
+  start_dir=$1 ; export start_dir 
+fi
+
+if [ ! -d $2 ] ; then
+  echo End directory given \( $2 \) is not there... making it.
+  mkdir -p $2
+fi
+
+end_dir=$2 ; export end_dir
+mkdir -p $end_dir
+
+# all directories in place.  Now transfer our directory structure over.
+
+transfer_dirs=`cd $start_dir ; find . -type d` ; export transfer_dirs
+(
+cd $end_dir
+for i in $transfer_dirs ; do
+  mkdir -p $i
+done
+)
+
+# ok now to transfer the files.
+(
+cd $start_dir
+for i in `find . -type f -name '*.el'` ; do
+  if [ -r ${i}c ] ; then
+    mv $i $end_dir/$i
+  fi
+done
+)
+
+
+
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-bin.dirs.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-bin.dirs.in
@@ -0,0 +1,2 @@
+@PREFIX@/share/man/man1
+@PREFIX@/bin/
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-bin.files.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-bin.files.in
@@ -0,0 +1 @@
+@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/
--- xemacs21-21.4.17.orig/debian/xemacs-@VERSION@-mule.1.in
+++ xemacs21-21.4.17/debian/xemacs-@VERSION@-mule.1.in
@@ -0,0 +1 @@
+.so man1/xemacs.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-bin.menu.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-bin.menu.in
@@ -0,0 +1,6 @@
+?package(xemacs@MAJVERSION@-bin):
+  needs=X11
+  section="Apps/Editors"
+  title="XEmacs@MAJVERSION@ Gnuclient"
+  command="/usr/bin/gnuclient"
+  hints="Text"
--- xemacs21-21.4.17.orig/debian/copyright
+++ xemacs21-21.4.17/debian/copyright
@@ -0,0 +1,64 @@
+This package was debianized by James LewisMoss dres@debian.org on
+Sun, 21 Mar 1999 17:24:51 -0500
+
+It was checked out of cvs at :pserver:xemacs@cvs.xemacs.org:/usr/CVSroot
+module xemacs-20.
+
+Upstream Authors: A host of people.
+
+(later from ftp://ftp.xemacs.org/)
+
+Copyright:
+
+   Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994
+   Free Software Foundation, Inc.
+   Copyright (C) 1995 Sun Microsystems, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+(copied from src/emacs.c)
+
+On Debian Linux systems, the complete text of the GNU General Public
+License can be found in '/usr/share/common-licenses/GPL'.
+
+Much of the documentation is covered by a copyright similar to this:
+
+Copyright (C) 1993 Free Software Foundation, Inc.
+
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
+
+@ignore
+Permission is granted to process this file through TeX and print the
+results, provided the printed document carries copying permission notice
+identical to this one except for the removal of this paragraph (this
+paragraph not being relevant to the printed manual).
+
+@end ignore
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided also that the
+section entitled ``GNU General Public License'' is included exactly as
+in the original, and provided that the entire resulting derived work is
+distributed under the terms of a permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual
+into another language, under the above conditions for modified versions,
+except that the section entitled ``GNU General Public License'' may be
+included in a translation approved by the author instead of in the
+original English.
--- xemacs21-21.4.17.orig/debian/gnuclient.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/gnuclient.xemacs@MAJVERSION@.1.in
@@ -0,0 +1 @@
+.so man1/gnuserv.xemacs@MAJVERSION@.1
--- xemacs21-21.4.17.orig/debian/find-major-version
+++ xemacs21-21.4.17/debian/find-major-version
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# echo out the version of xemacs currently being dealt with
+
+# export srcdir=`pwd`
+# export version=`grep 'defconst[         ]*emacs-version'\
+#  ${srcdir}/lisp/version.el \
+#  | sed -ne 's/^(defconst emacs-version "\([0-9][0-9]\)\.[0-9]*.*/\1/p'`
+
+# echo $srcdir
+# echo $version
+
+#echo ${version}
+
+# OK 19.16 moved the version thingy into configure.  How annoying.  So
+# we will hard code it here until we have a better plan
+
+#echo "19"
+
+#DIR=`pwd`
+
+#echo `echo $DIR | perl -pe 's/.*xemacs([0-9]*)-.*/$1/;'`
+
+#echo `dpkg-parsechangelog | egrep "^Version:" | perl -pe 's/Version:\s*([0-9]+)(\.[0-9]+)?(-.*)?-([0-9]+)/$1/;'`
+
+. ./version.sh
+
+echo $emacs_major_version
--- xemacs21-21.4.17.orig/debian/rcs-checkin.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/rcs-checkin.xemacs@MAJVERSION@.1.in
@@ -0,0 +1,44 @@
+.TH RCS-CHECKIN 1
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+rcs-checkin \- accepts any number of file arguments and checks them into RCS
+.SH SYNOPSIS
+.B rcs-checkin
+.I "files ..."
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR rcs-checkin ,
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+The following is taken from the script itself.
+
+Arguments which are detectably either RCS masters (with names ending in ,v)
+or Emacs version files  (with names of the form foo.~<number>~) are ignored.
+For each file foo, the script looks for Emacs version files related to it.
+These files are checked in as deltas, oldest first, so that the contents of
+the file itself becomes the latest revision in the master.
+
+The first line of each file is used as its description text.  The file itself
+is not deleted, as under VC with vc-keep-workfiles at its default of t, but
+all the version files are.
+
+If an argument file is already version-controlled under RCS, any version
+files are added to the list of deltas and deleted, and then the workfile
+is checked in again as the latest version.  This is probably not quite
+what was wanted, and is the main reason VC doesn't simply call this to
+do checkins.
+
+This script is intended to be used to convert files with an old-Emacs-style
+version history for use with VC (the Emacs 19 version-control interface),
+which likes to use RCS as its back end.  It was written by Paul Eggert
+and revised/documented for use with VC by Eric S. Raymond, Mar 19 1993.
+
+.SH AUTHOR
+This manual page was written by James LewisMoss <dres@debian.org> for
+the Debian GNU/Linux system (but may be used by others). Most of the
+text was written by the rcs-checkin authors Paul
+Eggert and Eric S. Raymond.
--- xemacs21-21.4.17.orig/debian/xemacs@MAJVERSION@@SUBNAME@-supportel.postinst.in
+++ xemacs21-21.4.17/debian/xemacs@MAJVERSION@@SUBNAME@-supportel.postinst.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+
+##DEBHELPER##
--- xemacs21-21.4.17.orig/debian/generate-preinst
+++ xemacs21-21.4.17/debian/generate-preinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CLEAN=0
+
+if test "$1" = "CLEAN" ; then
+    shift
+    CLEAN=1
+fi
+
+for i in $@ ; do
+    if test "$CLEAN" = "1" ; then
+        rm -f xemacs@MAJVERSION@@SUBNAME@-$i.preinst.in
+    else
+        cat preinst-base | sed -e "s/REPLACE_ME/$i/g" > xemacs@MAJVERSION@@SUBNAME@-$i.preinst.in
+    fi
+done
+
--- xemacs21-21.4.17.orig/debian/ootags.xemacs@MAJVERSION@.1.in
+++ xemacs21-21.4.17/debian/ootags.xemacs@MAJVERSION@.1.in
@@ -0,0 +1 @@
+.so man1/etags.xemacs@MAJVERSION@.1
