This patch should be applied to an un-modified XFree86 version 4.6.0
source tree.  It is patch 4 of 4 patches that will will convert the
source tree to XFree86 version 4.7.0.

To apply this patch, run the following from the directory containing your
'xc' directory:


	patch -p0 -E < XFree86-4.6.0-4.7.0.diff1
	patch -p0 -E < XFree86-4.6.0-4.7.0.diff2
	patch -p0 -E < XFree86-4.6.0-4.7.0.diff3
	patch -p0 -E < XFree86-4.6.0-4.7.0.diff4

	sh XFree86-4.6.0-4.7.0-cleanup.sh

	gzip -d < XFree86-4.6.0-4.7.0-diff0.tgz | tar vxf -

-------------------------------------------------------------------------------

Index: xc/programs/Xserver/hw/xfree86/vbe/vbe.h
diff -u xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.12 xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.13
--- xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.12	Thu Mar 16 11:50:35 2006
+++ xc/programs/Xserver/hw/xfree86/vbe/vbe.h	Wed Mar  7 20:46:43 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.12 2006/03/16 16:50:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.13 2007/03/08 01:46:43 tsi Exp $ */
 
 /*
  *                   XFree86 vbe module
@@ -119,7 +119,7 @@
 
 	return xf86LoadSubModuleWithRequirements(pScreenInfo, "vbe",
 						 &vbeModuleVersionRequirements);
-}
+    }
 
 #    define xf86LoadVBEModule(_pScreenInfo) \
 	    xf86LoadVBEModule(_pScreenInfo)
Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c
diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.17 xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.18
--- xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.17	Fri Oct 14 11:17:10 2005
+++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c	Mon Apr  9 11:37:18 2007
@@ -1,7 +1,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.17 2005/10/14 15:17:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.18 2007/04/09 15:37:18 tsi Exp $ */
 
 /*
- * Copyright 1996  The XFree86 Project
+ * Copyright 1996-2007  The XFree86 Project
  *
  * Permission is hereby granted, free of charge, to any person obtaining a 
  * copy of this software and associated documentation files (the "Software"), 
@@ -127,6 +127,7 @@
 
     *topY = 32767;
     *bottomY = 0;
+    *topPoint = NULL;
 
     origin -= (origin & 0x8000) << 1;
     vertex1 = *((int *) &extents->x1) - origin;
Index: xc/programs/Xserver/hw/xnest/Args.c
diff -u xc/programs/Xserver/hw/xnest/Args.c:1.4 xc/programs/Xserver/hw/xnest/Args.c:1.5
--- xc/programs/Xserver/hw/xnest/Args.c:1.4	Fri Oct 14 11:17:14 2005
+++ xc/programs/Xserver/hw/xnest/Args.c	Sat Sep  2 12:44:22 2006
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.4 2005/10/14 15:17:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.5 2006/09/02 16:44:22 dawes Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -26,7 +26,7 @@
 #include "Display.h"
 #include "Args.h"
 
-char *xnestDisplayName = NULL;        
+const char *xnestDisplayName = NULL;        
 Bool xnestSynchronize = False;
 Bool xnestFullGeneration = False;
 int xnestDefaultClass;                
@@ -41,14 +41,14 @@
 int xnestUserGeometry = 0;
 int xnestBorderWidth; 
 Bool xnestUserBorderWidth = False;
-char *xnestWindowName = NULL;        
+const char *xnestWindowName = NULL;        
 int xnestNumScreens = 0;
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 Bool xnestInputEnabled = True;
 
 int
-ddxProcessArgument (int argc, char *argv[], int i)
+ddxProcessArgument (int argc, const char *argv[], int i)
 {
   if (!strcmp(argv[i], "-display")) {
     if (++i < argc) {
Index: xc/programs/Xserver/hw/xnest/Args.h
diff -u xc/programs/Xserver/hw/xnest/Args.h:1.3 xc/programs/Xserver/hw/xnest/Args.h:1.4
--- xc/programs/Xserver/hw/xnest/Args.h:1.3	Tue Jul 19 20:32:38 2005
+++ xc/programs/Xserver/hw/xnest/Args.h	Sat Sep  2 12:44:22 2006
@@ -11,12 +11,12 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.3 2005/07/20 00:32:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.4 2006/09/02 16:44:22 dawes Exp $ */
 
 #ifndef XNESTARGC_H
 #define XNESTARGS_H
 
-extern char *xnestDisplayName;           
+extern const char *xnestDisplayName;           
 extern Bool xnestSynchronize;
 extern Bool xnestFullGeneration;
 extern int xnestDefaultClass;                   
@@ -31,7 +31,7 @@
 extern int xnestUserGeometry;
 extern int xnestBorderWidth;    
 extern Bool xnestUserBorderWidth;
-extern char *xnestWindowName;           
+extern const char *xnestWindowName;           
 extern int xnestNumScreens;
 extern Bool xnestDoDirectColormaps;
 extern Window xnestParentWindow;
Index: xc/programs/Xserver/hw/xnest/Display.c
diff -u xc/programs/Xserver/hw/xnest/Display.c:3.6 xc/programs/Xserver/hw/xnest/Display.c:3.7
--- xc/programs/Xserver/hw/xnest/Display.c:3.6	Mon Jan  9 10:00:29 2006
+++ xc/programs/Xserver/hw/xnest/Display.c	Sat Sep  2 12:44:22 2006
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.6 2006/01/09 15:00:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.7 2006/09/02 16:44:22 dawes Exp $ */
 
 
 #include <X11/X.h>
@@ -51,7 +51,7 @@
 unsigned long xnestEventMask;
 
 void
-xnestOpenDisplay(int argc, char *argv[])
+xnestOpenDisplay(int argc, const char *argv[])
 {
   XVisualInfo vi;
   long mask;
Index: xc/programs/Xserver/hw/xnest/Display.h
diff -u xc/programs/Xserver/hw/xnest/Display.h:1.8 xc/programs/Xserver/hw/xnest/Display.h:1.9
--- xc/programs/Xserver/hw/xnest/Display.h:1.8	Mon Jan  9 10:00:29 2006
+++ xc/programs/Xserver/hw/xnest/Display.h	Sat Sep  2 12:44:23 2006
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.8 2006/01/09 15:00:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.9 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef XNESTCOMMON_H
 #define XNESTCOMMON_H
@@ -40,7 +40,7 @@
 extern Window xnestConfineWindow;
 extern unsigned long xnestEventMask;
 
-void xnestOpenDisplay(int argc, char *argv[]);
+void xnestOpenDisplay(int argc, const char *argv[]);
 void xnestCloseDisplay(void);
 
 #endif /* XNESTCOMMON_H */
Index: xc/programs/Xserver/hw/xnest/Init.c
diff -u xc/programs/Xserver/hw/xnest/Init.c:3.28 xc/programs/Xserver/hw/xnest/Init.c:3.32
--- xc/programs/Xserver/hw/xnest/Init.c:3.28	Sun Feb 19 10:51:30 2006
+++ xc/programs/Xserver/hw/xnest/Init.c	Mon Apr  2 20:21:13 2007
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.28 2006/02/19 15:51:30 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.32 2007/04/03 00:21:13 tsi Exp $ */
 /*
  * Copyright (c) 1996-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -69,6 +69,7 @@
 #include "servermd.h"
 #include "mi.h"
 #include <X11/fonts/fontstruct.h>
+#include "extnsionst.h"
 
 #include "Xnest.h"
 
@@ -86,7 +87,7 @@
 Bool xnestDoFullGeneration = True;
 
 void
-InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
+InitOutput(ScreenInfo *screenInfo, const int argc, const char *argv[])
 {
   int i, j;
 
@@ -127,7 +128,7 @@
 }
 
 void
-InitInput(int argc, char *argv[])
+InitInput(const int argc, const char *argv[])
 {
   pointer ptr, kbd;
 
@@ -161,15 +162,15 @@
 
 #ifdef __DARWIN__
 void
-DarwinHandleGUI(int argc, char *argv[])
+DarwinHandleGUI(int argc, const char *argv[], char *envp[])
 {
 }
 
-void GlxExtensionInit();
+void GlxExtensionInit(INITARGS);
 void GlxWrapInitVisuals(void *procPtr);
 
 void
-DarwinGlxExtensionInit()
+DarwinGlxExtensionInit(INITARGS)
 {
     GlxExtensionInit();
 }
Index: xc/programs/Xserver/hw/xnest/Pixmap.c
diff -u xc/programs/Xserver/hw/xnest/Pixmap.c:3.9 xc/programs/Xserver/hw/xnest/Pixmap.c:3.10
--- xc/programs/Xserver/hw/xnest/Pixmap.c:3.9	Fri Oct 14 11:17:15 2005
+++ xc/programs/Xserver/hw/xnest/Pixmap.c	Mon Apr  9 11:37:18 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.9 2005/10/14 15:17:15 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.10 2007/04/09 15:37:18 tsi Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -99,6 +99,7 @@
   pTmpReg = REGION_CREATE(pPixmap->drawable.pScreen, NULL, 1);
   if(!pReg || !pTmpReg) return NullRegion;
   
+  Box.x1 = 0;
   for (y = 0; y < pPixmap->drawable.height; y++) {
     Box.y1 = y;
     Box.y2 = y + 1;
Index: xc/programs/Xserver/hw/xnest/Screen.c
diff -u xc/programs/Xserver/hw/xnest/Screen.c:3.16 xc/programs/Xserver/hw/xnest/Screen.c:3.18
--- xc/programs/Xserver/hw/xnest/Screen.c:3.16	Thu Feb  9 12:38:08 2006
+++ xc/programs/Xserver/hw/xnest/Screen.c	Tue Jan 23 13:03:12 2007
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.16 2006/02/09 17:38:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.18 2007/01/23 18:03:12 tsi Exp $ */
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
@@ -124,7 +124,7 @@
 };
 
 Bool
-xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
+xnestOpenScreen(int index, ScreenPtr pScreen, const int argc, const char *argv[])
 {
   VisualPtr visuals;
   DepthPtr depths;
@@ -404,7 +404,7 @@
 			   xnestWindowName, 
 			   xnestWindowName, 
 			   xnestIconBitmap,
-			   argv, argc, &sizeHints);
+			   (char **)argv, argc, &sizeHints);
     
     XMapWindow(xnestDisplay, xnestDefaultWindows[pScreen->myNum]);
 
Index: xc/programs/Xserver/hw/xnest/Screen.h
diff -u xc/programs/Xserver/hw/xnest/Screen.h:1.3 xc/programs/Xserver/hw/xnest/Screen.h:1.5
--- xc/programs/Xserver/hw/xnest/Screen.h:1.3	Mon Jan  9 10:00:30 2006
+++ xc/programs/Xserver/hw/xnest/Screen.h	Tue Jan 23 13:03:12 2007
@@ -11,7 +11,7 @@
 is" without express or implied warranty.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.5 2007/01/23 18:03:12 tsi Exp $ */
 
 #ifndef XNESTSCREEN_H
 #define XNESTSCREEN_H
@@ -20,7 +20,7 @@
 extern Window xnestScreenSaverWindows[MAXSCREENS];
 
 ScreenPtr xnestScreen(Window window);
-Bool xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[]);
+Bool xnestOpenScreen(int index, ScreenPtr pScreen, const int argc, const char *argv[]);
 Bool xnestCloseScreen(int index, ScreenPtr pScreen);
 
 #endif /* XNESTSCREEN_H */
Index: xc/programs/Xserver/hw/xwin/Imakefile
diff -u xc/programs/Xserver/hw/xwin/Imakefile:1.20 xc/programs/Xserver/hw/xwin/Imakefile:1.21
--- xc/programs/Xserver/hw/xwin/Imakefile:1.20	Mon Jan  9 10:00:31 2006
+++ xc/programs/Xserver/hw/xwin/Imakefile	Wed Jan  3 21:02:19 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xwin/Imakefile,v 1.20 2006/01/09 15:00:31 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xwin/Imakefile,v 1.21 2007/01/04 02:02:19 tsi Exp $
 
 #include <Server.tmpl>
 
@@ -57,7 +57,6 @@
 	winclipboardunicode.c \
 	winclipboardwndproc.c \
 	winclipboardxevents.c \
-	winvideo.c \
 	wintrayicon.c \
 	windialogs.c \
 	winrop.c \
@@ -135,7 +134,6 @@
 	winclipboardunicode.o \
 	winclipboardwndproc.o \
 	winclipboardxevents.o \
-	winvideo.o \
 	wintrayicon.o \
 	windialogs.o \
 	winrop.o \
@@ -144,10 +142,11 @@
 	winprefsyacc.o \
 	winprefslex.o
 
-INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \
+INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/mfb \
 	   -I$(SERVERSRC)/miext/shadow -I$(SERVERSRC)/miext/layer \
-	   -I$(SERVERSRC)/include -I$(SERVERSRC)/os  \
-	   -I$(SERVERSRC)/render -I$(SERVERSRC)/randr
+	   -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext -I$(SERVERSRC)/os  \
+	   -I$(SERVERSRC)/render -I$(SERVERSRC)/randr \
+	   -I$(XF86COMSRC) -I$(XF86PARSERSRC)
 
 DEFINES = $(OS_DEFINES) $(SHMDEF) $(MMAPDEF) -UXFree86LOADER -UXF86DRI \
           -DPROJECTROOT="\"$(PROJECTROOT)\""
Index: xc/programs/Xserver/hw/xwin/InitInput.c
diff -u xc/programs/Xserver/hw/xwin/InitInput.c:1.14 xc/programs/Xserver/hw/xwin/InitInput.c:1.16
--- xc/programs/Xserver/hw/xwin/InitInput.c:1.14	Mon Jan  9 10:00:31 2006
+++ xc/programs/Xserver/hw/xwin/InitInput.c	Tue Jan 23 13:03:12 2007
@@ -25,10 +25,10 @@
   from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.14 2006/01/09 15:00:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.16 2007/01/23 18:03:12 tsi Exp $ */
 
 #include "win.h"
-#include "../../Xext/xf86miscproc.h"
+#include "xf86miscproc.h"
 
 CARD32		g_c32LastInputEventTime = 0;
 
@@ -81,7 +81,7 @@
 
 /* See Porting Layer Definition - p. 17 */
 void
-InitInput (int argc, char *argv[])
+InitInput (const int argc, const char *argv[])
 {
   DeviceIntPtr		pMouse, pKeyboard;
 
Index: xc/programs/Xserver/hw/xwin/InitOutput.c
diff -u xc/programs/Xserver/hw/xwin/InitOutput.c:1.37 xc/programs/Xserver/hw/xwin/InitOutput.c:1.39
--- xc/programs/Xserver/hw/xwin/InitOutput.c:1.37	Mon Jan  9 10:00:31 2006
+++ xc/programs/Xserver/hw/xwin/InitOutput.c	Tue Jan 23 13:03:12 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.37 2006/01/09 15:00:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.39 2007/01/23 18:03:12 tsi Exp $ */
 
 #include "win.h"
 #include "winconfig.h"
@@ -399,7 +399,7 @@
 #define IS_OPTION(name) (strcmp (argv[i], name) == 0)
 
 int
-ddxProcessArgument (int argc, char *argv[], int i)
+ddxProcessArgument (int argc, const char *argv[], int i)
 {
   static Bool		s_fBeenHere = FALSE;
 
@@ -1190,7 +1190,7 @@
   if (IS_OPTION ("-co"))
     {
       CHECK_ARGS (1);
-      g_cmdline.rgbPath = argv[++i];
+      g_cmdline.rgbPath = (char *)argv[++i];
       return 0; /* Let DIX parse this again */
     }
 
@@ -1200,7 +1200,7 @@
   if (IS_OPTION ("-query"))
     {
       CHECK_ARGS (1);
-      g_pszQueryHost = argv[++i];
+      g_pszQueryHost = (char *)argv[++i];
       return 0; /* Let DIX parse this again */
     }
 
@@ -1210,7 +1210,7 @@
   if (IS_OPTION ("-xf86config"))
     {
       CHECK_ARGS (1);
-      g_cmdline.configFile = argv[++i];
+      g_cmdline.configFile = (char *)argv[++i];
       return 2;
     }
 
@@ -1220,7 +1220,7 @@
   if (IS_OPTION ("-keyboard"))
     {
       CHECK_ARGS (1);
-      g_cmdline.keyboard = argv[++i];
+      g_cmdline.keyboard = (char *)argv[++i];
       return 2;
     }
 
@@ -1230,7 +1230,7 @@
   if (IS_OPTION ("-logfile"))
     {
       CHECK_ARGS (1);
-      g_pszLogFile = argv[++i];
+      g_pszLogFile = (char *)argv[++i];
       return 2;
     }
 
@@ -1265,7 +1265,7 @@
  */
 
 void
-InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
+InitOutput (ScreenInfo *screenInfo, const int argc, const char *argv[])
 {
   int		i;
   int		iMaxConsecutiveScreen = 0;
Index: xc/programs/Xserver/hw/xwin/win.h
diff -u xc/programs/Xserver/hw/xwin/win.h:1.39 xc/programs/Xserver/hw/xwin/win.h:1.41
--- xc/programs/Xserver/hw/xwin/win.h:1.39	Fri Oct 14 11:17:15 2005
+++ xc/programs/Xserver/hw/xwin/win.h	Tue Jan 23 13:03:12 2007
@@ -31,7 +31,7 @@
  *		Harold L Hunt II
  *		Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.39 2005/10/14 15:17:15 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.41 2007/01/23 18:03:12 tsi Exp $ */
 
 #ifndef _WIN_H_
 #define _WIN_H_
@@ -274,7 +274,7 @@
 
 typedef Bool (*winCreateBoundingWindowProcPtr)(ScreenPtr);
 
-typedef Bool (*winFinishScreenInitProcPtr)(int, ScreenPtr, int, char **);
+typedef Bool (*winFinishScreenInitProcPtr)(int, ScreenPtr, int, const char **);
 
 typedef Bool (*winBltExposedRegionsProcPtr)(ScreenPtr);
 
@@ -1171,17 +1171,17 @@
 Bool
 winScreenInit (int index,
 	       ScreenPtr pScreen,
-	       int argc, char **argv);
+	       const int argc, const char **argv);
 
 Bool
 winFinishScreenInitFB (int index,
 		       ScreenPtr pScreen,
-		       int argc, char **argv);
+		       int argc, const char **argv);
 
 Bool
 winFinishScreenInitNativeGDI (int index,
 			      ScreenPtr pScreen,
-			      int argc, char **argv);
+			      int argc, const char **argv);
 
 Bool
 winSaveScreen (ScreenPtr pScreen, int on);
Index: xc/programs/Xserver/hw/xwin/winconfig.h
diff -u xc/programs/Xserver/hw/xwin/winconfig.h:1.1 xc/programs/Xserver/hw/xwin/winconfig.h:1.2
--- xc/programs/Xserver/hw/xwin/winconfig.h:1.1	Thu Oct 17 04:18:22 2002
+++ xc/programs/Xserver/hw/xwin/winconfig.h	Wed Jan  3 21:02:19 2007
@@ -27,12 +27,12 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.2 2007/01/04 02:02:19 tsi Exp $ */
 #ifndef __WIN_CONFIG_H__
 #define __WIN_CONFIG_H__
 
 #include "win.h"
-#include "../xfree86/parser/xf86Parser.h"
+#include "xf86Parser.h"
 
 
 /* These are taken from hw/xfree86/common/xf86str.h */
Index: xc/programs/Xserver/hw/xwin/winkeybd.h
diff -u xc/programs/Xserver/hw/xwin/winkeybd.h:1.3 xc/programs/Xserver/hw/xwin/winkeybd.h:1.4
--- xc/programs/Xserver/hw/xwin/winkeybd.h:1.3	Fri Jul  5 05:19:26 2002
+++ xc/programs/Xserver/hw/xwin/winkeybd.h	Wed Jan  3 21:02:19 2007
@@ -27,12 +27,12 @@
  *
  * Authors:	Harold L Hunt II
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.4 2007/01/04 02:02:19 tsi Exp $ */
 
 /*
  * We need symbols for the scan codes of keys.
  */
-#include "../xfree86/common/atKeynames.h"
+#include "atKeynames.h"
 
 
 /*
@@ -40,7 +40,7 @@
  *
  * This header declares a static KeySym array called 'map'.
  */
-#include "../xfree86/common/xf86Keymap.h"
+#include "xf86Keymap.h"
 
 
 #if WIN_NEW_KEYBOARD_SUPPORT
Index: xc/programs/Xserver/hw/xwin/winpushpxl.c
diff -u xc/programs/Xserver/hw/xwin/winpushpxl.c:1.2 xc/programs/Xserver/hw/xwin/winpushpxl.c:1.3
--- xc/programs/Xserver/hw/xwin/winpushpxl.c:1.2	Fri Oct 14 11:17:16 2005
+++ xc/programs/Xserver/hw/xwin/winpushpxl.c	Wed Jan  3 21:02:19 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.2 2005/10/14 15:17:16 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.3 2007/01/04 02:02:19 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -50,7 +50,7 @@
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "miscstruct.h"
-#include "../mfb/maskbits.h"
+#include "maskbits.h"
 #include "mi.h"
 
 #define NPT 128
Index: xc/programs/Xserver/hw/xwin/winscrinit.c
diff -u xc/programs/Xserver/hw/xwin/winscrinit.c:1.29 xc/programs/Xserver/hw/xwin/winscrinit.c:1.31
--- xc/programs/Xserver/hw/xwin/winscrinit.c:1.29	Mon Feb 14 20:09:37 2005
+++ xc/programs/Xserver/hw/xwin/winscrinit.c	Tue Jan 23 13:03:12 2007
@@ -31,7 +31,7 @@
  *		Harold L Hunt II
  *		Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.29 2005/02/15 01:09:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.31 2007/01/23 18:03:12 tsi Exp $ */
 
 #include "win.h"
 
@@ -45,7 +45,7 @@
 Bool
 winScreenInit (int index,
 	       ScreenPtr pScreen,
-	       int argc, char **argv)
+	       const int argc, const char **argv)
 {
   winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
   winPrivScreenPtr	pScreenPriv;
@@ -189,7 +189,7 @@
 Bool
 winFinishScreenInitFB (int index,
 		       ScreenPtr pScreen,
-		       int argc, char **argv)
+		       int argc, const char **argv)
 {
   winScreenPriv(pScreen);
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
@@ -580,7 +580,7 @@
 Bool
 winFinishScreenInitNativeGDI (int index,
 			      ScreenPtr pScreen,
-			      int argc, char **argv)
+			      int argc, const char **argv)
 {
   winScreenPriv(pScreen);
   winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
Index: xc/programs/Xserver/hw/xwin/winvideo.c
diff -u xc/programs/Xserver/hw/xwin/winvideo.c:1.3 xc/programs/Xserver/hw/xwin/winvideo.c:removed
--- xc/programs/Xserver/hw/xwin/winvideo.c:1.3	Fri Oct 14 11:17:16 2005
+++ xc/programs/Xserver/hw/xwin/winvideo.c	Sun Aug 12 22:03:34 2007
@@ -1,206 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of the XFree86 Project
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from the XFree86 Project.
- *
- * Authors:	Harold L Hunt II
- */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.3 2005/10/14 15:17:16 tsi Exp $ */
-
-#include "win.h"
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-
-
-/*
- * winInitVideo - Initialize support for the X Video (Xv) Extension.
- */
-
-void
-winInitVideo (ScreenPtr pScreen)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
-
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      
-    }
-  
-
-}
-
-
-
-
-
-
-
-#if 0
-#include "../xfree86/common/xf86.h"
-#include "../Xext/xvdix.h"
-#include "../xfree86/common/xf86xv.h"
-#include <X11/extensions/Xv.h>
-#endif
-
-#include "win.h"
-
-
-
-#if 0
-/* client libraries expect an encoding */
-static XF86VideoEncodingRec DummyEncoding[1] =
-{
- {
-   0,
-   "XV_IMAGE",
-   IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
-   {1, 1}
- }
-};
-
-#define NUM_FORMATS 3
-
-static XF86VideoFormatRec Formats[NUM_FORMATS] = 
-{
-  {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
-};
-
-#define NUM_ATTRIBUTES 3
-
-static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
-{
-   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
-   {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
-   {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}
-};
-
-#define NUM_IMAGES 4
-
-static XF86ImageRec Images[NUM_IMAGES] =
-{
-	XVIMAGE_YUY2,
-	XVIMAGE_YV12,
-	XVIMAGE_I420,
-	XVIMAGE_UYVY
-};
-
-
-
-/*
- * winInitVideo - Initialize support for the X Video (Xv) Extension.
- */
-
-void
-winInitVideo (ScreenPtr pScreen)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
-  XF86VideoAdaptorPtr	newAdaptor = NULL;
-
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      newAdaptor = I810SetupImageVideo (pScreen);
-      I810InitOffscreenImages (pScreen);
-    }
-  
-    xf86XVScreenInit (pScreen, adaptors, 1);
-}
-
-
-static XF86VideoAdaptorPtr 
-winSetupImageVideo (ScreenPtr pScreen)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-#if 0
-    I810Ptr pI810 = I810PTR(pScrn);
-#endif
-    XF86VideoAdaptorPtr adapt;
-
-    if (!(adapt = xcalloc (1, sizeof(XF86VideoAdaptorRec))))
-      return NULL;
-
-    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-    adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-    adapt->name = "Cygwin/XFree86 Video Overlay";
-    adapt->nEncodings = 1;
-    adapt->pEncodings = DummyEncoding;
-    adapt->nFormats = NUM_FORMATS;
-    adapt->pFormats = Formats;
-    adapt->nPorts = 1;
-    adapt->pPortPrivates = NULL;
-
-    adapt->pPortPrivates[0].ptr = NULL;
-    adapt->pAttributes = Attributes;
-    adapt->nImages = NUM_IMAGES;
-    adapt->nAttributes = NUM_ATTRIBUTES;
-    adapt->pImages = Images;
-    adapt->PutVideo = NULL;
-    adapt->PutStill = NULL;
-    adapt->GetVideo = NULL;
-    adapt->GetStill = NULL;
-#if 0
-    adapt->StopVideo = I810StopVideo;
-    adapt->SetPortAttribute = I810SetPortAttribute;
-    adapt->GetPortAttribute = I810GetPortAttribute;
-    adapt->QueryBestSize = I810QueryBestSize;
-    adapt->PutImage = I810PutImage;
-    adapt->QueryImageAttributes = I810QueryImageAttributes;
-#endif
-
-#if 0
-    pPriv->colorKey = pI810->colorKey & ((1 << pScrn->depth) - 1);
-#endif
-    pPriv->videoStatus = 0;
-    pPriv->brightness = 0;
-    pPriv->contrast = 64;
-    pPriv->linear = NULL;
-    pPriv->currentBuf = 0;
-
-#if 0
-    /* gotta uninit this someplace */
-    REGION_NULL(pScreen, &pPriv->clip);
-#endif
-
-#if 0
-    pI810->adaptor = adapt;
-
-    pI810->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = I810BlockHandler;
-#endif
-
-#if 0
-    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast   = MAKE_ATOM("XV_CONTRAST");
-    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
-#endif
-
-#if 0
-    I810ResetVideo(pScrn);
-#endif
-
-    return adapt;
-}
-#endif
Index: xc/programs/Xserver/include/closestr.h
diff -u xc/programs/Xserver/include/closestr.h:3.6 xc/programs/Xserver/include/closestr.h:3.7
--- xc/programs/Xserver/include/closestr.h:3.6	Fri Oct 14 11:17:18 2005
+++ xc/programs/Xserver/include/closestr.h	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.6 2005/10/14 15:17:18 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.7 2006/09/02 16:44:23 dawes Exp $ */
 /*
 
 Copyright 1991, 1998  The Open Group
@@ -51,7 +51,7 @@
     Bool        slept;
 
 /* XXX -- get these from request buffer instead? */
-    char       *origFontName;
+    const char       *origFontName;
     int		origFontNameLen;
     XID         fontid;
     char       *fontname;
Index: xc/programs/Xserver/include/cursor.h
diff -u xc/programs/Xserver/include/cursor.h:1.8 xc/programs/Xserver/include/cursor.h:1.9
--- xc/programs/Xserver/include/cursor.h:1.8	Mon Jan  9 10:00:33 2006
+++ xc/programs/Xserver/include/cursor.h	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.8 2006/01/09 15:00:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.9 2006/09/02 16:44:23 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -112,7 +112,7 @@
     ClientPtr /*client*/);
 
 extern CursorPtr CreateRootCursor(
-    char* /*pfilename*/,
+    const char* /*pfilename*/,
     unsigned int /*glyph*/);
 
 extern int ServerBitsFromGlyph(
Index: xc/programs/Xserver/include/dixfont.h
diff -u xc/programs/Xserver/include/dixfont.h:3.9 xc/programs/Xserver/include/dixfont.h:3.10
--- xc/programs/Xserver/include/dixfont.h:3.9	Fri Oct 14 11:17:18 2005
+++ xc/programs/Xserver/include/dixfont.h	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.9 2005/10/14 15:17:18 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.10 2006/09/02 16:44:23 dawes Exp $ */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -38,7 +38,7 @@
 
 extern int FontToXError(int /*err*/);
 
-extern Bool SetDefaultFont(char * /*defaultfontname*/);
+extern Bool SetDefaultFont(const char * /*defaultfontname*/);
 
 extern void QueueFontWakeup(FontPathElementPtr /*fpe*/);
 
@@ -52,7 +52,7 @@
 		    XID /*fid*/,
 		    Mask /*flags*/,
 		    unsigned /*lenfname*/,
-		    char * /*pfontname*/);
+		    const char * /*pfontname*/);
 
 extern int CloseFont(pointer /*pfont*/,
 		     XID /*fid*/);
@@ -104,7 +104,7 @@
 		       unsigned char * /*paths*/,
 		       int * /*error*/);
 
-extern int SetDefaultFontPath(char * /*path*/);
+extern int SetDefaultFontPath(const char * /*path*/);
 
 extern unsigned char *GetFontPath(int * /*count*/,
 				  int * /*length*/);
@@ -145,7 +145,7 @@
 			     unsigned char * /*chars*/,
 			     ExtentInfoPtr /*info*/);
 
-extern Bool ParseGlyphCachingMode(char * /*str*/);
+extern Bool ParseGlyphCachingMode(const char * /*str*/);
 
 extern void InitGlyphCaching(void);
 
Index: xc/programs/Xserver/include/extension.h
diff -u xc/programs/Xserver/include/extension.h:1.7 xc/programs/Xserver/include/extension.h:1.8
--- xc/programs/Xserver/include/extension.h:1.7	Mon Jan  9 10:00:33 2006
+++ xc/programs/Xserver/include/extension.h	Sat Sep  2 12:44:23 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.7 2006/01/09 15:00:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.8 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef EXTENSION_H
 #define EXTENSION_H 
@@ -55,7 +55,7 @@
 
 extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
 
-extern void InitExtensions(int argc, char **argv);
+extern void InitExtensions(int argc, const char *argv[]);
 
 extern void InitVisualWrap(void);
 
Index: xc/programs/Xserver/include/extinit.h
diff -u xc/programs/Xserver/include/extinit.h:3.3 xc/programs/Xserver/include/extinit.h:3.4
--- xc/programs/Xserver/include/extinit.h:3.3	Mon Nov 17 17:20:43 2003
+++ xc/programs/Xserver/include/extinit.h	Wed Jan  3 21:48:13 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.4 2007/01/04 02:48:13 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -34,10 +34,7 @@
 #include "extnsionst.h"
 
 void
-XInputExtensionInit(
-	void
-	);
-
+XInputExtensionInit(INITARGS);
 
 int
 ProcIDispatch (
Index: xc/programs/Xserver/include/globals.h
diff -u xc/programs/Xserver/include/globals.h:1.4 xc/programs/Xserver/include/globals.h:1.5
--- xc/programs/Xserver/include/globals.h:1.4	Wed Jun 28 14:21:22 2000
+++ xc/programs/Xserver/include/globals.h	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.5 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
@@ -12,8 +12,8 @@
 extern CARD32 ScreenSaverTime;
 extern CARD32 ScreenSaverInterval;
 
-extern char *defaultFontPath;
-extern char *rgbPath;
+extern const char *defaultFontPath;
+extern const char *rgbPath;
 extern int monitorResolution;
 extern Bool loadableFonts;
 extern int defaultColorVisualClass;
Index: xc/programs/Xserver/include/input.h
diff -u xc/programs/Xserver/include/input.h:3.9 xc/programs/Xserver/include/input.h:3.10
--- xc/programs/Xserver/include/input.h:3.9	Mon Jan  9 10:00:33 2006
+++ xc/programs/Xserver/include/input.h	Sat Sep  2 12:44:23 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.9 2006/01/09 15:00:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/input.h,v 3.10 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef INPUT_H
 #define INPUT_H
@@ -369,7 +369,7 @@
 extern void ProcessInputEvents(void);
 
 extern void InitInput(
-    int  /*argc*/,
-    char ** /*argv*/);
+    const int  /*argc*/,
+    const char ** /*argv*/);
 
 #endif /* INPUT_H */
Index: xc/programs/Xserver/include/opaque.h
diff -u xc/programs/Xserver/include/opaque.h:1.15 xc/programs/Xserver/include/opaque.h:1.16
--- xc/programs/Xserver/include/opaque.h:1.15	Mon Jan  9 10:00:33 2006
+++ xc/programs/Xserver/include/opaque.h	Sat Sep  2 12:44:23 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.15 2006/01/09 15:00:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.16 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef OPAQUE_H
 #define OPAQUE_H
@@ -34,8 +34,8 @@
 
 #include "globals.h"
 
-extern char *defaultTextFont;
-extern char *defaultCursorFont;
+extern const char *defaultTextFont;
+extern const char *defaultCursorFont;
 extern int MaxClients;
 extern char isItTimeToYield;
 extern char dispatchException;
@@ -51,8 +51,8 @@
 extern int defaultScreenSaverBlanking;
 extern int defaultScreenSaverAllowExposures;
 extern int argcGlobal;
-extern char **argvGlobal;
-extern char *display;
+extern const char **argvGlobal;
+extern const char *display;
 
 extern int defaultBackingStore;
 extern Bool disableBackingStore;
Index: xc/programs/Xserver/include/os.h
diff -u xc/programs/Xserver/include/os.h:3.68 xc/programs/Xserver/include/os.h:3.71
--- xc/programs/Xserver/include/os.h:3.68	Thu Mar 16 16:44:00 2006
+++ xc/programs/Xserver/include/os.h	Mon Apr  2 20:21:13 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.68 2006/03/16 21:44:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/os.h,v 3.71 2007/04/03 00:21:13 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -292,7 +292,7 @@
 
 extern void UseMsg(void);
 
-extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
+extern void ProcessCommandLine(const int /*argc*/, const char* /*argv*/[]);
 
 extern int set_font_authorizations(
     char ** /* authorizations */, 
@@ -358,10 +358,10 @@
 void OsReleaseSignals (void);
 
 #if !defined(WIN32) && !defined(__UNIXOS2__)
-extern int System(char *);
-extern pointer Popen(char *, char *);
+extern int System(const char *);
+extern pointer Popen(const char *, const char *);
 extern int Pclose(pointer);
-extern pointer Fopen(char *, char *);
+extern pointer Fopen(const char *, const char *);
 extern int Fclose(pointer);
 #else
 #define System(a) system(a)
@@ -371,7 +371,7 @@
 #define Fclose(a) fclose(a)
 #endif
 
-extern void CheckUserParameters(int argc, char **argv, char **envp);
+extern void CheckUserParameters(const int argc, const char **argv, char **envp);
 extern void CheckUserAuthorization(void);
 
 extern int AddHost(
@@ -415,7 +415,7 @@
 
 extern void AddLocalHosts(void);
 
-extern void ResetHosts(char *display);
+extern void ResetHosts(const char *display);
 
 extern void EnableLocalHost(void);
 
@@ -427,7 +427,7 @@
 
 extern void AugmentSelf(pointer /*from*/, int /*len*/);
 
-extern void InitAuthorization(char * /*filename*/);
+extern void InitAuthorization(const char * /*filename*/);
 
 /* extern int LoadAuthorization(void); */
 
@@ -481,7 +481,7 @@
 extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
 #endif
 
-extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
+extern int ddxProcessArgument(int /*argc*/, const char * /*argv*/ [], int /*i*/);
 
 extern void ddxUseMsg(void);
 
@@ -595,6 +595,12 @@
 #endif
 ;
 
+#ifdef __GNUC__
+#define FatalAlloc()	FatalError("Out of Memory: %s() %s:%d", __FUNCTION__, __FILE__, __LINE__); 
+#else
+#define FatalAlloc()	FatalError("Out of Memory: %s:%d", __FILE__, __LINE__); 
+#endif
+
 extern void VErrorF(const char *f, va_list args);
 extern void ErrorF(const char *f, ...) _printf_attribute(1,2);
 extern void Error(char *str);
@@ -621,7 +627,13 @@
 #if defined(printf_is_xf86printf) && !defined(printf)
 #define printf xf86printf
 #endif
+
 extern int getArgc(void);
+extern const char **getArgvp(void);
 extern const char *getArgv(int i);
 
+#ifdef __DARWIN__
+extern void DarwinHandleGUI(int argc, const char *argv[], char *envp[]);
+#endif
+
 #endif /* OS_H */
Index: xc/programs/Xserver/include/regionstr.h
diff -u xc/programs/Xserver/include/regionstr.h:1.15 xc/programs/Xserver/include/regionstr.h:1.16
--- xc/programs/Xserver/include/regionstr.h:1.15	Mon Jan  9 10:00:33 2006
+++ xc/programs/Xserver/include/regionstr.h	Sun Dec 10 10:58:33 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.15 2006/01/09 15:00:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.16 2006/12/10 15:58:33 tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
@@ -392,4 +392,8 @@
 extern BoxPtr miRegionExtents(
     RegionPtr /*pReg*/);
 
+#ifdef DEBUG
+extern int miPrintRegion(RegionPtr rgn);
+#endif
+
 #endif /* REGIONSTRUCT_H */
Index: xc/programs/Xserver/include/screenint.h
diff -u xc/programs/Xserver/include/screenint.h:1.8 xc/programs/Xserver/include/screenint.h:1.9
--- xc/programs/Xserver/include/screenint.h:1.8	Fri Apr  1 09:27:02 2005
+++ xc/programs/Xserver/include/screenint.h	Sat Sep  2 12:44:23 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.8 2005/04/01 14:27:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.9 2006/09/02 16:44:23 dawes Exp $ */
 #ifndef SCREENINT_H
 #define SCREENINT_H
 
@@ -80,13 +80,13 @@
 typedef Bool (*ScrnInitProcPtr)(
     int /* index */,
     ScreenPtr /* pScreen */,
-    int /* argc */,
-    char ** /* argv */);
+    const int /* argc */,
+    const char ** /* argv */);
 
 extern int AddScreen(
     ScrnInitProcPtr /* pfnInit */,
-    int /* argc */,
-    char** /* argv */);
+    const int /* argc */,
+    const char** /* argv */);
 
 #ifdef PIXPRIV
 
Index: xc/programs/Xserver/include/scrnintstr.h
diff -u xc/programs/Xserver/include/scrnintstr.h:1.14 xc/programs/Xserver/include/scrnintstr.h:1.15
--- xc/programs/Xserver/include/scrnintstr.h:1.14	Mon Jan  9 10:00:34 2006
+++ xc/programs/Xserver/include/scrnintstr.h	Sat Sep  2 12:44:23 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.14 2006/01/09 15:00:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.15 2006/09/02 16:44:23 dawes Exp $ */
 
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
@@ -726,7 +726,7 @@
 
 extern void InitOutput(
     ScreenInfo 	* /*pScreenInfo*/,
-    int     	/*argc*/,
-    char    	** /*argv*/);
+    const int     	/*argc*/,
+    const char    	** /*argv*/);
 
 #endif /* SCREENINTSTRUCT_H */
Index: xc/programs/Xserver/lbx/lbxmain.c
diff -u xc/programs/Xserver/lbx/lbxmain.c:1.14 xc/programs/Xserver/lbx/lbxmain.c:1.15
--- xc/programs/Xserver/lbx/lbxmain.c:1.14	Fri Oct 14 11:17:20 2005
+++ xc/programs/Xserver/lbx/lbxmain.c	Wed Jan  3 21:48:13 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.14 2005/10/14 15:17:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.15 2007/01/04 02:48:13 tsi Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -118,7 +118,7 @@
 
 
 void
-LbxExtensionInit(void)
+LbxExtensionInit(INITARGS)
 {
     ExtensionEntry *extEntry;
 
Index: xc/programs/Xserver/lbx/lbxserve.h
diff -u xc/programs/Xserver/lbx/lbxserve.h:1.6 xc/programs/Xserver/lbx/lbxserve.h:1.7
--- xc/programs/Xserver/lbx/lbxserve.h:1.6	Fri Oct 14 11:17:20 2005
+++ xc/programs/Xserver/lbx/lbxserve.h	Wed Jan  3 21:48:13 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.6 2005/10/14 15:17:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.7 2007/01/04 02:48:13 tsi Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -56,6 +56,7 @@
 #include <X11/extensions/lbxstr.h>
 #include <X11/extensions/lbxdeltastr.h>
 #include <X11/extensions/lbxopts.h>
+#include "extnsionst.h"
 
 #define MAX_LBX_CLIENTS	MAXCLIENTS
 #define	MAX_NUM_PROXIES	(MAXCLIENTS >> 1)
@@ -214,7 +215,7 @@
 extern LbxProxyPtr LbxPidToProxy ( int pid );
 extern void LbxReencodeOutput ( ClientPtr client, char *pbuf, int *pcount,
 				char *cbuf, int *ccount );
-extern void LbxExtensionInit ( void );
+extern void LbxExtensionInit ( INITARGS );
 extern void LbxCloseClient ( ClientPtr client );
 extern void LbxSetForBlock ( LbxClientPtr lbxClient );
 extern int ProcLbxDispatch ( ClientPtr client );
Index: xc/programs/Xserver/mfb/Imakefile
diff -u xc/programs/Xserver/mfb/Imakefile:3.20 xc/programs/Xserver/mfb/Imakefile:3.21
--- xc/programs/Xserver/mfb/Imakefile:3.20	Fri Oct 14 11:17:20 2005
+++ xc/programs/Xserver/mfb/Imakefile	Sun Jul  1 11:14:51 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.20 2005/10/14 15:17:20 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.21 2007/07/01 15:14:51 tsi Exp $
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -160,6 +160,7 @@
 
 #ifdef IHaveModules
 InstallLibraryModule(mfb,$(MODULEDIR),.)
+InstallDriverSDKLibraryModule(mfb,$(DRIVERSDKMODULEDIR),.)
 #endif
 
 DependTarget()
@@ -169,10 +170,9 @@
 DependSubdirs($(SUBDIRS))
 #endif
 
-InstallDriverSDKLibraryModule(mfb,$(DRIVERSDKMODULEDIR),.)
-
+#if !defined(IHaveModules) || !BuildModuleInSubdir
 InstallDriverSDKNonExecFile(mfb.h,$(DRIVERSDKINCLUDEDIR))
-
+#endif
 
 #ifdef LinkDirectory
 LinkSourceFile(maskbits.c,LinkDirectory)
Index: xc/programs/Xserver/mfb/maskbits.h
diff -u xc/programs/Xserver/mfb/maskbits.h:3.11 xc/programs/Xserver/mfb/maskbits.h:3.13
--- xc/programs/Xserver/mfb/maskbits.h:3.11	Fri Oct 14 11:17:20 2005
+++ xc/programs/Xserver/mfb/maskbits.h	Mon Dec 25 11:15:49 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.11 2005/10/14 15:17:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.13 2006/12/25 16:15:49 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */
 /***********************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -320,21 +320,25 @@
 #ifdef __GNUC__ /* XXX don't want for Alpha? */
 #ifdef vax
 #define FASTGETBITS(psrc,x,w,dst) \
-    __asm ("extzv %1,%2,%3,%0" \
-	 : "=g" (dst) \
-	 : "g" (x), "g" (w), "m" (*(char *)(psrc)))
+    __asm__ __volatile__ ( \
+	"extzv %1,%2,%3,%0" \
+	: "=g" (dst) \
+	: "g" (x), "g" (w), "m" (*(char *)(psrc)))
 #define getbits(psrc,x,w,dst) FASTGETBITS(psrc,x,w,dst)
 
 #define FASTPUTBITS(src, x, w, pdst) \
-    __asm ("insv %3,%1,%2,%0" \
-	 : "=m" (*(char *)(pdst)) \
-	 : "g" (x), "g" (w), "g" (src))
+    __asm__ __volatile__ ( \
+	"insv %3,%1,%2,%0" \
+	: "=m" (*(char *)(pdst)) \
+	: "g" (x), "g" (w), "g" (src))
 #define putbits(src, x, w, pdst) FASTPUTBITS(src, x, w, pdst)
 #endif /* vax */
 #ifdef mc68020
 #define FASTGETBITS(psrc, x, w, dst) \
-    __asm ("bfextu %3{%1:%2},%0" \
-    : "=d" (dst) : "di" (x), "di" (w), "o" (*(char *)(psrc)))
+    __asm__ __volatile__ ( \
+	"bfextu %3{%1:%2},%0" \
+	: "=d" (dst) \
+	: "di" (x), "di" (w), "o" (*(char *)(psrc)))
 
 #define getbits(psrc,x,w,dst) \
 { \
@@ -343,9 +347,10 @@
 }
 
 #define FASTPUTBITS(src, x, w, pdst) \
-    __asm ("bfins %3,%0{%1:%2}" \
-	 : "=o" (*(char *)(pdst)) \
-	 : "di" (x), "di" (w), "d" (src), "0" (*(char *) (pdst)))
+    __asm__ __volatile__ ( \
+	"bfins %3,%0{%1:%2}" \
+	: "+o" (*(char *)(pdst)) \
+	: "di" (x), "di" (w), "d" (src))
 
 #define putbits(src, x, w, pdst) FASTPUTBITS(SHR((src),32-(w)), x, w, pdst)
 
Index: xc/programs/Xserver/mfb/mfbblt.c
diff -u xc/programs/Xserver/mfb/mfbblt.c:3.6 xc/programs/Xserver/mfb/mfbblt.c:3.7
--- xc/programs/Xserver/mfb/mfbblt.c:3.6	Fri Oct 14 11:17:21 2005
+++ xc/programs/Xserver/mfb/mfbblt.c	Mon Dec 25 11:10:21 2006
@@ -1,7 +1,7 @@
 /*
  * mfb copy area
  */
-/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.6 2005/10/14 15:17:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.7 2006/12/25 16:10:21 tsi Exp $ */
 
 /*
 
@@ -281,11 +281,11 @@
 		     */
 		    while ((nl -= 6) >= 0)
 		    {
-			asm ("moveml %1+,#0x0c0f;moveml#0x0c0f,%0"
-			     : "=m" (*(char *)pdst)
-			     : "m" (*(char *)psrc)
-			     : "d0", "d1", "d2", "d3",
-			       "a2", "a3");
+			__asm__ __volatile__ (
+			    "moveml %1+,#0x0c0f;moveml#0x0c0f,%0"
+			    : "=m" (*(char *)pdst)
+			    : "m" (*(char *)psrc)
+			    : "d0", "d1", "d2", "d3", "a2", "a3");
 			pdst += 6;
 		    }
 		    nl += 6;
Index: xc/programs/Xserver/mi/miarc.c
diff -u xc/programs/Xserver/mi/miarc.c:3.20 xc/programs/Xserver/mi/miarc.c:3.21
--- xc/programs/Xserver/mi/miarc.c:3.20	Sun Feb 19 19:14:38 2006
+++ xc/programs/Xserver/mi/miarc.c	Mon Apr  9 11:37:18 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.20 2006/02/20 00:14:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.21 2007/04/09 15:37:18 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -1909,12 +1909,12 @@
 	double		a0, a1;
 	struct arcData	*data;
 	miArcDataPtr	arc;
-	xArc		xarc;
+	xArc		xarc = {0, };
 	int		iphase, prevphase = 0, joinphase;
 	int		arcsJoin;
 	int		selfJoin;
 
-	int		iDash = 0, dashRemaining;
+	int		iDash = 0, dashRemaining = 0;
 	int		iDashStart = 0, dashRemainingStart = 0, iphaseStart;
 	int		startAngle, spanAngle, endAngle, backwards = 0;
 	int		prevDashAngle, dashAngle;
Index: xc/programs/Xserver/mi/mibank.c
diff -u xc/programs/Xserver/mi/mibank.c:1.18 xc/programs/Xserver/mi/mibank.c:1.19
--- xc/programs/Xserver/mi/mibank.c:1.18	Thu Jan  5 13:55:33 2006
+++ xc/programs/Xserver/mi/mibank.c	Mon Jan  1 11:08:21 2007
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997 through 2006 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2007 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -44,7 +44,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.18 2006/01/05 18:55:33 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.19 2007/01/01 16:08:21 tsi Exp $ */
 
 /*
  * This thing originated from an idea of Edwin Goei and his bank switching
Index: xc/programs/Xserver/mi/mibank.h
diff -u xc/programs/Xserver/mi/mibank.h:1.13 xc/programs/Xserver/mi/mibank.h:1.14
--- xc/programs/Xserver/mi/mibank.h:1.13	Thu Jan  5 13:55:33 2006
+++ xc/programs/Xserver/mi/mibank.h	Mon Jan  1 11:08:21 2007
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997 through 2006 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2007 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -20,7 +20,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.13 2006/01/05 18:55:33 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.14 2007/01/01 16:08:21 tsi Exp $ */
 
 #ifndef __MIBANK_H__
 #define __MIBANK_H__ 1
Index: xc/programs/Xserver/mi/miexpose.c
diff -u xc/programs/Xserver/mi/miexpose.c:3.13 xc/programs/Xserver/mi/miexpose.c:3.14
--- xc/programs/Xserver/mi/miexpose.c:3.13	Sun Feb 19 10:51:31 2006
+++ xc/programs/Xserver/mi/miexpose.c	Mon Apr  9 11:37:18 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.13 2006/02/19 15:51:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.14 2007/04/09 15:37:18 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -110,7 +110,7 @@
 				   the window background
 				*/
     WindowPtr pSrcWin;
-    BoxRec expBox;
+    BoxRec expBox = {0, };
     Bool extents;
 
     /* This prevents warning about pscr not being used. */
@@ -566,9 +566,9 @@
     ChangeGCVal gcval[7];
     ChangeGCVal newValues [COUNT_BITS];
 
-    BITS32 gcmask, index, mask;
+    BITS32 gcmask = 0, index, mask;
     RegionRec prgnWin;
-    DDXPointRec oldCorner;
+    DDXPointRec oldCorner = {0, 0};
     BoxRec box;
     WindowPtr	pBgWin;
     GCPtr pGC;
@@ -578,7 +578,7 @@
     xRectangle *prect;
     int numRects;
 
-    gcmask = 0;
+    REGION_NULL(pWin->drawable.pScreen, &prgnWin);
 
     if (what == PW_BACKGROUND)
     {
Index: xc/programs/Xserver/mi/miinitext.c
diff -u xc/programs/Xserver/mi/miinitext.c:3.78 xc/programs/Xserver/mi/miinitext.c:3.79
--- xc/programs/Xserver/mi/miinitext.c:3.78	Sun Feb 19 10:51:31 2006
+++ xc/programs/Xserver/mi/miinitext.c	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.78 2006/02/19 15:51:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.79 2006/09/02 16:44:23 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -231,7 +231,7 @@
 
 /*ARGSUSED*/
 void
-InitExtensions(int argc, char *argv[])
+InitExtensions(int argc, const char *argv[])
 {
 #ifdef PANORAMIX
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
@@ -498,7 +498,7 @@
     
 /*ARGSUSED*/
 void
-InitExtensions(int argc, char *argv[])
+InitExtensions(int argc, const char *argv[])
 {
     int i;
     ExtensionModule *ext;
Index: xc/programs/Xserver/mi/miwideline.c
diff -u xc/programs/Xserver/mi/miwideline.c:1.15 xc/programs/Xserver/mi/miwideline.c:1.16
--- xc/programs/Xserver/mi/miwideline.c:1.15	Fri Oct 14 11:17:23 2005
+++ xc/programs/Xserver/mi/miwideline.c	Mon Apr  9 11:37:18 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.15 2005/10/14 15:17:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.16 2007/04/09 15:37:18 tsi Exp $ */
 
 /* Author:  Keith Packard, MIT X Consortium */
 
@@ -1659,7 +1659,7 @@
     double	    L, l;
     double	    k;
     PolyVertexRec   vertices[4];
-    PolyVertexRec   saveRight, saveBottom;
+    PolyVertexRec   saveRight = {0.0, 0.0}, saveBottom = {0.0, 0.0};
     PolySlopeRec    slopes[4];
     PolyEdgeRec	    left[2], right[2];
     LineFaceRec	    lcapFace, rcapFace;
Index: xc/programs/Xserver/mi/mizerarc.c
diff -u xc/programs/Xserver/mi/mizerarc.c:1.9 xc/programs/Xserver/mi/mizerarc.c:1.10
--- xc/programs/Xserver/mi/mizerarc.c:1.9	Fri Oct 14 11:17:24 2005
+++ xc/programs/Xserver/mi/mizerarc.c	Mon Apr  9 11:37:18 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.9 2005/10/14 15:17:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.10 2007/04/09 15:37:18 tsi Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -773,7 +773,10 @@
 	if (miCanZeroArc(arc))
 	{
 	    if (pGC->lineStyle == LineSolid)
+	    {
 		pts = miZeroArcPts(arc, points);
+		oddPts = NULL;
+	    }
 	    else
 	    {
 		pts = points;
Index: xc/programs/Xserver/miext/layer/Imakefile
diff -u xc/programs/Xserver/miext/layer/Imakefile:1.7 xc/programs/Xserver/miext/layer/Imakefile:1.9
--- xc/programs/Xserver/miext/layer/Imakefile:1.7	Fri Oct 14 11:17:24 2005
+++ xc/programs/Xserver/miext/layer/Imakefile	Sun Jul  1 11:14:51 2007
@@ -1,6 +1,6 @@
-XCOMM $XFree86: xc/programs/Xserver/miext/layer/Imakefile,v 1.7 2005/10/14 15:17:24 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/miext/layer/Imakefile,v 1.9 2007/07/01 15:14:51 tsi Exp $
 /*
- * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
+ * Copyright (c) 1994-2007 by The XFree86 Project, Inc.
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -46,15 +46,21 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS= module
+#endif
+#endif
+
 #include <Server.tmpl>
 
-#ifdef XFree86Version
-#if DoLoadableServer
+#if defined(IHaveModules)
 XFMODSRC = laymodule.c
 XFMODOBJ = laymodule.o
 #endif
-#endif
 
 #if BuildRender
 RENDERSRC = layerpict.c
@@ -73,20 +79,44 @@
        layerwin.o \
        $(XFMODOBJ)
 
-   INCLUDES = -I../shadow -I../../mi -I../../fb -I../../include \
-	      -I$(XF86SRC)/common $(EXTRAINCLUDES) -I../../render
-   LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
-	     ../../mi/llib-lmi.ln
+   INCLUDES = -I$(SERVERSRC)/miext/layer -I$(SERVERSRC)/miext/shadow \
+	      -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb -I$(SERVERSRC)/include \
+	      -I$(XF86SRC)/common $(EXTRAINCLUDES) -I$(SERVERSRC)/render
+   LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \
+	      $(SERVERSRC)/mi/llib-lmi.ln
 
+#if defined(IHaveModules)
+ModuleObjectRule()
+LibraryModuleTarget(layer,$(OBJS),.)
+#else
 NormalLibraryObjectRule()
 LibraryModuleTarget(layer,$(OBJS),.)
-LintLibraryTarget(layer,$(SRCS))
+#endif
 
+LintLibraryTarget(layer,$(SRCS))
 NormalLintTarget($(SRCS))
 
+#if defined(IHaveModules)
 InstallLibraryModule(layer,$(MODULEDIR),.)
+InstallDriverSDKLibraryModule(layer,$(DRIVERSDKMODULEDIR),.)
+#endif
 
 DependTarget()
 
-InstallDriverSDKLibraryModule(layer,$(DRIVERSDKMODULEDIR),.)
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
+#ifdef LinkDirectory
+LinkSourceFile(layergc.c,LinkDirectory)
+LinkSourceFile(layerinit.c,LinkDirectory)
+LinkSourceFile(layerwin.c,LinkDirectory)
+#if BuildRender
+LinkSourceFile($(RENDERSRC),LinkDirectory)
+#endif
+#endif
+
+#if !defined(IHaveModules) || !BuildModuleInSubdir
 InstallDriverSDKNonExecFile(layer.h,$(DRIVERSDKINCLUDEDIR))
+#endif
Index: xc/programs/Xserver/miext/layer/layerwin.c
diff -u xc/programs/Xserver/miext/layer/layerwin.c:1.8 xc/programs/Xserver/miext/layer/layerwin.c:1.9
--- xc/programs/Xserver/miext/layer/layerwin.c:1.8	Mon Nov 10 13:22:49 2003
+++ xc/programs/Xserver/miext/layer/layerwin.c	Mon Apr  9 11:37:18 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $
+ * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.9 2007/04/09 15:37:18 tsi Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -368,6 +368,7 @@
     LayerWinLoopRec loop;
     Bool	    ret = TRUE;
 
+    (void) memset(&loop, 0, sizeof(loop));
     for (pLay = LayerWindowFirst (pWin, &loop);
 	 pLay;
 	 pLay = LayerWindowNext (pWin, &loop))
@@ -388,6 +389,7 @@
     LayerPtr	    pLay;
     LayerWinLoopRec loop;
 
+    (void) memset(&loop, 0, sizeof(loop));
     for (pLay = LayerWindowFirst (pWin, &loop);
 	 pLay;
 	 pLay = LayerWindowNext (pWin, &loop))
@@ -406,6 +408,7 @@
     LayerPtr	    pLay;
     LayerWinLoopRec loop;
 
+    (void) memset(&loop, 0, sizeof(loop));
     for (pLay = LayerWindowFirst (pWin, &loop);
 	 pLay;
 	 pLay = LayerWindowNext (pWin, &loop))
@@ -425,6 +428,7 @@
     LayerWinLoopRec loop;
     int		    dx = 0, dy = 0;
 
+    (void) memset(&loop, 0, sizeof(loop));
     for (pLay = LayerWindowFirst (pWin, &loop);
 	 pLay;
 	 pLay = LayerWindowNext (pWin, &loop))
Index: xc/programs/Xserver/miext/layer/laymodule.c
diff -u xc/programs/Xserver/miext/layer/laymodule.c:1.2 xc/programs/Xserver/miext/layer/laymodule.c:removed
--- xc/programs/Xserver/miext/layer/laymodule.c:1.2	Fri Oct 14 11:17:25 2005
+++ xc/programs/Xserver/miext/layer/laymodule.c	Sun Aug 12 22:03:40 2007
@@ -1,56 +0,0 @@
-/*
- * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.2 2005/10/14 15:17:25 tsi Exp $
- *
- * Copyright © 2000 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef XFree86LOADER
-
-#include "xf86Module.h"
-#include    <X11/X.h>
-#include    "scrnintstr.h"
-#include    "windowstr.h"
-#include    <X11/fonts/font.h>
-#include    "dixfontstr.h"
-#include    <X11/fonts/fontstruct.h>
-#include    "mi.h"
-#include    "regionstr.h"
-#include    "globals.h"
-#include    "gcstruct.h"
-#include "layer.h"
-
-static XF86ModuleVersionInfo VersRec =
-{
-	"layer",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
-	ABI_ANSIC_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}       /* signature, to be patched into the file by a tool */
-};
-
-XF86ModuleData layerModuleData = { &VersRec, NULL, NULL };
-
-#endif
Index: xc/programs/Xserver/miext/layer/module/Imakefile
diff -u /dev/null xc/programs/Xserver/miext/layer/module/Imakefile:1.1
--- /dev/null	Sun Aug 12 22:03:40 2007
+++ xc/programs/Xserver/miext/layer/module/Imakefile	Fri May 11 20:30:18 2007
@@ -0,0 +1,53 @@
+XCOMM $XFree86: xc/programs/Xserver/miext/layer/module/Imakefile,v 1.1 2007/05/12 00:30:18 tsi Exp $
+/*
+ * Copyright (c) 2000-2007 by The XFree86 Project, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ *   1.  Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions, and the following disclaimer.
+ *
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer
+ *       in the documentation and/or other materials provided with the
+ *       distribution, and in the same place and form as other copyright,
+ *       license and disclaimer information.
+ *
+ *   3.  The end-user documentation included with the redistribution,
+ *       if any, must include the following acknowledgment: "This product
+ *       includes software developed by The XFree86 Project, Inc
+ *       (http://www.xfree86.org/) and its contributors", in the same
+ *       place and form as other third-party acknowledgments.  Alternately,
+ *       this acknowledgment may appear in the software itself, in the
+ *       same form and location as other such third-party acknowledgments.
+ *
+ *   4.  Except as contained in this notice, the name of The XFree86
+ *       Project, Inc shall not be used in advertising or otherwise to
+ *       promote the sale, use or other dealings in this Software without
+ *       prior written authorization from The XFree86 Project, Inc.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define IHaveModules
+#define LinkDirectory ..
+
+#include "../Imakefile"
+
Index: xc/programs/Xserver/miext/layer/module/laymodule.c
diff -u /dev/null xc/programs/Xserver/miext/layer/module/laymodule.c:1.1
--- /dev/null	Sun Aug 12 22:03:40 2007
+++ xc/programs/Xserver/miext/layer/module/laymodule.c	Fri May 11 20:30:18 2007
@@ -0,0 +1,56 @@
+/*
+ * $XFree86: xc/programs/Xserver/miext/layer/module/laymodule.c,v 1.1 2007/05/12 00:30:18 tsi Exp $
+ *
+ * Copyright © 2000 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef XFree86LOADER
+
+#include "xf86Module.h"
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "mi.h"
+#include "regionstr.h"
+#include "globals.h"
+#include "gcstruct.h"
+#include "layer.h"
+
+static XF86ModuleVersionInfo VersRec =
+{
+	"layer",
+	MODULEVENDORSTRING,
+	MODINFOSTRING1,
+	MODINFOSTRING2,
+	XF86_VERSION_CURRENT,
+	1, 0, 0,
+	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
+	ABI_ANSIC_VERSION,
+	MOD_CLASS_NONE,
+	{0,0,0,0}       /* signature, to be patched into the file by a tool */
+};
+
+XF86ModuleData layerModuleData = { &VersRec, NULL, NULL };
+
+#endif
Index: xc/programs/Xserver/miext/rootless/Imakefile
diff -u xc/programs/Xserver/miext/rootless/Imakefile:1.6 xc/programs/Xserver/miext/rootless/Imakefile:1.7
--- xc/programs/Xserver/miext/rootless/Imakefile:1.6	Fri Oct 14 11:17:25 2005
+++ xc/programs/Xserver/miext/rootless/Imakefile	Tue Feb 27 11:54:44 2007
@@ -1,17 +1,25 @@
-XCOMM $XFree86: xc/programs/Xserver/miext/rootless/Imakefile,v 1.6 2005/10/14 15:17:25 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/miext/rootless/Imakefile,v 1.7 2007/02/27 16:54:44 tsi Exp $
 
 #include <Server.tmpl>
 
-#ifdef DarwinArchitecture
-#define RootlessSafeAlpha YES
-#define RootlessAcceleration YES
+#if defined(DarwinArchitecture) || (defined(XnonServer) && XnonServer)
+# ifndef RootlessSafeAlpha
+#  define RootlessSafeAlpha YES
+# endif
+# ifndef RootlessAcceleration
+#  define RootlessAcceleration YES
+# endif
 #else
-#define RootlessSafeAlpha NO
-#define RootlessAcceleration NO
+# ifndef RootlessSafeAlpha
+#  define RootlessSafeAlpha NO
+# endif
+# ifndef RootlessAcceleration
+#  define RootlessAcceleration NO
+# endif
 #endif
 
 #if RootlessSafeAlpha || RootlessAcceleration
-#define IHaveSubdirs
+# define IHaveSubdirs
 #endif
 
 #if RootlessSafeAlpha
@@ -43,9 +51,9 @@
 
 DependTarget()
 
+#ifdef IHaveSubdirs
 SUBDIRS = $(ALPHADIRS) $(ACCELDIRS)
 
-#if RootlessSafeAlpha || RootlessAcceleration
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
Index: xc/programs/Xserver/miext/rootless/rootless.h
diff -u xc/programs/Xserver/miext/rootless/rootless.h:1.8 xc/programs/Xserver/miext/rootless/rootless.h:1.9
--- xc/programs/Xserver/miext/rootless/rootless.h:1.8	Sun Oct 16 14:06:07 2005
+++ xc/programs/Xserver/miext/rootless/rootless.h	Mon Apr  2 20:21:14 2007
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.8 2005/10/16 18:06:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.9 2007/04/03 00:21:14 tsi Exp $ */
 
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
@@ -267,6 +267,20 @@
     (RootlessWindowPtr pFrame, WindowPtr oldWin);
 
 /*
+ * Check if window should be reordered. (Optional)
+ *  The underlying window system may animate windows being ordered in.
+ *  We want them to be mapped but remain ordered out until the animation
+ *  completes. If defined this function will be called to check if a
+ *  framed window should be reordered now. If this function returns
+ *  FALSE, the window will still be mapped from the X11 perspective, but
+ *  the RestackFrame function will not be called for its frame.
+ *
+ *  pFrame      Frame to reorder
+ */
+typedef Bool (*RootlessDoReorderWindowProc)
+    (RootlessWindowPtr pFrame);
+
+/*
  * Copy bytes. (Optional)
  *  Source and destinate may overlap and the right thing should happen.
  *
@@ -354,6 +368,7 @@
 
     /* Optional frame functions */
     RootlessSwitchWindowProc SwitchWindow;
+    RootlessDoReorderWindowProc DoReorderWindow;
 
     /* Optional acceleration functions */
     RootlessCopyBytesProc CopyBytes;
Index: xc/programs/Xserver/miext/rootless/rootlessWindow.c
diff -u xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.13 xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.15
--- xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.13	Sun Oct 16 14:06:07 2005
+++ xc/programs/Xserver/miext/rootless/rootlessWindow.c	Mon Apr  9 11:37:18 2007
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.13 2005/10/16 18:06:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.15 2007/04/09 15:37:18 tsi Exp $ */
 
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"
@@ -70,13 +70,12 @@
         HUGE_ROOT(pWin);
         SetWinSize(pWin);
         SetBorderSize(pWin);
-    }
+    } else REGION_NULL(pWin->drawable.pScreen, &saveRoot);
 
     result = pWin->drawable.pScreen->CreateWindow(pWin);
 
-    if (pWin->parent) {
+    if (!IsRoot(pWin))
         NORMAL_ROOT(pWin);
-    }
 
     SCREEN_WRAP(pWin->drawable.pScreen, CreateWindow);
 
@@ -411,11 +410,15 @@
         }
     }
 
-    if (!IsRoot(pWin)) HUGE_ROOT(pWin);
+    if (!IsRoot(pWin))
+	HUGE_ROOT(pWin);
+    else
+	REGION_NULL(pWin->drawable.pScreen, &saveRoot);
     SCREEN_UNWRAP(pScreen, RealizeWindow);
     result = pScreen->RealizeWindow(pWin);
     SCREEN_WRAP(pScreen, RealizeWindow);
-    if (!IsRoot(pWin)) NORMAL_ROOT(pWin);
+    if (!IsRoot(pWin))
+	NORMAL_ROOT(pWin);
 
     RL_DEBUG_MSG(("realizewindow end\n"));
     return result;
@@ -482,7 +485,7 @@
 
 /*
  * RootlessReorderWindow
- *  Reorder the window associated with the given frame so that it's
+ *  Reorder the frame associated with the given window so that it's
  *  physically above the window below it in the X stacking order.
  */
 void
@@ -496,6 +499,15 @@
         RootlessFrameID newPrevID;
         ScreenPtr pScreen = pWin->drawable.pScreen;
 
+        /* Check if the implementation wants the frame to not be reordered
+           even though the X11 window is restacked. This can be useful if
+           frames are ordered-in with animation so that the reordering is not
+           done until the animation is complete. */
+        if (SCREENREC(pScreen)->imp->DoReorderWindow) {
+            if (!SCREENREC(pScreen)->imp->DoReorderWindow(winRec))
+                return;
+        }
+
         RootlessStopDrawing(pWin, FALSE);
 
         /* Find the next window above this one that has a mapped frame. */
Index: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c
diff -u xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c:1.4 xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c:1.6
--- xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c:1.4	Sun Jan 18 20:22:48 2004
+++ xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c	Mon Apr  9 11:37:19 2007
@@ -32,7 +32,7 @@
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  */
- /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */
+ /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.6 2007/04/09 15:37:19 tsi Exp $ */
 
 #ifdef RENDER
 
@@ -46,7 +46,7 @@
 # define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
 
 
-// Replacement for fbStore_x8r8g8b8 that sets the alpha channel
+/* Replacement for fbStore_x8r8g8b8 that sets the alpha channel */
 void
 SafeAlphaStore_x8r8g8b8 (FbCompositeOperand *op, CARD32 value)
 {
@@ -56,7 +56,7 @@
 }
 
 
-// Defined in fbcompose.c
+/* Defined in fbcompose.c */
 extern FbCombineFunc fbCombineFuncU[];
 extern FbCombineFunc fbCombineFuncC[];
 
@@ -224,9 +224,6 @@
     CARD16              height)
 {
     FbCompositeOperand	src[4],msk[4],dst[4],*pmsk;
-    FbCompositeOperand	*srcPict, *srcAlpha;
-    FbCompositeOperand	*dstPict, *dstAlpha;
-    FbCompositeOperand	*mskPict = 0, *mskAlpha = 0;
     FbCombineFunc	f;
     int			w;
 
@@ -235,31 +232,11 @@
     if (!fbBuildCompositeOperand (pDst, dst, xDst, yDst, FALSE, TRUE))
 	return;
 
-    // Use SafeAlpha operands for on screen picture formats
+    /* Use SafeAlpha operands for on screen picture formats */
     if (pDst->format == PICT_x8r8g8b8) {
         dst[0].store = SafeAlphaStore_x8r8g8b8;
     }
 
-    if (pSrc->alphaMap)
-    {
-	srcPict = &src[1];
-	srcAlpha = &src[2];
-    }
-    else
-    {
-	srcPict = &src[0];
-	srcAlpha = 0;
-    }
-    if (pDst->alphaMap)
-    {
-	dstPict = &dst[1];
-	dstAlpha = &dst[2];
-    }
-    else
-    {
-	dstPict = &dst[0];
-	dstAlpha = 0;
-    }
     f = fbCombineFuncU[op];
     if (pMask)
     {
@@ -268,16 +245,6 @@
 	pmsk = msk;
 	if (pMask->componentAlpha)
 	    f = fbCombineFuncC[op];
-	if (pMask->alphaMap)
-	{
-	    mskPict = &msk[1];
-	    mskAlpha = &msk[2];
-	}
-	else
-	{
-	    mskPict = &msk[0];
-	    mskAlpha = 0;
-	}
     }
     else
 	pmsk = 0;
@@ -355,8 +322,10 @@
 				   height))
 	return;
 
-    // To preserve the alpha channel we have a special,
-    // non-optimzied compositor.
+    /*
+     * To preserve the alpha channel we have a special, non-optimzied
+     * compositor.
+     */
     func = SafeAlphaCompositeGeneral;
 
     /*
@@ -589,7 +558,7 @@
     }
     REGION_UNINIT (pDst->pDrawable->pScreen, &region);
 
-    // Reset destination depth to its true value
+    /* Reset destination depth to its true value */
     pDst->pDrawable->depth = dstDepth;
 }
 
Index: xc/programs/Xserver/miext/shadow/Imakefile
diff -u xc/programs/Xserver/miext/shadow/Imakefile:1.11 xc/programs/Xserver/miext/shadow/Imakefile:1.12
--- xc/programs/Xserver/miext/shadow/Imakefile:1.11	Fri Oct 14 11:17:25 2005
+++ xc/programs/Xserver/miext/shadow/Imakefile	Sun Jul  1 11:14:51 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/miext/shadow/Imakefile,v 1.11 2005/10/14 15:17:25 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/miext/shadow/Imakefile,v 1.12 2007/07/01 15:14:51 tsi Exp $
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -115,6 +115,7 @@
 
 #ifdef IHaveModules
 InstallLibraryModule(shadow,$(MODULEDIR),.)
+InstallDriverSDKLibraryModule(shadow,$(DRIVERSDKMODULEDIR),.)
 #endif
 
 DependTarget()
@@ -143,5 +144,6 @@
 LinkSourceFile(shrot32pack_270.c,LinkDirectory)
 #endif
 
-InstallDriverSDKLibraryModule(shadow,$(DRIVERSDKMODULEDIR),.)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
 InstallDriverSDKNonExecFile(shadow.h,$(DRIVERSDKINCLUDEDIR))
+#endif
Index: xc/programs/Xserver/os/Imakefile
diff -u xc/programs/Xserver/os/Imakefile:3.47 xc/programs/Xserver/os/Imakefile:3.48
--- xc/programs/Xserver/os/Imakefile:3.47	Sun Feb 19 10:51:31 2006
+++ xc/programs/Xserver/os/Imakefile	Wed Jan  3 22:33:43 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.47 2006/02/19 15:51:31 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.48 2007/01/04 03:33:43 tsi Exp $
 /*
  * Copyright (c) 1996-2006 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -173,9 +173,6 @@
    KRB5_DEFINES = Krb5Defines
  XALLOC_DEFINES = XallocDefines
   ERROR_DEFINES = ServerErrorDefines
-#if HasPam && HasPamMisc
-    PAM_DEFINES = -DUSE_PAM
-#endif
 
 #ifndef LinkDefines
 #define LinkDefines /**/
@@ -188,7 +185,7 @@
 		  $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
 		  $(KRB5_DEFINES) $(RGB_DEFINES) $(GETPEEREID_DEFINES) \
 		  $(STRLCAT_DEFINES) $(RANDOM_DEFINES) $(ASPRINTF_DEFINES) \
-		  $(EXT_DEFINES) LinkDefines
+		  $(EXT_DEFINES) $(PAMDEFINES) LinkDefines
        INCLUDES = -I$(SERVERSRC)/include -I$(SERVERSRC)/os \
 		  -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
 		  -I$(SERVERSRC)/lbx -I$(SERVERSRC)/Xprint \
@@ -229,7 +226,7 @@
 #if BuildLBX
 SpecialCObjectRule(lbxio,$(ICONFIGFILES),NullParameter)
 #endif
-SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES))
+SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(ERROR_DEFINES))
 SpecialCObjectRule(xalloc,$(ICONFIGFILES),$(XALLOC_DEFINES))
 #if defined(SparcArchitecture) && HasGcc && !HasGcc2
 oscolor.o: oscolor.c $(ICONFIGFILES)
Index: xc/programs/Xserver/os/access.c
diff -u xc/programs/Xserver/os/access.c:3.60 xc/programs/Xserver/os/access.c:3.63
--- xc/programs/Xserver/os/access.c:3.60	Fri Oct 14 11:17:26 2005
+++ xc/programs/Xserver/os/access.c	Mon Apr  9 11:37:19 2007
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/access.c,v 3.60 2005/10/14 15:17:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/access.c,v 3.63 2007/04/09 15:37:19 tsi Exp $ */
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
@@ -518,7 +518,8 @@
      * see), whereas gethostname() kindly truncates it for me.
      */
 #ifndef QNX4
-    uname(&name);
+    if (uname(&name) < 0)
+	name.nodename[0] = '\0';
 #else
     /* QNX4's uname returns node number in name.nodename, not the hostname
        have to overwrite it */
@@ -1062,7 +1063,7 @@
 
 /* Reset access control list to initial hosts */
 void
-ResetHosts (char *display)
+ResetHosts (const char *display)
 {
     HOST	*host;
     char                lhostname[120], ohostname[120];
@@ -1683,6 +1684,7 @@
     int				*len,
     pointer			*addr)
 {
+    *addr = NULL;
     if (*len == 0)
         return (FamilyLocal);
     switch (saddr->sa_family)
Index: xc/programs/Xserver/os/auth.c
diff -u xc/programs/Xserver/os/auth.c:1.15 xc/programs/Xserver/os/auth.c:1.16
--- xc/programs/Xserver/os/auth.c:1.15	Fri Oct 14 11:17:26 2005
+++ xc/programs/Xserver/os/auth.c	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.15 2005/10/14 15:17:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.16 2006/09/02 16:44:23 dawes Exp $ */
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -117,12 +117,12 @@
  * specified authorization file
  */
 
-static char *authorization_file = (char *)NULL;
+static const char *authorization_file = (char *)NULL;
 
 static Bool ShouldLoadAuth = TRUE;
 
 void
-InitAuthorization (char *file_name)
+InitAuthorization (const char *file_name)
 {
     authorization_file = file_name;
 }
Index: xc/programs/Xserver/os/connection.c
diff -u xc/programs/Xserver/os/connection.c:3.70 xc/programs/Xserver/os/connection.c:3.71
--- xc/programs/Xserver/os/connection.c:3.70	Mon Mar  6 11:06:23 2006
+++ xc/programs/Xserver/os/connection.c	Wed Aug  9 16:53:16 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.70 2006/03/06 16:06:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.71 2006/08/09 20:53:16 dawes Exp $ */
 /*****************************************************************
  *  Stuff to create connections --- OS dependent
  *
@@ -471,15 +471,14 @@
     struct sockaddr *saddr, int len, 
     unsigned int proto_n, char *auth_proto, int auth_id)
 {
-    char addr[128];
-    char *out = addr;
+    char *prefix = "";
+    char *addr = NULL;
 
     if (!((OsCommPtr)client->osPrivate)->trans_conn) {
-	strcpy(addr, "LBX proxy at ");
-	out += strlen(addr);
+	prefix = "LBX proxy at ";
     }
     if (!len)
-        strcpy(out, "local host");
+	addr = xstrdup("local host");
     else
 	switch (saddr->sa_family)
 	{
@@ -487,11 +486,11 @@
 #if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN)
 	case AF_UNIX:
 #endif
-	    strcpy(out, "local host");
+	    addr = xstrdup("local host");
 	    break;
 #if defined(TCPCONN) || defined(STREAMSCONN) || defined(MNX_TCPCONN)
 	case AF_INET:
-	    sprintf(out, "IP %s",
+	    xasprintf(&addr, "IP %s",
 		inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr));
 	    break;
 #if defined(IPv6) && defined(AF_INET6)
@@ -499,28 +498,33 @@
 	    char ipaddr[INET6_ADDRSTRLEN];
 	    inet_ntop(AF_INET6, &((struct sockaddr_in6 *) saddr)->sin6_addr,
 	      ipaddr, sizeof(ipaddr));
-	    sprintf(out, "IP %s", ipaddr);
+	    xasprintf(&addr, "IP %s", ipaddr);
 	}
 	    break;
 #endif
 #endif
 #ifdef DNETCONN
 	case AF_DECnet:
-	    sprintf(out, "DN %s",
+	    xasprintf(&addr, "DN %s",
 		    dnet_ntoa(&((struct sockaddr_dn *) saddr)->sdn_add));
 	    break;
 #endif
 	default:
-	    strcpy(out, "unknown address");
+	    /* unknown address */
+	    addr = NULL;
 	}
     
     if (proto_n)
-	AuditF("client %d %s from %s\n  Auth name: %.*s ID: %d\n", 
-	       client->index, letin ? "connected" : "rejected", addr,
+	AuditF("client %d %s from %s%s\n  Auth name: %.*s ID: %d\n", 
+	       client->index, letin ? "connected" : "rejected", prefix,
+	       addr ? addr : "unknown address",
 	       (int)proto_n, auth_proto, auth_id);
     else 
-	AuditF("client %d %s from %s\n", 
-	       client->index, letin ? "connected" : "rejected", addr);
+	AuditF("client %d %s from %s%s\n", 
+	       client->index, letin ? "connected" : "rejected", prefix,
+	       addr ? addr : "unknown address");
+    if (addr)
+	xfree(addr);
 }
 
 XID
Index: xc/programs/Xserver/os/log.c
diff -u xc/programs/Xserver/os/log.c:1.14 xc/programs/Xserver/os/log.c:1.17
--- xc/programs/Xserver/os/log.c:1.14	Mon Mar  6 11:06:23 2006
+++ xc/programs/Xserver/os/log.c	Fri Nov  3 16:43:24 2006
@@ -96,14 +96,13 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $XFree86: xc/programs/Xserver/os/log.c,v 1.14 2006/03/06 16:06:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/log.c,v 1.17 2006/11/03 21:43:24 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <stdarg.h>
-#include <stdlib.h>	/* for malloc() */
 #include <errno.h>
 
 #include "site.h"
@@ -171,11 +170,9 @@
     char *logFileName = NULL;
 
     if (fname && *fname) {
-	/* xalloc() can't be used yet. */
-	logFileName = malloc(strlen(fname) + strlen(display) + 1);
+	xasprintf(&logFileName, fname, display);
 	if (!logFileName)
-	    FatalError("Cannot allocate space for the log file name\n");
-	sprintf(logFileName, fname, display);
+	    FatalError("Cannot allocate space for the log file name.\n");
 
 	if (backup && *backup) {
 	    struct stat buf;
@@ -184,14 +181,13 @@
 		char *suffix;
 		char *oldLog;
 
-		oldLog = malloc(strlen(logFileName) + strlen(backup) +
-				strlen(display) + 1);
-		suffix = malloc(strlen(backup) + strlen(display) + 1);
-		if (!oldLog || !suffix)
-		    FatalError("Cannot allocate space for the log file name\n");
-		sprintf(suffix, backup, display);
-		sprintf(oldLog, "%s%s", logFileName, suffix);
-		free(suffix);
+		xasprintf(&suffix, backup, display);
+		if (!suffix)
+		    FatalError("Cannot allocate space for the log file name.\n");
+		xasprintf(&oldLog, "%s%s", logFileName, suffix);
+		if (!oldLog)
+		    FatalError("Cannot allocate space for the log file name.\n");
+		xfree(suffix);
 #ifdef __UNIXOS2__
 		remove(oldLog);
 #endif
@@ -199,7 +195,7 @@
 		    FatalError("Cannot move old log file (\"%s\" to \"%s\"\n",
 			       logFileName, oldLog);
 		}
-		free(oldLog);
+		xfree(oldLog);
 	    }
 	}
 	if ((logFile = fopen(logFileName, "w")) == NULL)
@@ -219,7 +215,7 @@
      * needed.
      */
     if (saveBuffer && bufferSize > 0) {
-	free(saveBuffer);	/* Must be free(), not xfree() */
+	xfree(saveBuffer);
 	saveBuffer = NULL;
 	bufferSize = 0;
     }
@@ -286,19 +282,15 @@
 		    fsync(fileno(logFile));
 	    }
 	} else if (needBuffer) {
-	    /*
-	     * Note, this code is used before OsInit() has been called, so
-	     * xalloc() and friends can't be used.
-	     */
 	    if (len > bufferUnused) {
 		bufferSize += 1024;
 		bufferUnused += 1024;
 		if (saveBuffer)
-		    saveBuffer = realloc(saveBuffer, bufferSize);
+		    saveBuffer = xrealloc(saveBuffer, bufferSize);
 		else
-		    saveBuffer = malloc(bufferSize);
+		    saveBuffer = xalloc(bufferSize);
 		if (!saveBuffer)
-		    FatalError("realloc() failed while saving log messages\n");
+		    FatalError("xrealloc() failed while saving log messages\n");
 	    }
 	    bufferUnused -= len;
 	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);
@@ -321,7 +313,6 @@
 LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
 {
     const char *s  = X_UNKNOWN_STRING;
-    char *tmpBuf = NULL;
 
     /* Ignore verbosity for X_ERROR */
     if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
@@ -368,14 +359,10 @@
 	 * so that LogVWrite() is only called once per message.
 	 */
 	if (s) {
-	    tmpBuf = malloc(strlen(format) + strlen(s) + 1 + 1);
-	    /* Silently return if malloc fails here. */
-	    if (!tmpBuf)
-		return;
-	    sprintf(tmpBuf, "%s ", s);
-	    strcat(tmpBuf, format);
+	    char tmpBuf[4096];
+
+	    snprintf(tmpBuf, sizeof(tmpBuf), "%s %s", s, format);
 	    LogVWrite(verb, tmpBuf, args);
-	    free(tmpBuf);
 	} else
 	    LogVWrite(verb, format, args);
     }
@@ -423,29 +410,29 @@
 	TimerFree(auditTimer);
 	auditTimer = NULL;
     }
+    /* Clear old message. */
+    oldlen = -1;
 }
 
 static char *
 AuditPrefix(void)
 {
     time_t tm;
-    char *autime, *s;
+    char *autime, *a;
+    const char *s;
     char *tmpBuf;
-    int len;
 
     time(&tm);
     autime = ctime(&tm);
-    if ((s = strchr(autime, '\n')))
-	*s = '\0';
+    if ((a = strchr(autime, '\n')))
+	*a = '\0';
     if ((s = strrchr(argvGlobal[0], '/')))
 	s++;
     else
 	s = argvGlobal[0];
-    len = strlen(AUDIT_PREFIX) + strlen(autime) + 10 + strlen(s) + 1;
-    tmpBuf = malloc(len);
+    xasprintf(&tmpBuf, AUDIT_PREFIX, autime, (unsigned long)getpid(), s);
     if (!tmpBuf)
 	return NULL;
-    snprintf(tmpBuf, len, AUDIT_PREFIX, autime, (unsigned long)getpid(), s);
     return tmpBuf;
 }
 
@@ -471,7 +458,7 @@
 	       prefix != NULL ? prefix : "", nrepeat);
 	nrepeat = 0;
 	if (prefix != NULL)
-	    free(prefix);
+	    xfree(prefix);
 	return AUDIT_TIMEOUT;
     } else {
 	/* if the timer expires without anything to print, flush the message */
@@ -505,7 +492,7 @@
 	auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL);
     }
     if (prefix != NULL)
-	free(prefix);
+	xfree(prefix);
 }
 
 void
@@ -585,12 +572,11 @@
     int saveErrno = errno;
 
     if (str) {
-	err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1);
+	xasprintf(&err, "%s: %s", str, strerror(saveErrno));
 	if (!err)
 	    return;
-	sprintf(err, "%s: ", str);
-	strcat(err, strerror(saveErrno));
 	LogWrite(-1, err);
+	xfree(err);
     } else
 	LogWrite(-1, strerror(saveErrno));
 }
Index: xc/programs/Xserver/os/osdep.h
diff -u xc/programs/Xserver/os/osdep.h:3.21 xc/programs/Xserver/os/osdep.h:3.22
--- xc/programs/Xserver/os/osdep.h:3.21	Mon Jan  9 10:00:38 2006
+++ xc/programs/Xserver/os/osdep.h	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.21 2006/01/09 15:00:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.22 2006/09/02 16:44:23 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -310,7 +310,7 @@
 
 /* in xdmcp.c  & xdmauth.c */
 extern void XdmcpUseMsg (void);
-extern int XdmcpOptions(int argc, char **argv, int i);
+extern int XdmcpOptions(int argc, const char **argv, int i);
 extern void XdmcpSetAuthentication (ARRAY8Ptr name);
 extern void XdmcpRegisterConnection (
     int	    type,
@@ -318,7 +318,7 @@
     int	    addrlen);
 extern void XdmcpRegisterAuthorizations (void);
 extern void XdmcpRegisterAuthorization (char *name, int namelen);
-extern void XdmcpRegisterDisplayClass (char *name, int length);
+extern void XdmcpRegisterDisplayClass (const char *name, int length);
 extern void XdmcpInit (void);
 extern void XdmcpReset (void);
 extern void XdmcpOpenDisplay(int sock);
@@ -338,6 +338,6 @@
 struct sockaddr_in;
 extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr);
 
-extern void XdmAuthenticationInit (char *cookie, int cookie_length);
+extern void XdmAuthenticationInit (const char *cookie, int cookie_length);
 
 #endif /* _OSDEP_H_ */
Index: xc/programs/Xserver/os/utils.c
diff -u xc/programs/Xserver/os/utils.c:3.110 xc/programs/Xserver/os/utils.c:3.115
--- xc/programs/Xserver/os/utils.c:3.110	Mon Mar 20 22:56:27 2006
+++ xc/programs/Xserver/os/utils.c	Tue Jan 23 13:03:12 2007
@@ -48,7 +48,7 @@
 OR PERFORMANCE OF THIS SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.110 2006/03/21 03:56:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.115 2007/01/23 18:03:12 tsi Exp $ */
 /*
  * Copyright (c) 1996-2006 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -195,10 +195,8 @@
 extern int SelectWaitTime;
 #endif
 
-#ifdef DEBUG
-#ifndef SPECIAL_MALLOC
-#define MEMBUG
-#endif
+#ifdef SPECIAL_MALLOC
+#undef MEMBUG
 #endif
 
 #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
@@ -215,7 +213,7 @@
 int userdefinedfontpath = 0;
 #endif /* sgi */
 
-char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
+const char *dev_tty_from_init = NULL;	/* since we need to parse it anyway */
 
 extern char dispatchExceptionAtReset;
 
@@ -673,7 +671,7 @@
  * argc or any of the strings pointed to by argv.
  */
 void
-ProcessCommandLine(int argc, char *argv[])
+ProcessCommandLine(const int argc, const char *argv[])
 {
     int i, skip;
 
@@ -1696,7 +1694,7 @@
  */
 
 int
-System(char *command)
+System(const char *command)
 {
     int pid, p;
 #ifdef SIGCHLD
@@ -1744,7 +1742,7 @@
 } *pidlist;
 
 pointer
-Popen(char *command, char *type)
+Popen(const char *command, const char *type)
 {
     struct pid *cur;
     FILE *iop;
@@ -1818,7 +1816,7 @@
 
 /* fopen that drops privileges */
 pointer
-Fopen(char *file, char *type)
+Fopen(const char *file, const char *type)
 {
     FILE *iop;
 #ifndef HAS_SAVED_IDS_AND_SETEUID
@@ -2031,11 +2029,11 @@
       "the \"super user\" (root).\n"
 
 void
-CheckUserParameters(int argc, char **argv, char **envp)
+CheckUserParameters(const int argc, const char **argv, char **envp)
 {
     enum BadCode bad = NotBad;
     int i = 0, j;
-    char *a, *e = NULL;
+    const char *a, *e = NULL;
 #if defined(__QNX__) && !defined(__QNXNTO__)
     char cmd_name[64];
 #endif
@@ -2172,9 +2170,146 @@
  */
 
 #ifdef USE_PAM
+#include <pwd.h>
 #include <security/pam_appl.h>
+#ifndef sun
+#ifdef _OPENPAM
+#include <security/openpam.h>
+#undef   misc_conv
+#define  misc_conv openpam_ttyconv
+#else  /* _OPENPAM */
 #include <security/pam_misc.h>
-#include <pwd.h>
+#endif /* _OPENPAM */
+#else  /* sun */
+
+#include <termio.h>
+
+static volatile int SIGINTed;
+
+static void
+SIGINThandler(int signo)
+{
+    SIGINTed = 1;
+}
+
+/* A conversation function for Solaris */
+static int
+misc_conv(int nummsgs, struct pam_message **pamms, struct pam_response **pamrs,
+	  void *data)
+{
+    struct pam_message *pamm;
+    struct pam_response *pamr;
+    struct termio tty;
+    void (*handler_save)(int);
+    int echo, c;
+    unsigned short flags_save = 0;
+    char input[PAM_MAX_RESP_SIZE + 1], *pchar;
+
+    if ((nummsgs <= 0) || (nummsgs >= PAM_MAX_NUM_MSG)) {
+	ErrorF("PAM authentication error, invalid number of messages:"
+		"  %d, (max %d)\n", nummsgs, PAM_MAX_NUM_MSG);
+	return PAM_CONV_ERR;
+    }
+
+    pamr = xcalloc(nummsgs, sizeof(struct pam_response));
+    if (!pamr) {
+	ErrorF("PAM authentication error, memory allocation failure\n");
+	return PAM_CONV_ERR;
+    }
+
+    *pamrs = pamr;
+    for (pamm = *pamms;  nummsgs > 0;  nummsgs--, pamm++, pamr++) {
+	if (pamm->msg == NULL) {
+	    ErrorF("PAM authentication error, NULL message\n");
+	    break;
+	}
+
+	/* Strip any trailing newline */
+	pchar = pamm->msg + strlen(pamm->msg);
+	if (*pchar == '\n')
+	    *pchar = '\0';
+
+	echo = 0;
+	switch (pamm->msg_style) {
+	default:
+	    ErrorF("PAM authentication error, unknown message type:  %d\n",
+		   pamm->msg_style);
+	    goto fail;
+
+	case PAM_ERROR_MSG:
+	    (void) fputs(pamm->msg, stderr);
+	    (void) fputc('\n', stderr);
+	    break;
+
+	case PAM_TEXT_INFO:
+	    (void) fputs(pamm->msg, stdout);
+	    (void) fputc('\n', stdout);
+	    break;
+
+	case PAM_PROMPT_ECHO_ON:
+	    echo = 1;
+	    /* Fall through */
+
+	case PAM_PROMPT_ECHO_OFF:
+	    (void) fputs(pamm->msg, stderr);
+
+	    SIGINTed = 0;
+	    handler_save = signal(SIGINT, SIGINThandler);
+
+	    if (!echo) {
+		(void) ioctl(fileno(stdin), TCGETA, &tty);
+		flags_save = tty.c_lflag;
+		tty.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
+		(void) ioctl(fileno(stdin), TCSETAF, &tty);
+	    }
+
+	    flockfile(stdin);
+
+	    pchar = input;
+	    while (!SIGINTed &&
+		 ((c = getchar_unlocked()) != '\n') &&
+		 (c != '\r') &&
+		 (c != EOF)) {
+		if (pchar < (input + PAM_MAX_RESP_SIZE))
+		    *pchar++ = c;
+	    }
+	    *pchar = '\0';
+
+	    if (!SIGINTed)
+		pamr->resp = xstrdup(input);
+	    bzero(input, sizeof(input));
+
+	    funlockfile(stdin);
+
+	    if (!echo) {
+		tty.c_lflag = flags_save;
+		(void) ioctl(fileno(stdin), TCSETAW, &tty);
+		(void) fputc('\n', stdout);
+	    }
+
+	    (void) signal(SIGINT, handler_save);
+
+	    if (SIGINTed || !pamr->resp)
+		goto fail;
+	    break;
+	}
+    }
+
+    return PAM_SUCCESS;
+
+fail:
+    for (;  pamr >= *pamrs;  pamr--) {
+	if (pamr->resp) {
+	    bzero(pamr->resp, strlen(pamr->resp));
+	    xfree(pamr->resp);
+	}
+    }
+    xfree(*pamrs);
+    *pamrs = NULL;
+    return PAM_CONV_ERR;
+}
+
+#endif /* sun */
 #endif /* USE_PAM */
 
 void
@@ -2193,7 +2328,8 @@
     if (getuid() != geteuid()) {
 	pw = getpwuid(getuid());
 	if (pw == NULL)
-	    FatalError("getpwuid() failed for uid %d\n", getuid());
+	    FatalError("getpwuid() failed for uid %ld\n",
+			(unsigned long)getuid());
 
 	retval = pam_start("xserver", pw->pw_name, &conv, &pamh);
 	if (retval != PAM_SUCCESS)
@@ -2226,6 +2362,12 @@
     return argcGlobal;
 }
 
+const char **
+getArgvp()
+{
+    return argvGlobal;
+}
+
 const char *
 getArgv(int i)
 {
Index: xc/programs/Xserver/os/xdmauth.c
diff -u xc/programs/Xserver/os/xdmauth.c:1.12 xc/programs/Xserver/os/xdmauth.c:1.13
--- xc/programs/Xserver/os/xdmauth.c:1.12	Fri Oct 14 11:17:26 2005
+++ xc/programs/Xserver/os/xdmauth.c	Sat Sep  2 12:44:23 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.12 2005/10/14 15:17:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.13 2006/09/02 16:44:23 dawes Exp $ */
 /*
 
 Copyright 1988, 1998  The Open Group
@@ -110,7 +110,7 @@
 		 'A' <= c && c <= 'F' ? c - 'A' + 10 : -1)
 
 static int
-HexToBinary (char *in, char *out, int len)
+HexToBinary (const char *in, char *out, int len)
 {
     int	    top, bottom;
 
@@ -133,7 +133,7 @@
 }
 
 void
-XdmAuthenticationInit (char *cookie, int cookie_len)
+XdmAuthenticationInit (const char *cookie, int cookie_len)
 {
     bzero (privateKey.data, 8);
     if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2))
Index: xc/programs/Xserver/os/xdmcp.c
diff -u xc/programs/Xserver/os/xdmcp.c:3.34 xc/programs/Xserver/os/xdmcp.c:3.36
--- xc/programs/Xserver/os/xdmcp.c:3.34	Fri Oct 14 11:17:26 2005
+++ xc/programs/Xserver/os/xdmcp.c	Sat Sep  2 12:44:24 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.34 2005/10/14 15:17:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.36 2006/09/02 16:44:24 dawes Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
  *
@@ -75,7 +75,7 @@
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>
 
-extern char *defaultDisplayClass;
+extern const char *defaultDisplayClass;
 
 static int		    xdmcpSocket, sessionSocket;
 static xdmcp_states	    state;
@@ -94,7 +94,7 @@
 static CARD16		    DisplayNumber;
 static xdmcp_states	    XDM_INIT_STATE = XDM_OFF;
 #ifdef HASXDMAUTH
-static char		    *xdmAuthCookie;
+static const char	    *xdmAuthCookie;
 #endif
 
 static XdmcpBuffer	    buffer;
@@ -191,13 +191,13 @@
 
 static void get_manager_by_name(
     int /*argc*/,
-    char **/*argv*/,
+    const char **/*argv*/,
     int /*i*/);
 
-static void get_fromaddr_by_name(int /*argc*/, char **/*argv*/, int /*i*/);
+static void get_fromaddr_by_name(int /*argc*/, const char **/*argv*/, int /*i*/);
 
 #if defined(IPv6) && defined(AF_INET6)
-static int get_mcast_options(int /*argc*/, char **/*argv*/, int /*i*/);
+static int get_mcast_options(int /*argc*/, const char **/*argv*/, int /*i*/);
 #endif
 
 static void receive_packet(int /*socketfd*/);
@@ -221,7 +221,7 @@
     pointer /*LastSelectMask*/);
 
 void XdmcpRegisterManufacturerDisplayID(
-    char    * /*name*/,
+    const char    * /*name*/,
     int	    /*length*/);
 
 
@@ -249,7 +249,7 @@
 }
 
 int 
-XdmcpOptions(int argc, char **argv, int i)
+XdmcpOptions(int argc, const char **argv, int i)
 {
     if (strcmp(argv[i], "-query") == 0) {
 	get_manager_by_name(argc, argv, i++);
@@ -561,7 +561,7 @@
 ARRAY8	DisplayClass;
 
 void
-XdmcpRegisterDisplayClass (char *name, int length)
+XdmcpRegisterDisplayClass (const char *name, int length)
 {
     int	    i;
 
@@ -579,7 +579,7 @@
 ARRAY8 ManufacturerDisplayID;
 
 void
-XdmcpRegisterManufacturerDisplayID (char *name, int length)
+XdmcpRegisterManufacturerDisplayID (const char *name, int length)
 {
     int	    i;
 
@@ -1494,8 +1494,8 @@
 
 static void
 get_addr_by_name(
-    char *	argtype,
-    char *	namestr,
+    const char *argtype,
+    const char *namestr,
     int		port,
     int		socktype,
     SOCKADDR_TYPE *addr,
@@ -1578,7 +1578,7 @@
 static void
 get_manager_by_name(
     int	    argc,
-    char    **argv,
+    const char    **argv,
     int	    i)
 {
 
@@ -1600,7 +1600,7 @@
 static void
 get_fromaddr_by_name(
     int	    argc,
-    char    **argv,
+    const char    **argv,
     int	    i)
 {
 #if defined(IPv6) && defined(AF_INET6)
@@ -1617,6 +1617,10 @@
       , &ai, &aifirst
 #endif
 	);
+#if defined(IPv6) && defined(AF_INET6)
+    if (aifirst != NULL)
+	freeaddrinfo(aifirst);
+#endif
     xdm_from = argv[i];
 }
 
@@ -1625,9 +1629,9 @@
 static int
 get_mcast_options(argc, argv, i)
     int	    argc, i;
-    char    **argv;
+    const char    **argv;
 {
-    char *address = XDM_DEFAULT_MCAST_ADDR6;
+    const char *address = XDM_DEFAULT_MCAST_ADDR6;
     int hopcount = 1;
     struct addrinfo hints;
     char portstr[6];
Index: xc/programs/Xserver/randr/randr.c
diff -u xc/programs/Xserver/randr/randr.c:1.23 xc/programs/Xserver/randr/randr.c:1.25
--- xc/programs/Xserver/randr/randr.c:1.23	Fri Oct 14 11:17:27 2005
+++ xc/programs/Xserver/randr/randr.c	Mon Apr  9 11:37:19 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.23 2005/10/14 15:17:27 tsi Exp $
+ * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.25 2007/04/09 15:37:19 tsi Exp $
  *
  * Copyright © 2000, Compaq Computer Corporation, 
  * Copyright © 2002, Hewlett Packard, Inc.
@@ -276,7 +276,7 @@
 }
 
 void
-RRExtensionInit (void)
+RRExtensionInit (INITARGS)
 {
     ExtensionEntry *extEntry;
 
@@ -1147,6 +1147,7 @@
     tmp.nRatesInUse = 0;
     tmp.referenced = TRUE;
     tmp.oldReferenced = FALSE;
+    tmp.id = 0;
     for (i = 0; i < pScrPriv->nSizes; i++)
 	if (RRScreenSizeMatches (&tmp, &pScrPriv->pSizes[i]))
 	{
Index: xc/programs/Xserver/randr/randrstr.h
diff -u xc/programs/Xserver/randr/randrstr.h:1.8 xc/programs/Xserver/randr/randrstr.h:1.9
--- xc/programs/Xserver/randr/randrstr.h:1.8	Fri Oct 14 11:17:27 2005
+++ xc/programs/Xserver/randr/randrstr.h	Wed Jan  3 21:48:13 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.8 2005/10/14 15:17:27 tsi Exp $
+ * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.9 2007/01/04 02:48:13 tsi Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation
  *
@@ -25,6 +25,7 @@
 #ifndef _RANDRSTR_H_
 #define _RANDRSTR_H_
 
+#include "extnsionst.h"
 #include <X11/extensions/randr.h>
 
 typedef struct _rrScreenRate {
@@ -85,7 +86,7 @@
 
 /* Initialize the extension */
 void
-RRExtensionInit (void);
+RRExtensionInit (INITARGS);
 
 /*
  * Then, register the specific size with the screen
Index: xc/programs/Xserver/record/record.c
diff -u xc/programs/Xserver/record/record.c:1.14 xc/programs/Xserver/record/record.c:1.15
--- xc/programs/Xserver/record/record.c:1.14	Fri Oct 14 11:17:27 2005
+++ xc/programs/Xserver/record/record.c	Wed Jan  3 21:48:13 2007
@@ -30,7 +30,7 @@
 and Jim Haggerty of Metheus.
 
 */
-/* $XFree86: xc/programs/Xserver/record/record.c,v 1.14 2005/10/14 15:17:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/record/record.c,v 1.15 2007/01/04 02:48:13 tsi Exp $ */
 
 #define NEED_EVENTS
 #include "dixstruct.h"
@@ -2947,7 +2947,7 @@
  *	Enables the RECORD extension if possible.
  */
 void 
-RecordExtensionInit(void)
+RecordExtensionInit(INITARGS)
 {
     ExtensionEntry *extentry;
 
Index: xc/programs/Xserver/record/recordproc.h
diff -u xc/programs/Xserver/record/recordproc.h:1.1 xc/programs/Xserver/record/recordproc.h:1.2
--- xc/programs/Xserver/record/recordproc.h:1.1	Thu Mar 24 21:22:58 2005
+++ xc/programs/Xserver/record/recordproc.h	Wed Jan  3 21:48:13 2007
@@ -1,4 +1,10 @@
-/* $XFree86: xc/programs/Xserver/record/recordproc.h,v 1.1 2005/03/25 02:22:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/record/recordproc.h,v 1.2 2007/01/04 02:48:13 tsi Exp $ */
 
-extern void RecordExtensionInit(void);
+#ifndef _RECORDPROC_H_
+#define _RECORDPROC_H_ 1
 
+#include "extnsionst.h"
+
+extern void RecordExtensionInit(INITARGS);
+
+#endif
Index: xc/programs/Xserver/render/miglyph.c
diff -u xc/programs/Xserver/render/miglyph.c:1.6 xc/programs/Xserver/render/miglyph.c:1.7
--- xc/programs/Xserver/render/miglyph.c:1.6	Mon Dec  4 22:13:31 2000
+++ xc/programs/Xserver/render/miglyph.c	Mon Apr  9 11:37:19 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.7 2007/04/09 15:37:19 tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -107,7 +107,7 @@
     int		n;
     GlyphPtr	glyph;
     int		error;
-    BoxRec	extents;
+    BoxRec	extents = {0, };
     CARD32	component_alpha;
     
     if (maskFormat)
Index: xc/programs/Xserver/render/mitri.c
diff -u xc/programs/Xserver/render/mitri.c:1.6 xc/programs/Xserver/render/mitri.c:1.7
--- xc/programs/Xserver/render/mitri.c:1.6	Mon Aug 12 00:03:21 2002
+++ xc/programs/Xserver/render/mitri.c	Mon Apr  9 11:37:19 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $
+ * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.7 2007/04/09 15:37:19 tsi Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -151,7 +151,7 @@
 	     xTriangle	    *tris)
 {
     ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-    BoxRec		bounds;
+    BoxRec		bounds = {0, };
     PicturePtr		pPicture = 0;
     INT16		xDst, yDst;
     INT16		xRel, yRel;
@@ -218,7 +218,7 @@
 {
     ScreenPtr		pScreen = pDst->pDrawable->pScreen;
     xTriangle		tri;
-    BoxRec		bounds;
+    BoxRec		bounds = {0, };
     PicturePtr		pPicture = 0;
     INT16		xDst, yDst;
     INT16		xRel, yRel;
@@ -289,7 +289,7 @@
 {
     ScreenPtr		pScreen = pDst->pDrawable->pScreen;
     xTriangle		tri;
-    BoxRec		bounds;
+    BoxRec		bounds = {0, };
     PicturePtr		pPicture = 0;
     xPointFixed		*first;
     INT16		xDst, yDst;
Index: xc/programs/Xserver/render/picturestr.h
diff -u xc/programs/Xserver/render/picturestr.h:1.23 xc/programs/Xserver/render/picturestr.h:1.24
--- xc/programs/Xserver/render/picturestr.h:1.23	Wed Jun 30 16:21:46 2004
+++ xc/programs/Xserver/render/picturestr.h	Wed Jan  3 21:48:13 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.23 2004/06/30 20:21:46 martin Exp $
+ * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.24 2007/01/04 02:48:13 tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -29,6 +29,7 @@
 #include "glyphstr.h"
 #include "scrnintstr.h"
 #include "resource.h"
+#include "extnsionst.h"
 
 typedef struct _DirectFormat {
     CARD16	    red, redMask;
@@ -494,7 +495,7 @@
 PictureTransformPoint (PictTransformPtr transform,
 		       PictVectorPtr	vector);
 
-void RenderExtensionInit (void);
+void RenderExtensionInit (INITARGS);
 
 Bool
 AnimCurInit (ScreenPtr pScreen);
Index: xc/programs/Xserver/render/render.c
diff -u xc/programs/Xserver/render/render.c:1.33 xc/programs/Xserver/render/render.c:1.36
--- xc/programs/Xserver/render/render.c:1.33	Fri Oct 14 11:17:27 2005
+++ xc/programs/Xserver/render/render.c	Thu Jun 14 10:30:19 2007
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/render/render.c,v 1.33 2005/10/14 15:17:27 tsi Exp $
+ * $XFree86: xc/programs/Xserver/render/render.c,v 1.36 2007/06/14 14:30:19 tsi Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
@@ -213,7 +213,7 @@
 }
 
 void
-RenderExtensionInit (void)
+RenderExtensionInit (INITARGS)
 {
     ExtensionEntry *extEntry;
 
@@ -1069,11 +1069,14 @@
     }
 
     nglyphs = stuff->nglyphs;
+    if (nglyphs > (CARD32)(-1L) / sizeof(GlyphNewRec))
+	    return BadAlloc;
+
     if (nglyphs <= NLOCALGLYPH)
 	glyphsBase = glyphsLocal;
     else
     {
-	glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
+	glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
 	if (!glyphsBase)
 	    return BadAlloc;
     }
@@ -1131,7 +1134,7 @@
     }
 
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return client->noClientException;
 bail:
     while (glyphs != glyphsBase)
@@ -1140,7 +1143,7 @@
 	xfree (glyphs->glyph);
     }
     if (glyphsBase != glyphsLocal)
-	DEALLOCATE_LOCAL (glyphsBase);
+	Xfree (glyphsBase);
     return err;
 }
 
@@ -1893,6 +1896,8 @@
     REQUEST(xRenderSetPictureClipRectanglesReq);
     swaps(&stuff->length, n);
     swapl(&stuff->picture, n);
+    swaps(&stuff->xOrigin, n);
+    swaps(&stuff->yOrigin, n);
     SwapRestS(stuff);
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
Index: xc/programs/Xserver/xkb/ddxLoad.c
diff -u xc/programs/Xserver/xkb/ddxLoad.c:3.37 xc/programs/Xserver/xkb/ddxLoad.c:3.38
--- xc/programs/Xserver/xkb/ddxLoad.c:3.37	Fri Oct 14 11:17:28 2005
+++ xc/programs/Xserver/xkb/ddxLoad.c	Sat Sep  2 12:44:24 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.37 2005/10/14 15:17:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.38 2006/09/02 16:44:24 dawes Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -369,7 +369,7 @@
 }
 
 FILE *
-XkbDDXOpenConfigFile(char *mapName,char *fileNameRtrn,int fileNameRtrnLen)
+XkbDDXOpenConfigFile(const char *mapName,char *fileNameRtrn,int fileNameRtrnLen)
 {
 char	buf[PATH_MAX],xkm_output_dir[PATH_MAX];
 FILE *	file;
Index: xc/programs/Xserver/xkb/xkb.c
diff -u xc/programs/Xserver/xkb/xkb.c:3.26 xc/programs/Xserver/xkb/xkb.c:3.27
--- xc/programs/Xserver/xkb/xkb.c:3.26	Fri Oct 14 11:17:28 2005
+++ xc/programs/Xserver/xkb/xkb.c	Mon Apr  9 11:37:19 2007
@@ -24,7 +24,7 @@
 
 ********************************************************/
 /*
- * Copyright (c) 2005 by The XFree86 Project, Inc.
+ * Copyright (c) 2005-2007 by The XFree86 Project, Inc.
  * Copyright (c) 2005 by Michal Maruska.
  * All rights reserved.
  *
@@ -71,7 +71,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.26 2005/10/14 15:17:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.27 2007/04/09 15:37:19 tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/X.h>
@@ -3664,7 +3664,7 @@
     XkbNamesRec		*names;
     xkbNamesNotify	 nn;
     CARD32		*tmp;
-    Atom		 bad;
+    Atom		 bad = 0;
 
     REQUEST(xkbSetNamesReq);
     REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
Index: xc/programs/Xserver/xkb/xkbActions.c
diff -u xc/programs/Xserver/xkb/xkbActions.c:3.16 xc/programs/Xserver/xkb/xkbActions.c:3.17
--- xc/programs/Xserver/xkb/xkbActions.c:3.16	Fri Oct 14 11:17:28 2005
+++ xc/programs/Xserver/xkb/xkbActions.c	Mon Apr  9 11:37:19 2007
@@ -23,7 +23,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.16 2005/10/14 15:17:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.17 2007/04/09 15:37:19 tsi Exp $ */
 
 #include <stdio.h>
 #include <math.h>
@@ -830,6 +830,8 @@
     ev.u.keyButtonPointer.rootX = x;
     ev.u.keyButtonPointer.rootY = y;
 
+    (void) memset(&old, 0, sizeof(old));
+
     if (filter->keycode==0) {		/* initial press */
 	if ((pAction->redirect.new_key<xkbi->desc->min_key_code)||
 	    (pAction->redirect.new_key>xkbi->desc->max_key_code)) {
Index: xc/programs/Xserver/xkb/xkbEvents.c
diff -u xc/programs/Xserver/xkb/xkbEvents.c:3.14 xc/programs/Xserver/xkb/xkbEvents.c:3.15
--- xc/programs/Xserver/xkb/xkbEvents.c:3.14	Fri Oct 14 11:17:28 2005
+++ xc/programs/Xserver/xkb/xkbEvents.c	Sun Dec 10 10:58:33 2006
@@ -23,7 +23,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.14 2005/10/14 15:17:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.15 2006/12/10 15:58:33 tsi Exp $ */
 
 #include <stdio.h>
 #define NEED_EVENTS 1
@@ -809,8 +809,9 @@
 		((xE[0].u.u.type==KeyPress)||(xE[0].u.u.type==KeyRelease))) {
 	    ErrorF("XKbFilterWriteEvents:\n");
 	    ErrorF("   Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state);
-	    ErrorF("   XkbLastRepeatEvent!=xE (0x%x!=0x%x) %s\n",
-			XkbLastRepeatEvent,xE,
+	    ErrorF("   XkbLastRepeatEvent!=xE (0x%lx!=0x%lx) %s\n",
+			(unsigned long)XkbLastRepeatEvent,
+			(unsigned long)xE,
 			((XkbLastRepeatEvent!=(pointer)xE)?"True":"False"));
 	    ErrorF("   (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n",
 		pClient->xkbClientFlags,
Index: xc/programs/Xserver/xkb/xkbInit.c
diff -u xc/programs/Xserver/xkb/xkbInit.c:3.36 xc/programs/Xserver/xkb/xkbInit.c:3.37
--- xc/programs/Xserver/xkb/xkbInit.c:3.36	Fri Oct 14 11:17:28 2005
+++ xc/programs/Xserver/xkb/xkbInit.c	Sat Sep  2 12:44:24 2006
@@ -23,7 +23,7 @@
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.36 2005/10/14 15:17:28 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.37 2006/09/02 16:44:24 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -112,11 +112,11 @@
 #define	XKB_DFLT_RULES_PROP	True
 #endif
 
-char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
+const char	*	XkbBaseDirectory=	XKB_BASE_DIRECTORY;
 char	*		XkbInitialMap=		NULL;
 int	 		XkbWantAccessX=		0;	
 static XkbFileInfo *	_XkbInitFileInfo=	NULL;
-char *			XkbDB=			NULL;
+const char *		XkbDB=			NULL;
 int			XkbAutoLoad=		1;
 
 static Bool		rulesDefined=		False;
@@ -890,7 +890,7 @@
 extern unsigned char	XkbDfltAccessXOptions;
 
 int
-XkbProcessArguments(int argc,char *argv[],int i)
+XkbProcessArguments(int argc,const char *argv[],int i)
 {
     if (strcmp(argv[i],"-kb")==0) {
 	noXkbExtension= True;
@@ -925,7 +925,7 @@
     else if (strncmp(argv[i], "-xkbmap", 7) == 0) {
 	if(++i < argc) {
 	    if (strlen(argv[i]) < PATH_MAX) {
-		XkbInitialMap= argv[i];
+		XkbInitialMap= xstrdup(argv[i]);
 		return 2;
 	    } else {
 		LogMessage(X_ERROR, "-xkbmap pathname too long\n");
Index: xc/programs/bitmap/Bitmap.c
diff -u xc/programs/bitmap/Bitmap.c:1.7 xc/programs/bitmap/Bitmap.c:1.8
--- xc/programs/bitmap/Bitmap.c:1.7	Mon Jan  9 10:00:40 2006
+++ xc/programs/bitmap/Bitmap.c	Mon Apr  9 11:37:19 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.7 2006/01/09 15:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.8 2007/04/09 15:37:19 tsi Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
@@ -1798,7 +1798,7 @@
   }
   
   if (NE(bitmap.size)) {
-    Dimension width, height;
+    Dimension width = 0, height = 0;
     
     if (BWParseSize(newbw->bitmap.size, &width, &height)) { 
       ResizeGrid(newbw, width, height);
Index: xc/programs/bitmap/BitmapP.h
diff -u xc/programs/bitmap/BitmapP.h:1.5 xc/programs/bitmap/BitmapP.h:1.6
--- xc/programs/bitmap/BitmapP.h:1.5	Mon Jan  9 10:00:40 2006
+++ xc/programs/bitmap/BitmapP.h	Sun Dec 10 10:58:33 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.5 2006/01/09 15:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.6 2006/12/10 15:58:33 tsi Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
@@ -36,6 +36,8 @@
 #ifndef _BitmapP_h
 #define _BitmapP_h
 
+#undef DEBUG
+
 #define bit int
 
 #include "Bitmap.h"
Index: xc/programs/editres/editresP.h
diff -u xc/programs/editres/editresP.h:1.8 xc/programs/editres/editresP.h:1.9
--- xc/programs/editres/editresP.h:1.8	Mon Jan  9 10:00:41 2006
+++ xc/programs/editres/editresP.h	Sun Dec 10 10:58:33 2006
@@ -24,11 +24,12 @@
  *
  * Author:  Chris D. Peterson, MIT X Consortium
  */
-/* $XFree86: xc/programs/editres/editresP.h,v 1.8 2006/01/09 15:00:41 dawes Exp $ */
+/* $XFree86: xc/programs/editres/editresP.h,v 1.9 2006/12/10 15:58:33 tsi Exp $ */
 
 #include <X11/Xmu/EditresP.h>
 #include <X11/Xresource.h>
 
+#undef DEBUG
 #define DEBUG
 
 #ifdef DEBUG
Index: xc/programs/fonttosfnt/Imakefile
diff -u xc/programs/fonttosfnt/Imakefile:1.10 xc/programs/fonttosfnt/Imakefile:1.11
--- xc/programs/fonttosfnt/Imakefile:1.10	Fri Oct 14 11:17:30 2005
+++ xc/programs/fonttosfnt/Imakefile	Fri May 18 14:02:00 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/fonttosfnt/Imakefile,v 1.10 2005/10/14 15:17:30 tsi Exp $
+XCOMM $XFree86: xc/programs/fonttosfnt/Imakefile,v 1.11 2007/05/18 18:02:00 tsi Exp $
 
 #if !HasSetenv
     SETENV_SRCS = env.c
@@ -17,7 +17,7 @@
 
 FONTENC_LIBS = -lfontenc
 
-DEFINES  = $(SETENV_DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2 
+DEFINES  = $(SETENV_DEFINES) $(SNPRINTF_DEFINES)
 INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES)
 LOCAL_LIBRARIES = $(FREETYPE2LIB) $(FONTENC_LIBS) GzipLibrary MathLibrary
 
Index: xc/programs/fonttosfnt/util.c
diff -u xc/programs/fonttosfnt/util.c:1.13 xc/programs/fonttosfnt/util.c:1.14
--- xc/programs/fonttosfnt/util.c:1.13	Sun Feb  6 20:01:16 2005
+++ xc/programs/fonttosfnt/util.c	Sat Apr 21 20:37:21 2007
@@ -19,7 +19,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.13 2005/02/07 01:01:16 tsi Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/util.c,v 1.14 2007/04/22 00:37:21 tsi Exp $ */
 
 #include <time.h>
 #include <string.h>
@@ -34,7 +34,6 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include FT_INTERNAL_OBJECTS_H
 #include FT_BDF_H
 #include "X11/Xos.h"
 #include "fonttosfnt.h"
Index: xc/programs/fstobdf/header.c
diff -u xc/programs/fstobdf/header.c:3.8 xc/programs/fstobdf/header.c:3.9
--- xc/programs/fstobdf/header.c:3.8	Mon Jan  9 10:00:42 2006
+++ xc/programs/fstobdf/header.c	Mon Apr  9 11:37:20 2007
@@ -42,7 +42,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/fstobdf/header.c,v 3.8 2006/01/09 15:00:42 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/header.c,v 3.9 2007/04/09 15:37:20 tsi Exp $ */
 
 #include	<stdio.h>
 #include	<X11/Xosdefs.h>
@@ -125,6 +125,7 @@
 	    }
 	}
     }
+    *propValue = 0;
     return (-1);
 }
 
Index: xc/programs/glxgears/Imakefile
diff -u xc/programs/glxgears/Imakefile:1.2 xc/programs/glxgears/Imakefile:1.3
--- xc/programs/glxgears/Imakefile:1.2	Mon Jan  9 10:00:43 2006
+++ xc/programs/glxgears/Imakefile	Sun Jul 23 16:21:12 2006
@@ -1,8 +1,8 @@
-XCOMM $XFree86: xc/programs/glxgears/Imakefile,v 1.2 2006/01/09 15:00:43 dawes Exp $
+XCOMM $XFree86: xc/programs/glxgears/Imakefile,v 1.3 2006/07/23 20:21:12 tsi Exp $
 
 #include <Threads.tmpl>
-        DEPLIBS = $(DEPGLXLIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) 
+        DEPLIBS = $(DEPGLXLIB) $(DEPXXF86VMLIB) $(DEPXLIB)
+LOCAL_LIBRARIES = $(GLXLIB) $(XXF86VMLIB) $(XLIB) 
   SYS_LIBRARIES = MathLibrary
 
 SimpleProgramTarget(glxgears)
Index: xc/programs/glxinfo/Imakefile
diff -u xc/programs/glxinfo/Imakefile:1.8 xc/programs/glxinfo/Imakefile:1.9
--- xc/programs/glxinfo/Imakefile:1.8	Fri Nov 22 17:56:03 2002
+++ xc/programs/glxinfo/Imakefile	Sun Jul 23 16:21:12 2006
@@ -1,17 +1,17 @@
-XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.8 2002/11/22 22:56:03 tsi Exp $
+XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.9 2006/07/23 20:21:12 tsi Exp $
 
 #include <Threads.tmpl>
 
 #if BuildGLULibrary
 
-        DEPLIBS = $(DEPGLULIB) $(DEPGLXLIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XLIB) 
+        DEPLIBS = $(DEPGLULIB) $(DEPGLXLIB) $(DEPXXF86VMLIB) $(DEPXLIB)
+LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XXF86VMLIB) $(XLIB) 
         DEFINES = -DDO_GLU
 
 #else
 
-        DEPLIBS = $(DEPGLXLIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) 
+        DEPLIBS = $(DEPGLXLIB) $(DEPXXF86VMLIB) $(DEPXLIB)
+LOCAL_LIBRARIES = $(GLXLIB) $(XXF86VMLIB) $(XLIB) 
 
 #endif
 
Index: xc/programs/ico/ico.c
diff -u xc/programs/ico/ico.c:1.12 xc/programs/ico/ico.c:1.13
--- xc/programs/ico/ico.c:1.12	Mon Jan  9 10:00:43 2006
+++ xc/programs/ico/ico.c	Sun Dec 10 10:58:33 2006
@@ -45,7 +45,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/ico/ico.c,v 1.12 2006/01/09 15:00:43 dawes Exp $ */
+/* $XFree86: xc/programs/ico/ico.c,v 1.13 2006/12/10 15:58:33 tsi Exp $ */
 
 /******************************************************************************
  * Description
@@ -830,7 +830,7 @@
 #endif
 
 #ifdef DEBUG
-	printf("thread %x starting\n", xthread_self());
+	printf("thread %lx starting\n", (unsigned long)xthread_self());
 #endif
 	closure->cmap = XDefaultColormap(dpy,DefaultScreen(dpy));
 	if (!closure->cmap) {
@@ -906,7 +906,7 @@
 					&wm_delete_window, 1);
 		XMapWindow(dpy, closure->draw_window);
 #ifdef DEBUG
-		printf("thread %x waiting for Expose\n", xthread_self());
+		printf("thread %lx waiting for Expose\n", (unsigned long)xthread_self());
 #endif
 		for (;;) {
 		    XNextEvent(dpy, &xev);
@@ -914,7 +914,7 @@
 			break;
 		}
 #ifdef DEBUG
-		printf("thread %x got Expose\n", xthread_self());
+		printf("thread %lx got Expose\n", (unsigned long)xthread_self());
 #endif
 		if (XGetWindowAttributes(dpy,closure->draw_window,&xwa)==0) {
 			icoFatal("cannot get window attributes (size)", NULL);
@@ -1033,7 +1033,7 @@
 		    switch (xev.type) {
 		      case ConfigureNotify:
 #ifdef DEBUG
-			printf("thread %x configure\n", xthread_self());
+			printf("thread %lx configure\n", (unsigned long)xthread_self());
 #endif
 			if (xev.xconfigure.width != closure->winW ||
 			    xev.xconfigure.height != closure->winH)
@@ -1043,7 +1043,7 @@
 			break;
 		      case KeyPress:
 #ifdef DEBUG
-			printf("thread %x keypress\n", xthread_self());
+			printf("thread %lx keypress\n", (unsigned long)xthread_self());
 #endif
 			XLookupString(&xev.xkey, buf, 10, &ksym, NULL);
 			do_it = ((ksym != XK_Q) && ksym != XK_q);
@@ -1051,18 +1051,18 @@
 		      case MapNotify:
 			blocking = False;
 #ifdef DEBUG
-			printf("thread %x unblocking\n", xthread_self());
+			printf("thread %lx unblocking\n", (unsigned long)xthread_self());
 #endif
 			break;
 		      case UnmapNotify:
 			blocking = True;
 #ifdef DEBUG
-			printf("thread %x blocking\n", xthread_self());
+			printf("thread %lx blocking\n", (unsigned long)xthread_self());
 #endif
 			break;
 		      case ClientMessage:
 #ifdef DEBUG
-			printf("thread %x message\n", xthread_self());
+			printf("thread %lx message\n", (unsigned long)xthread_self());
 #endif
 			if (xev.xclient.data.l[0] == wm_delete_window)
 			    do_it = False;
Index: xc/programs/lbxproxy/di/pm.c
diff -u xc/programs/lbxproxy/di/pm.c:1.17 xc/programs/lbxproxy/di/pm.c:1.18
--- xc/programs/lbxproxy/di/pm.c:1.17	Mon Jan  9 10:00:45 2006
+++ xc/programs/lbxproxy/di/pm.c	Tue Jun 27 22:31:48 2006
@@ -23,7 +23,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.17 2006/01/09 15:00:45 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.18 2006/06/28 02:31:48 dawes Exp $ */
 
 #include <ctype.h>
 #include <stdio.h>
@@ -389,7 +389,7 @@
 	if (colon)
 	{
 #if defined(IPv6) && defined(AF_INET6)
-	    struct addrinfo *ai, hints;
+	    struct addrinfo *ai = NULL, hints;
 	    Bool bracketed = False;
 	    char canonaddr[INET6_ADDRSTRLEN];
 	    int addrtype = AF_UNSPEC;
Index: xc/programs/lbxproxy/di/utils.c
diff -u xc/programs/lbxproxy/di/utils.c:1.20 xc/programs/lbxproxy/di/utils.c:1.21
--- xc/programs/lbxproxy/di/utils.c:1.20	Mon Jan  9 10:00:45 2006
+++ xc/programs/lbxproxy/di/utils.c	Sun Dec 10 10:58:33 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.20 2006/01/09 15:00:45 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.21 2006/12/10 15:58:33 tsi Exp $ */
 
 #include "lbx.h"
 #include <stdio.h>
@@ -95,10 +95,8 @@
 /*
  * Debug stuff
  */
-#ifdef DEBUG
-#ifndef SPECIAL_MALLOC
-#define MEMBUG
-#endif
+#ifdef SPECIAL_MALLOC
+#undef MEMBUG
 #endif
 
 #ifdef MEMBUG
Index: xc/programs/lbxproxy/di/wire.c
diff -u xc/programs/lbxproxy/di/wire.c:1.18 xc/programs/lbxproxy/di/wire.c:1.19
--- xc/programs/lbxproxy/di/wire.c:1.18	Fri Oct 14 11:17:30 2005
+++ xc/programs/lbxproxy/di/wire.c	Mon Jun 19 09:43:26 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.18 2005/10/14 15:17:30 tsi Exp $ */
+/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.19 2006/06/19 13:43:26 tsi Exp $ */
 /*
 
 Copyright 1998  The Open Group
@@ -1548,7 +1548,8 @@
 	clients[0]->server = server;
 
 #ifdef NEED_UTSNAME
-	uname (&name);
+	if (uname(&name) < 0)
+	    name.nodename[0] = '\0';
 	(void) snprintf(my_host,sizeof(my_host),"%s",name.nodename);
 #else
         (void) gethostname (my_host,sizeof(my_host));
Index: xc/programs/lbxproxy/include/assert.h
diff -u xc/programs/lbxproxy/include/assert.h:1.2 xc/programs/lbxproxy/include/assert.h:1.3
--- xc/programs/lbxproxy/include/assert.h:1.2	Mon Jan  9 10:00:46 2006
+++ xc/programs/lbxproxy/include/assert.h	Sun Dec 10 10:58:33 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/lbxproxy/include/assert.h,v 1.2 2006/01/09 15:00:46 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/assert.h,v 1.3 2006/12/10 15:58:33 tsi Exp $ */
 /*
  * Copyright 1994 Network Computing Devices, Inc.
  *
@@ -21,8 +21,13 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * 
  */
+
+#ifndef _LBX_ASSERT_H_
+#define _LBX_ASSERT_H_
+
 #ifdef DEBUG
 #include	<stdio.h>
+#include	<stdlib.h>
 #ifdef SABER
 #define assert(ex)	{if (!(ex)){(void)fprintf(stderr,"Assertion \"ex\" failed: file \"%s\", line %d\n", __FILE__, __LINE__);saber_stop();}}
 #else
@@ -31,3 +36,5 @@
 #else
 #define assert(ex)
 #endif
+
+#endif
Index: xc/programs/lbxproxy/include/lbx.h
diff -u xc/programs/lbxproxy/include/lbx.h:1.9 xc/programs/lbxproxy/include/lbx.h:1.10
--- xc/programs/lbxproxy/include/lbx.h:1.9	Fri Oct 14 11:17:30 2005
+++ xc/programs/lbxproxy/include/lbx.h	Sun Dec 10 10:58:33 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.9 2005/10/14 15:17:30 tsi Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.10 2006/12/10 15:58:33 tsi Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -377,8 +377,6 @@
 #define	PROTOCOL_MOST	1		/* cheat on errors */
 #define	PROTOCOL_POOR	2		/* cheat on errors & events */
 
-#undef	DEBUG
-
 #undef	TRACE
 
 /* possible states of request handlers.  some requests are short-circuited
Index: xc/programs/luit/luit.c
diff -u xc/programs/luit/luit.c:1.13 xc/programs/luit/luit.c:1.14
--- xc/programs/luit/luit.c:1.13	Wed Oct 27 19:03:54 2004
+++ xc/programs/luit/luit.c	Mon Apr  9 11:37:20 2007
@@ -19,7 +19,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* $XFree86: xc/programs/luit/luit.c,v 1.13 2004/10/27 23:03:54 dickey Exp $ */
+/* $XFree86: xc/programs/luit/luit.c,v 1.14 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -453,8 +453,8 @@
     int pty;
     int pid;
     char *line;
-    char *path;
-    char **child_argv;
+    char *path = NULL;
+    char **child_argv = NULL;
     int rc;
     int val;
 
Index: xc/programs/mkfontscale/Imakefile
diff -u xc/programs/mkfontscale/Imakefile:1.9 xc/programs/mkfontscale/Imakefile:1.10
--- xc/programs/mkfontscale/Imakefile:1.9	Fri Oct 14 11:17:31 2005
+++ xc/programs/mkfontscale/Imakefile	Fri May 18 14:02:00 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/mkfontscale/Imakefile,v 1.9 2005/10/14 15:17:31 tsi Exp $
+XCOMM $XFree86: xc/programs/mkfontscale/Imakefile,v 1.10 2007/05/18 18:02:00 tsi Exp $
 
 LOCAL_LIBRARIES = $(XFONTENCLIB) $(FREETYPE2LIB)
         DEPLIBS = $(DEPXFONTENCLIB) $(DEPFREETYPE2LIB)
@@ -15,7 +15,7 @@
 #endif
 
 INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES)
-DEFINES = $(FREETYPE2DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2
+DEFINES = $(FREETYPE2DEFINES) $(SNPRINTF_DEFINES)
 
 ComplexProgramTarget(mkfontscale)
 LinkBuildBinary(ProgramTargetName(mkfontscale))
Index: xc/programs/proxymngr/main.c
diff -u xc/programs/proxymngr/main.c:1.10 xc/programs/proxymngr/main.c:1.11
--- xc/programs/proxymngr/main.c:1.10	Mon Jan  9 10:00:49 2006
+++ xc/programs/proxymngr/main.c	Tue Jun 27 22:31:48 2006
@@ -23,7 +23,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 */
-/* $XFree86: xc/programs/proxymngr/main.c,v 1.10 2006/01/09 15:00:49 dawes Exp $ */
+/* $XFree86: xc/programs/proxymngr/main.c,v 1.11 2006/06/28 02:31:48 dawes Exp $ */
 
 #include <stdlib.h>
 #include "pmint.h"
@@ -516,8 +516,6 @@
 			hints.ai_flags = AI_CANONNAME;
 			if (getaddrinfo(hostname, NULL, &hints, &ai) == 0) {
 			    canonname = ai->ai_canonname;
-			} else {
-			    ai = NULL;
 			}
 		    }
 #else
Index: xc/programs/restest/Imakefile
diff -u /dev/null xc/programs/restest/Imakefile:1.1
--- /dev/null	Sun Aug 12 22:03:47 2007
+++ xc/programs/restest/Imakefile	Tue Apr  3 10:10:02 2007
@@ -0,0 +1,12 @@
+XCOMM $XFree86: xc/programs/restest/Imakefile,v 1.1 2007/04/03 14:10:02 tsi Exp $
+
+        DEPLIBS = $(DEPXRESLIB) $(DEPXLIB)
+LOCAL_LIBRARIES = $(XRESLIB) $(XLIB)
+           SRCS = restest.c
+           OBJS = restest.o
+
+AllTarget(ProgramTargetName(restest))
+
+NormalProgramTarget(restest,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
+InstallProgram(restest,$(BINDIR))
+DependTarget()
Index: xc/programs/restest/restest.c
diff -u /dev/null xc/programs/restest/restest.c:1.1
--- /dev/null	Sun Aug 12 22:03:47 2007
+++ xc/programs/restest/restest.c	Tue Apr  3 10:10:02 2007
@@ -0,0 +1,189 @@
+/* $XFree86: xc/programs/restest/restest.c,v 1.1 2007/04/03 14:10:02 tsi Exp $ */
+/*
+ * Copyright (C) 2007 The XFree86 Project, Inc.
+ *
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * dealin the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1.  Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions, and the following disclaimer.
+ *
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution, and
+ *     in the same place and form as other copyright, license and disclaimer
+ *     information.
+ *
+ * 3.  The end-user documentation included with the redistribution, if any,
+ *     must include the following acknowledgment:  "This product includes
+ *     software developed by The XFree86 Project, Inc (http://www.xfree86.org/)
+ *     and its contributors", in the same place and form as other third-party
+ *     acknowledgments.  Alternately, this acknowledgment may appear in the
+ *     software itself, in the same form and location as other such third-party
+ *     acknowledgments.
+ *
+ * 4.  Except as contained in this notice, the name of The XFree86 Project, Inc
+ *     shall not be used in advertising or otherwise to promote the sale, use
+ *     or other dealings in this Software without prior written authorization
+ *     from The XFree86 Project, Inc.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  LOSS OF USE, DATA,
+ * OR PROFITS;  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Derived from the original implementation by Mark Vojkovich.  Updated to
+ * print the information only after the server has been ungrabbed, to avoid
+ * deadlocks.
+ */
+
+#include <X11/Xlibint.h>
+#include <X11/extensions/XRes.h>
+
+#include <stdio.h>
+
+int
+main(void)
+{
+    Display *xDisplay;
+    XResClient *xClients;
+    Atom pixmap;
+    int error = 1, event_base, error_base, major, minor;
+    int nClients, iClient, iType;
+
+    struct {
+	XResType *xTypes;
+	struct {
+	    char *name;
+	    unsigned long bytes;
+	} *rTypes;
+	int nTypes;
+    } *rClients;
+
+    if ((xDisplay = XOpenDisplay(NULL)) == NULL) {
+	fprintf(stderr, "XOpenDisplay failed.\n");
+	return 1;
+    }
+
+    if (!XResQueryExtension(xDisplay, &event_base, &error_base)) {
+	fprintf(stderr, "XResQueryExtension failed.\n");
+	goto close_display;
+    }
+
+    if (!XResQueryVersion(xDisplay, &major, &minor)) {
+	fprintf(stderr, "XResQueryVersion failed.\n");
+	goto close_display;
+    }
+
+    printf("X-Resource extension version %i.%i.\n", major, minor);
+
+    pixmap = XInternAtom(xDisplay, "PIXMAP", False);
+    if (pixmap == None) {
+	fprintf(stderr, "XInternAtom failed.\n");
+	goto close_display;
+    }
+
+    if (XGrabServer(xDisplay) == False) {
+	fprintf(stderr, "XGrabServer failed.\n");
+	goto close_display;
+    }
+
+    error = 0;
+
+    if ((XResQueryClients(xDisplay, &nClients, &xClients) == False) ||
+	(nClients <= 0)) {
+	rClients = NULL;
+	xClients = NULL;
+	nClients = 0;
+	error = 2;
+    } else if ((rClients = Xcalloc(nClients, sizeof(rClients[0]))) != NULL) {
+	for (iClient = 0;  iClient < nClients;  iClient++) {
+	   if ((XResQueryClientResources(xDisplay,
+					 xClients[iClient].resource_base,
+					 &rClients[iClient].nTypes,
+					 &rClients[iClient].xTypes) == False) ||
+	       (rClients[iClient].nTypes <= 0)) {
+		rClients[iClient].rTypes = NULL;
+		rClients[iClient].xTypes = NULL;
+		rClients[iClient].nTypes = 0;
+		error = 2;
+	    } else if ((rClients[iClient].rTypes =
+			Xcalloc(rClients[iClient].nTypes,
+				sizeof(rClients[iClient].rTypes[0]))) != NULL) {
+		for (iType = 0;  iType < rClients[iClient].nTypes;  iType++) {
+		    rClients[iClient].rTypes[iType].name =
+			XGetAtomName(xDisplay,
+			     rClients[iClient].xTypes[iType].resource_type);
+		    if (rClients[iClient].xTypes[iType].resource_type == pixmap)
+			XResQueryClientPixmapBytes(xDisplay,
+			    xClients[iClient].resource_base,
+			    &rClients[iClient].rTypes[iType].bytes);
+		}
+	    } else {
+		error = 2;
+	    }
+	}
+    } else {
+	error = 2;
+    }
+
+    XUngrabServer(xDisplay);
+
+    printf("There are %i clients.\n", nClients);
+    for (iClient = 0;  iClient < nClients;  iClient++) {
+	printf("Client %i (base 0x%lx, mask 0x%lx)",
+	       iClient, xClients[iClient].resource_base,
+	       xClients[iClient].resource_mask);
+	if (rClients == NULL) {
+	    printf(".\n");
+	} else {
+	    printf(": %i resource types.\n", rClients[iClient].nTypes);
+	    if (rClients[iClient].rTypes != NULL) {
+		for (iType = 0;  iType < rClients[iClient].nTypes;  iType++) {
+		    if (rClients[iClient].rTypes[iType].name != NULL) {
+			printf("   %s:  %u",
+			       rClients[iClient].rTypes[iType].name,
+			       rClients[iClient].xTypes[iType].count);
+			if (rClients[iClient].xTypes[iType].resource_type ==
+			    pixmap)
+			    printf(" (%lu bytes)",
+				   rClients[iClient].rTypes[iType].bytes);
+			printf(".\n");
+			XFree(rClients[iClient].rTypes[iType].name);
+		    }
+		}
+	    }
+
+	    if (rClients[iClient].nTypes > 0) {
+		XFree(rClients[iClient].xTypes);
+		if (rClients[iClient].rTypes != NULL)
+		    XFree(rClients[iClient].rTypes);
+	    }
+	}
+    }
+
+    if (nClients > 0) {
+	XFree(xClients);
+	if (rClients != NULL)
+	    XFree(rClients);
+    }
+
+close_display:
+    XCloseDisplay(xDisplay);
+
+    return error;
+}
Index: xc/programs/twm/add_window.c
diff -u xc/programs/twm/add_window.c:1.15 xc/programs/twm/add_window.c:1.16
--- xc/programs/twm/add_window.c:1.15	Mon Jan  9 10:00:53 2006
+++ xc/programs/twm/add_window.c	Sun Dec 10 10:58:34 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.15 2006/01/09 15:00:53 dawes Exp $ */
+/* $XFree86: xc/programs/twm/add_window.c,v 1.16 2006/12/10 15:58:34 tsi Exp $ */
 /*****************************************************************************/
 /*
 
@@ -179,7 +179,7 @@
     char *name;
 
 #ifdef DEBUG
-    fprintf(stderr, "AddWindow: w = 0x%x\n", w);
+    fprintf(stderr, "AddWindow: w = 0x%lx\n", (unsigned long)w);
 #endif
 
     /* allocate space for the twm window */
Index: xc/programs/twm/session.c
diff -u xc/programs/twm/session.c:3.10 xc/programs/twm/session.c:3.11
--- xc/programs/twm/session.c:3.10	Mon Jan  9 10:00:55 2006
+++ xc/programs/twm/session.c	Mon Apr  9 11:37:20 2007
@@ -24,7 +24,7 @@
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/twm/session.c,v 3.10 2006/01/09 15:00:55 dawes Exp $ */
+/* $XFree86: xc/programs/twm/session.c,v 3.11 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <X11/Xos.h>
 
@@ -548,7 +548,7 @@
     FILE *configFile;
     TWMWinConfigEntry *entry;
     int done = 0;
-    unsigned short version;
+    unsigned short version = 0;
 
     configFile = fopen (filename, "rb");
     if (!configFile)
Index: xc/programs/x11perf/Imakefile
diff -u xc/programs/x11perf/Imakefile:3.13 xc/programs/x11perf/Imakefile:3.14
--- xc/programs/x11perf/Imakefile:3.13	Fri Oct 14 11:17:31 2005
+++ xc/programs/x11perf/Imakefile	Fri May 18 14:02:00 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.13 2005/10/14 15:17:31 tsi Exp $
+XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.14 2007/05/18 18:02:00 tsi Exp $
 
 #ifndef X11perfcompLib
 #define X11perfcompLib $(LIBDIR)/x11perfcomp
@@ -14,7 +14,7 @@
     XRENDERINCS = $(XRENDERINCLUDES)
 #endif
 #if BuildXftLibrary
-        XFTDEFS = -DXFT -DXFREE86_FT2
+        XFTDEFS = -DXFT
         XFTDEPS = XftClientDepLibs
         XFTLIBS = XftClientLibs
         XFTINCS = $(XFTINCLUDES)
Index: xc/programs/xauth/Imakefile
diff -u xc/programs/xauth/Imakefile:3.7 xc/programs/xauth/Imakefile:3.8
--- xc/programs/xauth/Imakefile:3.7	Mon Jan  9 10:00:59 2006
+++ xc/programs/xauth/Imakefile	Mon Apr  2 20:21:14 2007
@@ -1,7 +1,7 @@
-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.7 2006/01/09 15:00:59 dawes Exp $
+XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.8 2007/04/03 00:21:14 tsi Exp $
 
-        DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB)
-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB)
+        DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXAUTHLIB)
+LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) $(XAUTHLIB)
            SRCS = xauth.c gethost.c process.c parsedpy.c
            OBJS = xauth.o gethost.o process.o parsedpy.o
    CONN_DEFINES = $(CONNECTION_FLAGS)
Index: xc/programs/xclock/Clock.c
diff -u xc/programs/xclock/Clock.c:3.29 xc/programs/xclock/Clock.c:3.30
--- xc/programs/xclock/Clock.c:3.29	Mon Jan  9 10:01:01 2006
+++ xc/programs/xclock/Clock.c	Sun Jul  9 23:01:18 2006
@@ -44,7 +44,7 @@
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xclock/Clock.c,v 3.29 2006/01/09 15:01:01 dawes Exp $ */
+/* $XFree86: xc/programs/xclock/Clock.c,v 3.30 2006/07/10 03:01:18 tsi Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/StringDefs.h>
@@ -867,7 +867,7 @@
 RenderHands (ClockWidget w, struct tm *tm, Boolean draw)
 {
     RenderHand (w, tm->tm_hour * 300 + tm->tm_min*5, HOUR_HAND_FRACT, &w->clock.hour_color, draw);
-    RenderHand (w, tm->tm_min * 60 + tm->tm_sec, MINUTE_HAND_FRACT, &w->clock.min_color, draw);
+    RenderHand (w, tm->tm_min * 60 /* + tm->tm_sec */, MINUTE_HAND_FRACT, &w->clock.min_color, draw);
 }
 
 static void
Index: xc/programs/xclock/Imakefile
diff -u xc/programs/xclock/Imakefile:1.10 xc/programs/xclock/Imakefile:1.11
--- xc/programs/xclock/Imakefile:1.10	Fri Oct 14 11:17:31 2005
+++ xc/programs/xclock/Imakefile	Fri May 18 14:02:00 2007
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.10 2005/10/14 15:17:31 tsi Exp $
+XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.11 2007/05/18 18:02:00 tsi Exp $
 
 #ifndef XClockUseRender
 #define XClockUseRender BuildRenderLibrary
 #endif
 
 #if XClockUseRender
-    XRENDERDEFS = -DXRENDER -DXFREE86_FT2
+    XRENDERDEFS = -DXRENDER
     XRENDERDEPS = XftClientDepLibs
     XRENDERLIBS = XftClientLibs MathLibrary
     XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
Index: xc/programs/xditview/Imakefile
diff -u xc/programs/xditview/Imakefile:1.9 xc/programs/xditview/Imakefile:1.10
--- xc/programs/xditview/Imakefile:1.9	Mon Jan  9 10:01:02 2006
+++ xc/programs/xditview/Imakefile	Fri May 18 14:02:00 2007
@@ -1,10 +1,10 @@
-XCOMM $XFree86: xc/programs/xditview/Imakefile,v 1.9 2006/01/09 15:01:02 dawes Exp $
+XCOMM $XFree86: xc/programs/xditview/Imakefile,v 1.10 2007/05/18 18:02:00 tsi Exp $
 
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 #if BuildXftLibrary
     DEPFONTLIBS = XftClientDepLibs
        FONTLIBS = XftClientLibs
-       FONTDEFS = -DUSE_XFT -DXFREE86_FT2
+       FONTDEFS = -DUSE_XFT
       INCLUDES = $(XFTINCLUDES)
 #endif
 #if HasMkstemp
Index: xc/programs/xditview/lex.c
diff -u xc/programs/xditview/lex.c:1.4 xc/programs/xditview/lex.c:1.5
--- xc/programs/xditview/lex.c:1.4	Tue Jul 31 20:45:03 2001
+++ xc/programs/xditview/lex.c	Mon Apr  9 11:37:20 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xditview/lex.c,v 1.4 2001/08/01 00:45:03 tsi Exp $ */
+/* $XFree86: xc/programs/xditview/lex.c,v 1.5 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/IntrinsicP.h>
@@ -31,7 +31,7 @@
 	char	*Buffer;
 	int	Length;
 {
-	int 	i = 0, c;
+	int 	i = 0, c = 0;
 	char	*p = Buffer;
 
 	Length--;			    /* Save room for final NULL */
Index: xc/programs/xdm/Imakefile
diff -u xc/programs/xdm/Imakefile:3.73 xc/programs/xdm/Imakefile:3.74
--- xc/programs/xdm/Imakefile:3.73	Mon Jan  9 10:01:03 2006
+++ xc/programs/xdm/Imakefile	Wed Jan  3 22:33:44 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.73 2006/01/09 15:01:03 dawes Exp $
+XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.74 2007/01/04 03:33:44 tsi Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
@@ -67,8 +67,10 @@
      (defined(LinuxArchitecture) || \
       defined(NetBSDArchitecture) || \
       defined(GNUMachArchitecture)))
+#if !UsePam	/* Don't link with -ldl twice */
     DLLIBRARY = DlLibrary
 #endif
+#endif
 #else
 XPM_DEFINES = -DXPM
 GREETLIBS = $(XINLIBS) $(XPMLIB)
@@ -85,12 +87,6 @@
 #endif
 #endif
 
-/* This is correct for Linux and FreeBSD */
-#if HasPam
-PAM_LIBRARIES = PamLibraries
-PAM_DEFINES = -DUSE_PAM
-#endif
-
 #if HasBSDAuth
 BSDAUTH_DEFINES = -DUSE_BSDAUTH
 #endif
@@ -203,7 +199,7 @@
 DEPLIBS = $(GREETDEPLIBS) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) \
 	  $(DEPXAUTHLIB) $(DEPXDMCPLIB)
 LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) \
-	$(XDMCPLIB) $(RPCLIB) $(PAM_LIBRARIES) $(DLLIBRARY) \
+	$(XDMCPLIB) $(RPCLIB) $(PAMLIBRARIES) $(DLLIBRARY) \
 	$(CRYPT_LIBRARIES) $(KRBIVLIB)
 
           SRCS1 = auth.c daemon.c server.c dpylist.c dm.c error.c file.c \
@@ -258,7 +254,7 @@
         DEFINES = -DBINDIR=\"$(BINDIR)\" -DXDMDIR=\"$(XDMDIR)\" \
 		$(SIGNAL_DEFINES) $(CRYPT_DEFINES) $(BSDAUTH_DEFINES) \
 		$(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) \
-		$(PWD_DEFINES) $(PAM_DEFINES) $(CONN_DEFINES) \
+		$(PWD_DEFINES) $(PAMDEFINES) $(CONN_DEFINES) \
 		$(GREET_DEFINES) $(FRAGILE_DEFINES) $(RANDOM_DEFINES) \
 		-DOSMAJORVERSION=$(OSMAJORVERSION) \
 		-DOSMINORVERSION=$(OSMINORVERSION) \
Index: xc/programs/xdm/access.c
diff -u xc/programs/xdm/access.c:3.17 xc/programs/xdm/access.c:3.18
--- xc/programs/xdm/access.c:3.17	Mon Jan  9 10:01:03 2006
+++ xc/programs/xdm/access.c	Tue Jun 27 22:31:48 2006
@@ -26,7 +26,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdm/access.c,v 3.17 2006/01/09 15:01:03 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/access.c,v 3.18 2006/06/28 02:31:48 dawes Exp $ */
 
 /*
  * Access control for XDMCP - keep a database of allowable display addresses
@@ -308,7 +308,7 @@
 	void *addr=NULL;
 	size_t addr_length=0;
 #if defined(IPv6) && defined(AF_INET6)
-	struct addrinfo *ai;
+	struct addrinfo *ai = NULL;
 #else
 	struct hostent  *hostent = gethostbyname (hostOrAlias);
 #endif	
@@ -344,17 +344,26 @@
 	    Debug ("No such host %s\n", hostOrAlias);
 	    LogError ("Access file \"%s\", host \"%s\" not found\n", accessFile, hostOrAlias);
 	    free ((char *) h);
+#if defined(IPv6) && defined(AF_INET6)
+	    if (ai)
+		freeaddrinfo(ai);
+#endif
 	    goto tryagain;
 	}
 	if (!XdmcpAllocARRAY8 (&h->entry.hostAddress, addr_length))
 	{
 	    LogOutOfMem ("ReadHostEntry\n");
 	    free ((char *) h);
+#if defined(IPv6) && defined(AF_INET6)
+	    if (ai)
+		freeaddrinfo(ai);
+#endif
 	    return NULL;
 	}
 	memmove( h->entry.hostAddress.data, addr, addr_length);
 #if defined(IPv6) && defined(AF_INET6)
-	freeaddrinfo(ai);
+	if (ai)
+	    freeaddrinfo(ai);
 #endif
     }
     return h;
@@ -428,7 +437,7 @@
 	    int addrtype = 0;
 
 #if defined(IPv6) && defined(AF_INET6)
-	    struct addrinfo *ai;
+	    struct addrinfo *ai = NULL;
 
 	    if (getaddrinfo(displayOrAlias, NULL, NULL, &ai) == 0) {
 		addrtype = ai->ai_addr->sa_family;
@@ -455,6 +464,10 @@
 	    {
 		LogError ("Access file %s, display %s unknown\n", accessFile, displayOrAlias);
 		free ((char *) d);
+#if defined(IPv6) && defined(AF_INET6)
+		if (ai)
+		    freeaddrinfo(ai);
+#endif
 		return NULL;
 	    }
 	    d->type = DISPLAY_ADDRESS;
@@ -462,9 +475,17 @@
 	    if (!XdmcpAllocARRAY8 (&display->clientAddress, addr_length))
 	    {
 	    	free ((char *) d);
+#if defined(IPv6) && defined(AF_INET6)
+		if (ai)
+		    freeaddrinfo(ai);
+#endif
 	    	return NULL;
 	    }
 	    memmove( display->clientAddress.data, addr, addr_length);
+#if defined(IPv6) && defined(AF_INET6)
+	    if (ai)
+		freeaddrinfo(ai);
+#endif
 	    switch (addrtype)
 	    {
 #ifdef AF_UNIX
Index: xc/programs/xdm/auth.c
diff -u xc/programs/xdm/auth.c:3.38 xc/programs/xdm/auth.c:3.39
--- xc/programs/xdm/auth.c:3.38	Sun Feb 19 19:14:38 2006
+++ xc/programs/xdm/auth.c	Mon Jun 19 09:43:26 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/auth.c,v 3.38 2006/02/20 00:14:38 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/auth.c,v 3.39 2006/06/19 13:43:26 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -696,7 +696,8 @@
 	struct utsname name;
 
 	tmp_displayname[0] = 0;
-	uname(&name);
+	if (uname(&name) < 0)
+	    name.nodename[0] = '\0';
 	snprintf(tmp_displayname, sizeof(tmp_displayname), "%s", name.nodename);
 	writeAddr (FamilyLocal, strlen (tmp_displayname), tmp_displayname,
        		   file, auth);
@@ -1091,7 +1092,8 @@
      * uname() lets me access to the whole string (it smashes release, you
      * see), whereas gethostname() kindly truncates it for me.
      */
-    uname(&name);
+    if (uname(&name) < 0)
+	name.nodename[0] = '\0';
     hp = gethostbyname (name.nodename);
     if (hp != NULL) {
 	saddr.sa.sa_family = hp->h_addrtype;
Index: xc/programs/xdm/chooser.c
diff -u xc/programs/xdm/chooser.c:3.30 xc/programs/xdm/chooser.c:3.31
--- xc/programs/xdm/chooser.c:3.30	Mon Jan  9 10:01:03 2006
+++ xc/programs/xdm/chooser.c	Tue Jun 27 22:31:48 2006
@@ -25,7 +25,7 @@
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/xdm/chooser.c,v 3.30 2006/01/09 15:01:03 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/chooser.c,v 3.31 2006/06/28 02:31:48 dawes Exp $ */
 
 /*
  * Chooser - display a menu of names and let the user select one
@@ -738,6 +738,7 @@
 			}
 		    }
 		}
+		freeaddrinfo(ai);
 	    }
 	}
 #else
Index: xc/programs/xdm/dm.h
diff -u xc/programs/xdm/dm.h:3.35 xc/programs/xdm/dm.h:3.36
--- xc/programs/xdm/dm.h:3.35	Mon Jan  9 10:01:03 2006
+++ xc/programs/xdm/dm.h	Sun Dec 10 10:58:34 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/dm.h,v 3.35 2006/01/09 15:01:03 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/dm.h,v 3.36 2006/12/10 15:58:34 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -392,6 +392,9 @@
 extern void ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable);
 
 /* in netaddr.c */
+#ifdef DEBUG
+extern void PrintSockAddr (XdmcpNetaddr addr, int len);
+#endif
 extern char *NetaddrAddress(XdmcpNetaddr netaddrp, int *lenp);
 extern char *NetaddrPort(XdmcpNetaddr netaddrp, int *lenp);
 extern int ConvertAddr (XdmcpNetaddr saddr, int *len, char **addr);
Index: xc/programs/xdm/greet.h
diff -u xc/programs/xdm/greet.h:1.11 xc/programs/xdm/greet.h:1.12
--- xc/programs/xdm/greet.h:1.11	Mon Jan  9 10:01:03 2006
+++ xc/programs/xdm/greet.h	Mon Apr  2 20:21:14 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greet.h,v 1.11 2006/01/09 15:01:03 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greet.h,v 1.12 2007/04/03 00:21:14 tsi Exp $ */
 
 /*
  * greet.h - interface to xdm's dynamically-loadable modular greeter
@@ -46,7 +46,10 @@
 #define GETPWNAM_ARGS /*unknown*/
 #endif
 
-#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__osf__)
+#if defined(__FreeBSD__) || \
+    defined(__bsdi__) || \
+    defined(__osf__) || \
+    defined(__DARWIN__)
 #define SETGRENT_TYPE int
 #else
 #define SETGRENT_TYPE void
@@ -154,7 +157,7 @@
 extern	void    (*__xdm_printEnv)(char **e);
 extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
 extern	void    (*__xdm_LogOutOfMem)(char * fmt, ...);
-extern	void    (*__xdm_setgrent)(void);
+extern	SETGRENT_TYPE    (*__xdm_setgrent)(void);
 extern	struct group    *(*__xdm_getgrent)(void);
 extern	void    (*__xdm_endgrent)(void);
 #ifdef USESHADOW
Index: xc/programs/xdm/netaddr.c
diff -u xc/programs/xdm/netaddr.c:3.9 xc/programs/xdm/netaddr.c:3.10
--- xc/programs/xdm/netaddr.c:3.9	Mon Jan  9 10:01:04 2006
+++ xc/programs/xdm/netaddr.c	Sun Dec 10 10:58:34 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/netaddr.c,v 3.9 2006/01/09 15:01:04 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/netaddr.c,v 3.10 2006/12/10 15:58:34 tsi Exp $ */
 
 /*
  * xdm - X display manager
@@ -241,8 +241,9 @@
 #ifdef DEBUG
 /*ARGSUSED*/
 void
-PrintSockAddr (struct sockaddr *a, int len)
+PrintSockAddr (XdmcpNetaddr addr, int len)
 {
+    struct sockaddr *a = (void *)addr;
     unsigned char    *t, *p;
 
     Debug ("family %d, ", a->sa_family);
Index: xc/programs/xdm/protodpy.c
diff -u xc/programs/xdm/protodpy.c:1.6 xc/programs/xdm/protodpy.c:1.7
--- xc/programs/xdm/protodpy.c:1.6	Mon Jan  9 10:01:04 2006
+++ xc/programs/xdm/protodpy.c	Sun Dec 10 10:58:34 2006
@@ -24,7 +24,7 @@
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/xdm/protodpy.c,v 1.6 2006/01/09 15:01:04 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/protodpy.c,v 1.7 2006/12/10 15:58:34 tsi Exp $ */
 
 /*
  * protodpy.c
@@ -46,7 +46,7 @@
 static struct protoDisplay	*protoDisplays;
 
 #ifdef DEBUG
-static
+void 
 PrintProtoDisplay (pdpy)
     struct protoDisplay	*pdpy;
 {
Index: xc/programs/xdm/xdmcp.c
diff -u xc/programs/xdm/xdmcp.c:3.28 xc/programs/xdm/xdmcp.c:3.29
--- xc/programs/xdm/xdmcp.c:3.28	Mon Jan  9 10:01:04 2006
+++ xc/programs/xdm/xdmcp.c	Tue Jun 27 22:31:48 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.28 2006/01/09 15:01:04 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.29 2006/06/28 02:31:48 dawes Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -576,8 +576,11 @@
 	    {
 		if (!strcmp (localhost, hostname))
 		{
-		    if (!getString (name, 10))
-			return 0;
+		    if (!getString (name, 10)) {
+			if (ai)
+			    freeaddrinfo(ai);
+			return NULL;
+		    }
 		    sprintf (name, ":%d", displayNumber);
 		}
 		else
@@ -603,15 +606,21 @@
 			}
 		    }
 
-		    if (!getString (name, strlen (hostname) + 10))
-			return 0;
+		    if (!getString (name, strlen (hostname) + 10)) {
+			if (ai)
+			    freeaddrinfo(ai);
+			return NULL;
+		    }
 		    sprintf (name, "%s:%d", hostname, displayNumber);
 		}
 	    }
 	    else
 	    {
-		if (!getString (name, INET6_ADDRSTRLEN + 10))
-		    return 0;
+		if (!getString (name, INET6_ADDRSTRLEN + 10)) {
+		    if (ai)
+			freeaddrinfo(ai);
+		    return NULL;
+		}
 		if (multiHomed) {
 		    if (connectionType == FamilyInternet) {
 			data = (CARD8 *) 
@@ -624,7 +633,9 @@
 		}
 		if (inet_ntop(type, data, name, INET6_ADDRSTRLEN) == NULL) {
 		    free(name);
-		    return 0;
+		    if (ai)
+			freeaddrinfo(ai);
+		    return NULL;
 		} 
 		sprintf(name + strlen(name), ":%d", displayNumber);
 	    }
@@ -1424,20 +1435,28 @@
 		struct addrinfo	*ai = NULL, *nai;
 		if (getaddrinfo(hostent->h_name, NULL, NULL, &ai) == 0) {
 		    for (nai = ai; nai != NULL; nai = nai->ai_next) {
-			if ((af_type == nai->ai_family) &&
-			  (connectionAddress->length == nai->ai_addrlen) &&
-			  (memcmp(connectionAddress->data,nai->ai_addr,
-			    nai->ai_addrlen) == 0) ) {
+			if ((af_type == nai->ai_family) && (
+			  ((nai->ai_family == AF_INET) &&
+			    (connectionAddress->length == sizeof(struct in_addr)) &&
+			    (memcmp(connectionAddress->data,
+				    &((struct sockaddr_in *)nai->ai_addr)->sin_addr,
+				    connectionAddress->length) == 0)) ||
+			  ((nai->ai_family == AF_INET6) &&
+			    (connectionAddress->length == sizeof(struct in6_addr)) &&
+			    (memcmp(connectionAddress->data,
+				    &((struct sockaddr_in6 *)nai->ai_addr)->sin6_addr,
+				    connectionAddress->length) == 0))))
 			    break;
-			}
 		    }
-		    if (ai == NULL) {
+		    if (nai == NULL) {
 			inet_ntop(af_type, connectionAddress->data, 
 			  dotted, sizeof(dotted));
 
-			LogError("Possible DNS spoof attempt %s->%s.", dotted,
+			LogError("Possible DNS spoof attempt %s->%s.\n", dotted,
 			  hostent->h_name);
 			hostent = NULL;
+		    } else {
+		      local_name = hostent->h_name;
 		    }
 		    freeaddrinfo(ai);
 		} else {
@@ -1448,7 +1467,7 @@
 		if ((hostent = gethostbyname(s))) {
 			if (memcmp((char*)connectionAddress->data, hostent->h_addr,
 			    hostent->h_length) != 0) {
-				LogError("Possible DNS spoof attempt.");
+				LogError("Possible DNS spoof attempt.\n");
 				hostent = NULL; /* so it enters next if() */
 			} else {
 				local_name = hostent->h_name;
Index: xc/programs/xdm/greeter/Imakefile
diff -u xc/programs/xdm/greeter/Imakefile:1.11 xc/programs/xdm/greeter/Imakefile:1.12
--- xc/programs/xdm/greeter/Imakefile:1.11	Mon Jan  9 10:01:06 2006
+++ xc/programs/xdm/greeter/Imakefile	Wed Jan  3 22:33:44 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.11 2006/01/09 15:01:06 dawes Exp $
+XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.12 2007/01/04 03:33:44 tsi Exp $
 
 #define DoNormalLib NO
 #define DoSharedLib YES
@@ -69,10 +69,6 @@
 PWD_DEFINES = -DUSESHADOW
 #endif
 
-#if HasPam
-PAM_DEFINES = -DUSE_PAM
-#endif
-
 #if SystemV4
   GREETER_DEFINES = -DGREET_LIB
 #endif
@@ -81,7 +77,7 @@
 
 INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE)
  DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \
-	   $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) \
+	   $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAMDEFINES) \
 	   $(XKB_CLIENT_DEFINES) $(XPM_DEFINES) $(XINERAMA_DEFINES)
 
 XCOMM Override SHLIBDIR so that shared library is installed in XDMDIR instead
Index: xc/programs/xdm/greeter/greet.c
diff -u xc/programs/xdm/greeter/greet.c:3.18 xc/programs/xdm/greeter/greet.c:3.19
--- xc/programs/xdm/greeter/greet.c:3.18	Mon Jan  9 10:01:06 2006
+++ xc/programs/xdm/greeter/greet.c	Mon Apr  2 20:21:14 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.18 2006/01/09 15:01:06 dawes Exp $ */
+/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.19 2007/04/03 00:21:14 tsi Exp $ */
 
 /*
  * xdm - display manager daemon
@@ -82,7 +82,7 @@
 void    (*__xdm_printEnv)(char **e) = NULL;
 char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
 void    (*__xdm_LogOutOfMem)(char * fmt, ...) = NULL;
-void    (*__xdm_setgrent)(void) = NULL;
+SETGRENT_TYPE    (*__xdm_setgrent)(void) = NULL;
 struct group    *(*__xdm_getgrent)(void) = NULL;
 void    (*__xdm_endgrent)(void) = NULL;
 #ifdef USESHADOW
Index: xc/programs/xedit/lisp/re/re.c
diff -u xc/programs/xedit/lisp/re/re.c:1.9 xc/programs/xedit/lisp/re/re.c:1.10
--- xc/programs/xedit/lisp/re/re.c:1.9	Tue Dec 10 23:44:28 2002
+++ xc/programs/xedit/lisp/re/re.c	Sun Dec 10 10:58:34 2006
@@ -27,11 +27,14 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/re.c,v 1.9 2002/12/11 04:44:28 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/re.c,v 1.10 2006/12/10 15:58:34 tsi Exp $ */
 
 #include <stdio.h>
 #include "rep.h"
+
+#undef DEBUG
 #define DEBUG
+
 /*
  * Types
  */
Index: xc/programs/xf86dga/dga.c
diff -u xc/programs/xf86dga/dga.c:3.20 xc/programs/xf86dga/dga.c:3.21
--- xc/programs/xf86dga/dga.c:3.20	Fri May 31 14:46:11 2002
+++ xc/programs/xf86dga/dga.c	Sun Dec 10 10:58:34 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xf86dga/dga.c,v 3.20 2002/05/31 18:46:11 dawes Exp $ */
+/* $XFree86: xc/programs/xf86dga/dga.c,v 3.21 2006/12/10 15:58:34 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Intrinsic.h>
@@ -148,8 +148,8 @@
 
    banks = (ram * 1024)/bank;
 #ifdef DEBUG
-   fprintf(stderr, "%x ram:%x, addr %x, banks %d\n", True,
-	   ram, addr, banks);
+   fprintf(stderr, "%x ram:%x, addr %lx, banks %d\n", True,
+	   ram, (unsigned long)addr, banks);
 #endif
    while (1) {
       XMotionEvent *mevent = (XMotionEvent *) &event;
@@ -225,7 +225,8 @@
 		memset(addr, buf[0], bank);
 #ifdef DEBUG
    fprintf(stderr, "XF86DGASetVidPage(dis, DefaultScreen(dis), %d);\n",i);
-   fprintf(stderr, "memset(addr:%x, buf[0]:%d, bank:%d);\n",addr,buf[0],bank);
+   fprintf(stderr, "memset(addr:%lx, buf[0]:%d, bank:%d);\n",
+	   (unsigned long)addr,buf[0],bank);
 #endif
 	 }
 	 break;
Index: xc/programs/xfd/Imakefile
diff -u xc/programs/xfd/Imakefile:1.7 xc/programs/xfd/Imakefile:1.8
--- xc/programs/xfd/Imakefile:1.7	Fri Oct 14 11:17:32 2005
+++ xc/programs/xfd/Imakefile	Fri May 18 14:02:00 2007
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.7 2005/10/14 15:17:32 tsi Exp $
+XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.8 2007/05/18 18:02:00 tsi Exp $
 
 #ifndef XFdUseRender
 #define XFdUseRender BuildRenderLibrary
 #endif
 
 #if XFdUseRender
-    XRENDERDEFS = -DXRENDER -DXFREE86_FT2
+    XRENDERDEFS = -DXRENDER
     XRENDERDEPS = XftClientDepLibs
     XRENDERLIBS = XftClientLibs
     XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
Index: xc/programs/xfontsel/xfontsel.c
diff -u xc/programs/xfontsel/xfontsel.c:1.10 xc/programs/xfontsel/xfontsel.c:1.11
--- xc/programs/xfontsel/xfontsel.c:1.10	Mon Jan  9 10:01:09 2006
+++ xc/programs/xfontsel/xfontsel.c	Mon Apr  9 11:37:20 2007
@@ -30,7 +30,7 @@
 	one weekend in November, 1989
 Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
 */
-/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.10 2006/01/09 15:01:09 dawes Exp $ */
+/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.11 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -987,6 +987,7 @@
     register int field = (*fontName == DELIM) ? -1 : 0;
     register Boolean marked_this_field = False;
 
+    *maxField = 0;
     while (*pattern) {
 	if (*pattern == *fontName || *pattern == '?') {
 	    pattern++;
Index: xc/programs/xfs/difs/cache.c
diff -u xc/programs/xfs/difs/cache.c:1.8 xc/programs/xfs/difs/cache.c:1.9
--- xc/programs/xfs/difs/cache.c:1.8	Mon Jan  9 10:01:10 2006
+++ xc/programs/xfs/difs/cache.c	Sun Dec 10 10:58:34 2006
@@ -46,8 +46,9 @@
  * @(#)cache.c	4.2	91/05/02
  *
  */
-/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.8 2006/01/09 15:01:10 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.9 2006/12/10 15:58:34 tsi Exp $ */
 
+#include	<stdlib.h>
 #include	"cachestr.h"
 #include	"misc.h"
 
Index: xc/programs/xfs/difs/charinfo.c
diff -u xc/programs/xfs/difs/charinfo.c:1.13 xc/programs/xfs/difs/charinfo.c:1.14
--- xc/programs/xfs/difs/charinfo.c:1.13	Fri Oct 14 11:17:32 2005
+++ xc/programs/xfs/difs/charinfo.c	Sun Dec 10 10:58:34 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.13 2005/10/14 15:17:32 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.14 2006/12/10 15:58:34 tsi Exp $ */
 /*
  
 Copyright 1990, 1991, 1998  The Open Group
@@ -50,6 +50,7 @@
  * the font library interface as util/fsfuncs.c.
  */
 
+#include <stdlib.h>
 #include <X11/Xos.h>
 #include "misc.h"
 #include <X11/fonts/fontstruct.h>
Index: xc/programs/xfs/difs/difsutils.c
diff -u xc/programs/xfs/difs/difsutils.c:1.9 xc/programs/xfs/difs/difsutils.c:1.10
--- xc/programs/xfs/difs/difsutils.c:1.9	Fri Oct 14 11:17:32 2005
+++ xc/programs/xfs/difs/difsutils.c	Sun Dec 10 10:58:34 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.9 2005/10/14 15:17:32 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.10 2006/12/10 15:58:34 tsi Exp $ */
 /*
  * misc utility routines
  */
@@ -52,6 +52,7 @@
 #include	<difsutils.h>
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<ctype.h>
 #include	"misc.h"
 #include	"globals.h"
Index: xc/programs/xfs/difs/fontinfo.c
diff -u xc/programs/xfs/difs/fontinfo.c:1.12 xc/programs/xfs/difs/fontinfo.c:1.13
--- xc/programs/xfs/difs/fontinfo.c:1.12	Fri Oct 14 11:17:32 2005
+++ xc/programs/xfs/difs/fontinfo.c	Sun Dec 10 10:58:34 2006
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.12 2005/10/14 15:17:32 tsi Exp $ */
+/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.13 2006/12/10 15:58:34 tsi Exp $ */
 /*
  * font data query
  */
@@ -50,6 +50,7 @@
 #include        <X11/fonts/FS.h>
 #include        <X11/fonts/FSproto.h>
 #include        <stdio.h>
+#include        <stdlib.h>
 #include        <X11/Xos.h>
 #include        "clientstr.h"
 #include        "difsfnst.h"
Index: xc/programs/xfs/os/utils.c
diff -u xc/programs/xfs/os/utils.c:3.23 xc/programs/xfs/os/utils.c:3.24
--- xc/programs/xfs/os/utils.c:3.23	Mon Jan  9 10:01:12 2006
+++ xc/programs/xfs/os/utils.c	Sun Dec 10 10:58:34 2006
@@ -45,7 +45,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/utils.c,v 3.23 2006/01/09 15:01:12 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/utils.c,v 3.24 2006/12/10 15:58:34 tsi Exp $ */
 
 #include	<stdio.h>
 #include	<X11/Xos.h>
@@ -106,10 +106,12 @@
 OldListenRec *OldListen = NULL;
 int 	     OldListenCount = 0;
 
+#ifdef DEBUG
 #ifdef STDERR_FILENO
-# define WRITES write(STDERR_FILENO, s, strlen(s))
+# define WRITES(s) write(STDERR_FILENO, s, strlen(s))
 #else
-# define WRITES write(fileno(stderr), s, strlen(s))
+# define WRITES(s) write(fileno(stderr), s, strlen(s))
+#endif
 #endif
 
 static char *pidFile = XFSPIDDIR "/xfs.pid";
Index: xc/programs/xinit/Imakefile
diff -u xc/programs/xinit/Imakefile:3.20 xc/programs/xinit/Imakefile:3.21
--- xc/programs/xinit/Imakefile:3.20	Mon Mar  6 11:06:23 2006
+++ xc/programs/xinit/Imakefile	Wed Jan  3 22:33:44 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.20 2006/03/06 16:06:23 dawes Exp $
+XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.21 2007/01/04 03:33:44 tsi Exp $
 
 #if HasVFork
   VFORK_DEFINES = -DHAS_VFORK
@@ -10,7 +10,7 @@
         DEFFILE = xinit.def
 #endif
         DEFINES = $(CONNECTION_FLAGS) $(VFORK_DEFINES) $(SIGNAL_DEFINES) \
-			-DBINDIR=\"$(BINDIR)\" $(OS_DEFS) -DDONTKILL
+		  $(PAMDEFINES) -DBINDIR=\"$(BINDIR)\" $(OS_DEFS) -DDONTKILL
         DEPLIBS = $(DEPXONLYLIB)
 LOCAL_LIBRARIES = $(XONLYLIB)
           SRCS1 = xinit.c 
Index: xc/programs/xinit/xinit.c
diff -u xc/programs/xinit/xinit.c:3.35 xc/programs/xinit/xinit.c:3.36
--- xc/programs/xinit/xinit.c:3.35	Mon Mar  6 11:06:23 2006
+++ xc/programs/xinit/xinit.c	Wed Jan  3 22:33:44 2007
@@ -23,7 +23,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xinit/xinit.c,v 3.35 2006/03/06 16:06:23 dawes Exp $ */
+/* $XFree86: xc/programs/xinit/xinit.c,v 3.36 2007/01/04 03:33:44 tsi Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
@@ -591,7 +591,11 @@
 		 * if client is xterm -L
 		 */
 #ifndef __UNIXOS2__
-		setpgrp(0,getpid());
+#ifdef USE_PAM
+		(void) signal(SIGHUP, SIG_IGN);
+#else
+		setpgrp(0, getpid());
+#endif
 #endif
 		Execute (server, environ);
 		Error ("no server \"%s\" in PATH\n", server[0]);
Index: xc/programs/xkbcomp/Imakefile
diff -u xc/programs/xkbcomp/Imakefile:3.23 xc/programs/xkbcomp/Imakefile:3.26
--- xc/programs/xkbcomp/Imakefile:3.23	Fri Oct 14 11:17:34 2005
+++ xc/programs/xkbcomp/Imakefile	Wed Apr  4 15:28:39 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xkbcomp/Imakefile,v 3.23 2005/10/14 15:17:34 tsi Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/Imakefile,v 3.26 2007/04/04 19:28:39 tsi Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
@@ -16,8 +16,8 @@
 		 xkbparse.o parseutils.o utils.o
         DEPLIBS = $(DEPXKBFILELIB) $(DEPXONLYLIB)
 LOCAL_LIBRARIES = $(XKBFILELIB) $(XONLYLIB)
-        SUBDIRS = $(CROSS) compat geometry keycodes keymap semantics symbols \
-		  types compiled rules
+        SUBDIRS = compat compiled $(CROSS) geometry keycodes keymap rules \
+		  semantics symbols types
       DATAFILES = README README.config README.enhancing
 
 ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
@@ -46,6 +46,7 @@
 
 LinkBuildBinary(ProgramTargetName(xkbcomp))
 
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
+MakeSubdirs($(CROSS) compat geometry keycodes keymap symbols types)
+#if CrossCompiling
+DependSubdirs($(CROSS))
+#endif
Index: xc/programs/xkbcomp/alias.c
diff -u xc/programs/xkbcomp/alias.c:1.6 xc/programs/xkbcomp/alias.c:1.7
--- xc/programs/xkbcomp/alias.c:1.6	Mon Jan  9 10:01:14 2006
+++ xc/programs/xkbcomp/alias.c	Sun Dec 10 10:58:35 2006
@@ -23,7 +23,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.6 2006/01/09 15:01:14 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.7 2006/12/10 15:58:35 tsi Exp $ */
 
 #include "xkbcomp.h"
 #include "misc.h"
@@ -249,7 +249,8 @@
     }
 #ifdef DEBUG
     if ((a-old)!=(nOld+nNew)) {
-	WSGO2("Expected %d aliases total but created %d\n",nOld+nNew,a-old);
+	WSGO2("Expected %d aliases total but created %ld\n",
+	      nOld+nNew, (unsigned long)(a-old));
     }
 #endif
     if (toGeom)	
Index: xc/programs/xkbcomp/parseutils.c
diff -u xc/programs/xkbcomp/parseutils.c:1.6 xc/programs/xkbcomp/parseutils.c:1.7
--- xc/programs/xkbcomp/parseutils.c:1.6	Mon Jan  9 10:01:15 2006
+++ xc/programs/xkbcomp/parseutils.c	Sun Dec 10 10:58:35 2006
@@ -23,7 +23,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.6 2006/01/09 15:01:15 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.7 2006/12/10 15:58:35 tsi Exp $ */
 
 #define DEBUG_VAR_NOT_LOCAL
 #define	DEBUG_VAR parseDebug
@@ -660,14 +660,14 @@
 void
 PrintStmtAddrs(ParseCommon *stmt)
 {
-    fprintf(stderr,"0x%x",stmt);
+    fprintf(stderr, "0x%lx", (unsigned long)stmt);
     if (stmt) {
 	do {
-	    fprintf(stderr,"->0x%x",stmt->next);
+	    fprintf(stderr, "->0x%lx", (unsigned long)stmt->next);
 	    stmt= stmt->next;
 	} while (stmt);
     }
-    fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
 }
 #endif
 
Index: xc/programs/xkbcomp/xkbparse.y
diff -u xc/programs/xkbcomp/xkbparse.y:3.13 xc/programs/xkbcomp/xkbparse.y:3.14
--- xc/programs/xkbcomp/xkbparse.y:3.13	Mon Jan  9 10:01:16 2006
+++ xc/programs/xkbcomp/xkbparse.y	Tue Oct 31 12:34:15 2006
@@ -23,7 +23,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.13 2006/01/09 15:01:16 dawes Exp $ */
+/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.14 2006/10/31 17:34:15 tsi Exp $ */
 
 %token
 	END_OF_FILE	0
@@ -135,7 +135,7 @@
 	DoodadDef	*doodad;
 	XkbFile		*file;
 }
-%type <ival>	Number Integer Float
+%type <ival>	Number Integer Float SignedNumber
 %type <uval>	XkbCompositeType FileType MergeMode OptMergeMode KeySym
 %type <uval>	DoodadType Flag Flags OptFlags
 %type <str>	KeyName MapName OptMapName
@@ -533,7 +533,7 @@
 			{ $$= $1; }
 		;
 
-Coord		:	OBRACKET Number COMMA Number CBRACKET
+Coord		:	OBRACKET SignedNumber COMMA SignedNumber CBRACKET
 			{
 			    ExprDef *expr;
 			    expr= ExprCreate(ExprCoord,TypeUnknown);
@@ -745,6 +745,12 @@
 			}
 		;
 
+
+SignedNumber	:	MINUS Number	{ $$= -$2; }
+		|	PLUS Number	{ $$= $2; }
+		|	Number		{ $$= $1; }
+		;
+
 Number		:	FLOAT		{ $$= scanInt; }
 		|	INTEGER		{ $$= scanInt*XkbGeomPtsPerMM; }
 		;
Index: xc/programs/xkbcomp/compat/Imakefile
diff -u xc/programs/xkbcomp/compat/Imakefile:3.11 xc/programs/xkbcomp/compat/Imakefile:3.12
--- xc/programs/xkbcomp/compat/Imakefile:3.11	Mon Jan  9 10:01:17 2006
+++ xc/programs/xkbcomp/compat/Imakefile	Fri Dec 29 14:19:56 2006
@@ -1,10 +1,9 @@
-XCOMM $XFree86: xc/programs/xkbcomp/compat/Imakefile,v 3.11 2006/01/09 15:01:17 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/compat/Imakefile,v 3.12 2006/12/29 19:19:56 tsi Exp $
 
-     DATAFILES = README accessx basic complete default group_led iso9995 japan \
-		 keypad misc mousekeys norepeat pc pc98 xtest leds xfree86
+    DATAFILES = README accessx basic complete default group_led iso9995 japan \
+		keypad leds misc mousekeys norepeat pc pc98 xfree86 xtest
 
 all::
 
 MakeXkbDir($(LIBDIR)/xkb,compat)
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/compat)
-DependTarget()
Index: xc/programs/xkbcomp/compiled/Imakefile
diff -u xc/programs/xkbcomp/compiled/Imakefile:1.2 xc/programs/xkbcomp/compiled/Imakefile:1.3
--- xc/programs/xkbcomp/compiled/Imakefile:1.2	Mon Jan  9 10:01:18 2006
+++ xc/programs/xkbcomp/compiled/Imakefile	Fri Dec 29 14:19:56 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/compiled/Imakefile,v 1.2 2006/01/09 15:01:18 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/compiled/Imakefile,v 1.3 2006/12/29 19:19:56 tsi Exp $
 
-     DATAFILES = README
+    DATAFILES = README
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/compiled)
-DependTarget()
Index: xc/programs/xkbcomp/cross/Imakefile
diff -u xc/programs/xkbcomp/cross/Imakefile:1.5 xc/programs/xkbcomp/cross/Imakefile:1.7
--- xc/programs/xkbcomp/cross/Imakefile:1.5	Fri Oct 14 11:17:34 2005
+++ xc/programs/xkbcomp/cross/Imakefile	Fri Dec 29 14:27:16 2006
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xkbcomp/cross/Imakefile,v 1.5 2005/10/14 15:17:34 tsi Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/cross/Imakefile,v 1.7 2006/12/29 19:27:16 tsi Exp $
 
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
@@ -14,8 +14,6 @@
 XCOMM Assumes local libraries installed in /usr/X11R6/lib
 LOCAL_LIBRARIES = -L/usr/X11R6/lib $(XKBFILELIB) $(XONLYLIB)
 
-ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
-
 INCLUDES = -I..
 
 YaccFile(xkbparse,$(YFLAGS))
@@ -43,3 +41,5 @@
 LinkSourceFile(xkbpath.c,..)
 LinkSourceFile(xkbscan.c,..)
 LinkSourceFile(xkbparse.y,..)
+
+DependTarget()
Index: xc/programs/xkbcomp/geometry/Imakefile
diff -u xc/programs/xkbcomp/geometry/Imakefile:3.17 xc/programs/xkbcomp/geometry/Imakefile:3.20
--- xc/programs/xkbcomp/geometry/Imakefile:3.17	Mon Jan  9 10:01:18 2006
+++ xc/programs/xkbcomp/geometry/Imakefile	Mon Feb 19 10:44:32 2007
@@ -1,13 +1,13 @@
-XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.17 2006/01/09 15:01:18 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.20 2007/02/19 15:44:32 tsi Exp $
 
 #define IHaveSubdirs
+#define PassCDebugFlags /**/
 
-     TESTDATA = 
+     TESTDATA =
     DATAFILES = README amiga ataritt chicony dell everex fujitsu hp keytronic \
-		kinesis macintosh microsoft nec northgate pc sony \
-		sun winbook \
-		$(TESTDATA)
-      SUBDIRS = digital ibm sgi
+		kinesis macintosh microsoft nec northgate pc sharp sony sun \
+		winbook $(TESTDATA)
+      SUBDIRS = digital enermax ibm sgi
 
 all::
 
@@ -20,4 +20,3 @@
 	fi
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry)
-DependSubdirs($(SUBDIRS))
Index: xc/programs/xkbcomp/geometry/dell
diff -u xc/programs/xkbcomp/geometry/dell:3.8 xc/programs/xkbcomp/geometry/dell:3.9
--- xc/programs/xkbcomp/geometry/dell:3.8	Mon Jan  9 10:01:18 2006
+++ xc/programs/xkbcomp/geometry/dell	Fri Feb 16 11:39:47 2007
@@ -22,10 +22,10 @@
 //other dealings in this Software without prior written authorization
 //from The Open Group.
 //
-// $XFree86: xc/programs/xkbcomp/geometry/dell,v 3.8 2006/01/09 15:01:18 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/geometry/dell,v 3.9 2007/02/16 16:39:47 tsi Exp $
 //
-default xkb_geometry "dell101" {
 
+default xkb_geometry "dell101" {
     description= "Dell 101";
     width= 470;
     height= 210;
@@ -181,3 +181,209 @@
     alias <AA00> = <LCTL>;
 
 }; // End of "default" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for DELL Inspiron keyboard.
+// Compatible Models: Inspiron 8000
+
+xkb_geometry "intl" {
+    description = "DELL Inspiron 8000 (international layout)";
+    width = 287;
+    height = 150;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "ESC"  { cornerRadius = 1, { [18, 12] }, { [1.5, 0], [16.5, 11] } };
+    shape "FN0"  { cornerRadius = 1, { [16, 12] }, { [1.5, 0], [14.5, 11] } };
+    shape "NORM" { cornerRadius = 1, { [18, 18] }, { [3, 0], [15, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [34, 18] }, { [3, 0], [31, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 18] }, { [3, 0], [24, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [3, 0], [28, 14] } };
+    shape "LFSH" { cornerRadius = 1, { [23, 18] }, { [3, 0], [20, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [48, 18] }, { [3, 0], [45, 14] } };
+
+    shape "SPCE" { cornerRadius = 1, { [92, 18] }, { [3, 0], [89, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [17, 13] }, { [2, 1], [15, 12] } };
+    shape "RTRN" { cornerRadius = 1, { [25, 0], [25, 37], [4, 37], [4, 18],
+                                       [0, 18], [0, 0] },
+                                     { [22, 0], [22, 33], [7, 33],
+				       [7, 14], [3, 14], [3, 0] } };
+
+    shape "KEYS" { cornerRadius = 1,
+                   { [0, 13], [161, 13],
+	             [161, 0], [283, 0], [283, 133], [226, 133],
+	             [226, 124], [0, 124] } };
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 2;
+	top = 5;
+	color = "black";
+    };
+
+    shape "POWER" { cornerRadius = 8, { [16, 16] } };
+    solid "PowerButton" {
+	shape = "POWER";
+	left = 25;
+	top = 1;
+	color = "grey20";
+    };
+
+    shape "POWER1" { cornerRadius = 6, { [12, 12] } };
+    solid "PowerButton1" {
+	shape = "POWER1";
+	left = 27;
+	top = 3;
+	color = "grey10";
+    };
+
+    shape "POWER2" { cornerRadius = 5, { [10, 10] } };
+    solid "PowerButton2" {
+	shape = "POWER2";
+	left = 28;
+	top = 4;
+	color = "grey20";
+    };
+
+    shape "VOL" { cornerRadius = 3, { [6, 6] } };
+    solid "VolumeControlUp" {
+	shape = "VOL";
+	left = 50;
+	top = 2;
+	color = "grey20";
+    };
+    solid "VolumeControlDown" {
+	shape = "VOL";
+	left = 50;
+	top = 10;
+	color = "grey20";
+    };
+
+    shape "VOLBAR" { cornerRadius = 0, { [2, 2] } };
+    solid "VolumeControlMiddle" {
+	shape = "VOLBAR";
+	left = 52;
+	top = 8;
+	color = "grey20";
+    };
+
+    shape "LED"  { cornerRadius = 2, { [3, 3] } };
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "NumLock"     { left = 74; };
+    indicator "CapsLock"    { left = 94; };
+    indicator "ScrollLock"  { left = 114; };
+
+    key.gap = 1;
+    key.color = "grey60";
+
+    section "Function" {
+	left = 2;
+	top = 5;
+	key.shape = "FN0";
+	row {
+	    top = 1;
+            left = 161;
+	    keys {  <MENU>, <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top = 14;
+	    keys {  { <ESC>, "ESC" },
+                    { <FK01>, 3 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 3 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 3 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	left = 2;
+	top = 109;
+	key.shape = "LFSH";
+	row {
+	    top = 1;
+	    keys { { <LCTL>, "TABK" }, { <FN>, "NORM" },
+                   { <LWIN>, "NORM" }, <LALT>,
+		   { <SPCE>, "SPCE" }, { <RALT>, "NORM" },
+                   <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+	top = 5;
+	left = 233;
+        key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 14;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	top = 109;
+	left = 229;
+	key.shape = "ARRS";
+	row {
+	    top = 1;
+	    left = 18;
+	    keys { <UP> };
+	};
+	row {
+	    top = 15;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.color = "grey60";
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+    
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+    solid "Stick" {
+	color = "blue";
+	shape = "STIK";
+	top = 85;
+	left = 126;
+    };
+};
Index: xc/programs/xkbcomp/geometry/sharp
diff -u /dev/null xc/programs/xkbcomp/geometry/sharp:1.1
--- /dev/null	Sun Aug 12 22:04:02 2007
+++ xc/programs/xkbcomp/geometry/sharp	Thu Dec 28 16:08:51 2006
@@ -0,0 +1,159 @@
+// $XFree86: xc/programs/xkbcomp/geometry/sharp,v 1.1 2006/12/28 21:08:51 tsi Exp $
+//
+//Copyright (c) 1996  X Consortium
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and/or sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the X Consortium shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from the X Consortium.
+//
+default xkb_geometry "x68k" {
+
+    description= "Generic X68k";
+    width= 405;
+    height= 172;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 17,18] }, { [2,1], [ 15,17] } };
+    shape "RTRN" { { [ 20,37] }, { [2,1], [ 18,35] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [115,18] }, { [2,1], [113,17] } };
+    shape "FUNC" { { [ 21,18] }, { [2,1], [ 19,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "TABK" { { [ 30,18] }, { [2,1], [ 28,17] } };
+    shape "ARRW" { { [ 35,18] }, { [2,1], [ 33,17] } };
+
+    section.left= 8;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 29;
+	row {
+	    top= 1;
+	    key.shape="FUNC";
+	    keys {  { <BRK>, "NORM" }, { <PRSC>, "NORM", 5 },
+		    { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, 
+		    { <FK11>, 6 }, <FK12>, <FK13>, <FK14>, <FK15>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 54;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="BKSP"}, 
+		   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <BKSL>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", 6 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <LCTL>, <CAPS>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { { <ALGR>, 35 } , <LALT>, { <NFER>, "FUNC" },
+		   { <SPCE>, "SPCE" }, { <XFER>, "FUNC" }
+		   
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 54;
+	left= 281;
+	row {
+	    top= 1;
+	    keys { <INS>, <DELE> };
+	};
+        row {
+	    top= 20;
+	    keys { <PGDN>, <PGUP> };
+	};
+	row {
+	    top= 39;
+	    keys { { <UP>, "ARRW" } };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <RGHT> };
+	};
+	row {
+	    top= 77;
+	    keys { { <DOWN>, "ARRW" } };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 54;
+	left= 320;
+	row {
+	    top= 1;
+	    keys { <HOME>, <HELP>, <KPSU>, <KPDV> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPMU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, <KPEQ> };
+	};
+	row {
+	    top= 77;
+	    keys { <KP0>, <KPSP>, <KPDC>, <KPEN> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "x68k" geometry
Index: xc/programs/xkbcomp/geometry/digital/Imakefile
diff -u xc/programs/xkbcomp/geometry/digital/Imakefile:1.2 xc/programs/xkbcomp/geometry/digital/Imakefile:1.3
--- xc/programs/xkbcomp/geometry/digital/Imakefile:1.2	Mon Jan  9 10:01:19 2006
+++ xc/programs/xkbcomp/geometry/digital/Imakefile	Fri Dec 29 14:19:56 2006
@@ -1,12 +1,11 @@
-XCOMM $XFree86: xc/programs/xkbcomp/geometry/digital/Imakefile,v 1.2 2006/01/09 15:01:19 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/geometry/digital/Imakefile,v 1.3 2006/12/29 19:19:56 tsi Exp $
 
 #undef lk
 #undef pc
 #undef unix
 
-     DATAFILES = lk pc unix
+    DATAFILES = lk pc unix
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry/digital)
-DependTarget()
Index: xc/programs/xkbcomp/geometry/enermax/Imakefile
diff -u /dev/null xc/programs/xkbcomp/geometry/enermax/Imakefile:1.2
--- /dev/null	Sun Aug 12 22:04:02 2007
+++ xc/programs/xkbcomp/geometry/enermax/Imakefile	Wed Feb 21 10:57:24 2007
@@ -0,0 +1,7 @@
+XCOMM $XFree86: xc/programs/xkbcomp/geometry/enermax/Imakefile,v 1.2 2007/02/21 15:57:24 tsi Exp $
+
+    DATAFILES = aurora
+
+all::
+
+InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry/enermax)
Index: xc/programs/xkbcomp/geometry/enermax/aurora
diff -u /dev/null xc/programs/xkbcomp/geometry/enermax/aurora:1.1
--- /dev/null	Sun Aug 12 22:04:02 2007
+++ xc/programs/xkbcomp/geometry/enermax/aurora	Mon Feb 19 10:44:32 2007
@@ -0,0 +1,267 @@
+// $XFree86: xc/programs/xkbcomp/geometry/enermax/aurora,v 1.1 2007/02/19 15:44:32 tsi Exp $
+//
+//Copyright 2007, Alexander Pohoyda
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+
+xkb_geometry "common" {
+    width = 452;
+    height = 172;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape.cornerRadius = 1;
+    shape "FUNC" { { [ 18, 12] }, { [2.5, 0], [15.5, 11] } };
+    shape "NORM" { { [ 18, 18] }, { [2.5, 0], [15.5, 14] } };
+    shape "BKSP" { { [ 38, 18] }, { [2.5, 0], [35.5, 14] } };
+    shape "TABK" { { [ 28, 18] }, { [2.5, 0], [25.5, 14] } };
+    shape "BKSL" { { [ 28, 18] }, { [2.5, 0], [25.5, 14] } };
+    shape "RTRN" { { [ 43, 18] }, { [2.5, 0], [40.5, 14] } };
+    shape "CAPS" { { [ 32, 18] }, { [2.5, 0], [29.5, 14] } };
+    shape "LFSH" { { [ 42, 18] }, { [2.5, 0], [39.5, 14] } };
+    shape "RTSH" { { [ 52, 18] }, { [2.5, 0], [49.5, 14] } };
+    shape "MODK" { { [27.5,18] }, { [2.5, 0], [ 25, 14] } };
+    shape "SMOD" { { [ 23, 18] }, { [2.5, 0], [ 21, 14] } };
+    shape "SPCE" { { [113, 18] }, { [2.5, 0], [111, 14] } };
+    shape "KP0"  { { [ 37, 18] }, { [2.5, 0], [ 35, 14] } };
+    shape "KPAD" { { [ 18, 37] }, { [2.5, 0], [ 16, 35] } };
+
+    // Silver line at the top
+    shape "BAR" { cornerRadius = 0, { [ 452, 4 ] } };
+    solid "Bar" { shape = "BAR"; color = "white"; top = 16; left = 0; };
+
+    // Led indicator group
+    shape "LED" { cornerRadius = 0, { [ 2, 5 ] } };
+    indicator.onColor = "blue";
+    indicator.offColor = "grey80";
+    indicator.top = 14;
+    indicator.shape = "LED";
+    indicator "NumLock"     { left = 385; };
+    indicator "CapsLock"    { left = 403; };
+    indicator "ScrollLock"  { left = 421; };
+    text.top = 22;
+    text.color = "white";
+    text "NumLockLabel"	    { left = 385; text = "1"; };
+    text "CapsLockLabel"    { left = 403; text = "A"; };
+    text "ScrollLockLabel"  { left = 421; text = "V"; };
+
+    shape "ESC" { cornerRadius = 2, { [22, 16] }, { [1, 1], [21, 15] } };
+    solid "Esc" { shape = "ESC"; color = "grey20"; top = 19; left = 11; };
+
+    shape "FGRP4" { cornerRadius = 2, { [79, 16] }, { [1, 1], [78, 15] } };
+    solid "Group1" { shape = "FGRP4"; color = "grey20"; top = 19; left = 49; };
+    solid "Group2" { shape = "FGRP4"; color = "grey20"; top = 19; left = 135; };
+    solid "Group3" { shape = "FGRP4"; color = "grey20"; top = 19; left = 221; };
+    shape "FGRP3" { cornerRadius = 2, { [60, 16] }, { [1, 1], [59, 15] } };
+    solid "Group4" { shape = "FGRP3"; color = "grey20"; top = 19; left = 304; };
+
+    shape "EDT" { cornerRadius = 2, { [60, 41] }, { [1, 1], [59, 40] } };
+    solid "Edit" { shape = "EDT"; color = "grey20"; top = 38; left = 304; };
+
+    shape "ALPH" { cornerRadius = 2, { [289, 98] }, { [1, 1], [288, 97] } };
+    solid "Alph" { shape = "ALPH"; color = "grey20"; top = 38; left = 11; };
+
+    shape "NAV" { cornerRadius = 2, { [0,  19], [19, 19], [19,  0], [41, 0],
+                                      [41, 19], [60, 19], [60, 41], [0, 41] },
+                                    { [1,  20], [20, 20], [20,  1], [40, 1],
+                                      [40, 20], [59, 20], [59, 40], [1, 40] }
+    };
+    solid "Nav" { shape = "NAV"; color = "grey20"; top = 95; left = 304; };
+
+    shape "KPD" { cornerRadius = 2, { [79, 98] }, { [1, 1], [78, 97] } };
+    solid "KeyPad" { shape = "KPD"; color = "grey20"; top = 38; left = 366; };
+
+    key.gap = 1;
+    key.color = "grey80";
+
+    key.shape = "FUNC";
+    section "Function" {
+	left = 12;
+	top = 20;
+	row {
+	    top = 1;
+	    keys {  { <ESC> },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    key.gap = 1;
+    key.shape = "NORM";
+    section "Editing" {
+	top = 39;
+	left = 305;
+	row {
+	    top = 1;
+ 	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top = 58; left = 19;
+	    keys { <UP> };
+	};
+	row {
+	    top = 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    key.gap = 1;
+    key.shape = "NORM";
+    section "Keypad" {
+	top = 39;
+	left = 367;
+	row {
+	    top = 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top = 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+	};
+	row {
+	    top = 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top = 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+	};
+	row {
+	    top = 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+}; // End of "common" geometry
+
+xkb_geometry "us" {
+    include "aurora(common)"
+    description = "Enermax Aurora (US layout, 104 keys)";
+
+    key.gap = 1;
+    key.color = "grey80";
+    key.shape = "NORM";
+    section "Alpha" {
+	left = 12;
+	top = 39;
+	row {
+	    top = 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" }, <AD01>, <AD02>, <AD03>,
+		   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+		   <AD10>, <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+		   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+		   <AC10>, <AC11>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" }, <AB01>, <AB02>, <AB03>,
+		   <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>,
+		   <AB10>, { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top = 77;
+	    key.shape = "SMOD";
+	    keys { { <LCTL>, "MODK" }, { <LWIN>, "NORM" }, { <LALT>, "MODK" },
+		   { <SPCE>, "SPCE" }, <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+}; // End of "us" geometry
+
+xkb_geometry "intl" {
+    include "aurora(common)"
+    description = "Enermax Aurora (international layout, 105 keys)";
+
+    shape "RTRN-I" { cornerRadius = 1,
+                     { [0, 0], [28, 0], [28, 37], [4, 37], [4, 18], [0, 18] },
+                     { [2.5, 0], [25.5, 0], [25.5, 31],
+                       [7, 31], [7, 14], [2.5, 14] } };
+    shape "LFSH-I" { cornerRadius = 1, { [23, 18] }, { [2.5, 0], [20.5, 14] } };
+
+    key.gap = 1;
+    key.color = "grey80";
+    key.shape = "NORM";
+    section "Alpha" {
+	left = 12;
+	top = 39;
+	row {
+	    top = 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" }, <AD01>, <AD02>, <AD03>,
+		   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+		   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN-I" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+		   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+		   <AC10>, <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH-I" }, <LSGT>, <AB01>, <AB02>, <AB03>,
+		   <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>,
+		   <AB10>, { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top = 77;
+	    key.shape = "SMOD";
+	    keys { { <LCTL>, "MODK" }, { <LWIN>, "NORM" }, { <LALT>, "MODK" },
+		   { <SPCE>, "SPCE" }, <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+}; // End of "intl" geometry
Index: xc/programs/xkbcomp/geometry/ibm/Imakefile
diff -u xc/programs/xkbcomp/geometry/ibm/Imakefile:1.1 xc/programs/xkbcomp/geometry/ibm/Imakefile:1.2
--- xc/programs/xkbcomp/geometry/ibm/Imakefile:1.1	Thu May 29 08:41:57 2003
+++ xc/programs/xkbcomp/geometry/ibm/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/geometry/ibm/Imakefile,v 1.1 2003/05/29 12:41:57 pascal Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/geometry/ibm/Imakefile,v 1.2 2006/12/29 19:19:57 tsi Exp $
 
-     DATAFILES = thinkpad
+    DATAFILES = thinkpad
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry/ibm)
-DependTarget()
Index: xc/programs/xkbcomp/geometry/sgi/Imakefile
diff -u xc/programs/xkbcomp/geometry/sgi/Imakefile:1.4 xc/programs/xkbcomp/geometry/sgi/Imakefile:1.5
--- xc/programs/xkbcomp/geometry/sgi/Imakefile:1.4	Mon Jan  9 10:01:20 2006
+++ xc/programs/xkbcomp/geometry/sgi/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/geometry/sgi/Imakefile,v 1.4 2006/01/09 15:01:20 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/geometry/sgi/Imakefile,v 1.5 2006/12/29 19:19:57 tsi Exp $
 
-     DATAFILES = indy indigo O2
+    DATAFILES = indy indigo O2
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/geometry/sgi)
-DependTarget()
Index: xc/programs/xkbcomp/keycodes/Imakefile
diff -u xc/programs/xkbcomp/keycodes/Imakefile:3.17 xc/programs/xkbcomp/keycodes/Imakefile:3.20
--- xc/programs/xkbcomp/keycodes/Imakefile:3.17	Mon Jan  9 10:01:20 2006
+++ xc/programs/xkbcomp/keycodes/Imakefile	Fri Dec 29 14:27:16 2006
@@ -1,13 +1,13 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keycodes/Imakefile,v 3.17 2006/01/09 15:01:20 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keycodes/Imakefile,v 3.20 2006/12/29 19:27:16 tsi Exp $
 
 #define IHaveSubdirs
+#define PassCDebugFlags /**/
 
-    DATAFILES = README amiga ataritt fujitsu hp ibm macintosh sony sun \
-		xfree86 xfree98 powerpcps2 aliases
+    DATAFILES = README aliases amiga ataritt fujitsu hp ibm macintosh \
+		powerpcps2 sony sun x68k xfree86 xfree98
       SUBDIRS = digital sgi
 
 all::
 
 MakeXkbDir($(LIBDIR)/xkb,keycodes)
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keycodes)
-DependSubdirs($(SUBDIRS))
Index: xc/programs/xkbcomp/keycodes/macintosh
diff -u xc/programs/xkbcomp/keycodes/macintosh:1.6 xc/programs/xkbcomp/keycodes/macintosh:1.7
--- xc/programs/xkbcomp/keycodes/macintosh:1.6	Mon Jan  9 10:01:20 2006
+++ xc/programs/xkbcomp/keycodes/macintosh	Thu Dec 28 16:06:29 2006
@@ -25,7 +25,7 @@
 //other dealings in this Software without prior written authorization
 //from the X Consortium.
 //
-// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.6 2006/01/09 15:01:20 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.7 2006/12/28 21:06:29 tsi Exp $
 //
 default xkb_keycodes "macintosh" {
 
@@ -158,3 +158,129 @@
 
     alias <ALGR> = <RALT>;
 };
+
+xkb_keycodes "usb" {
+
+    minimum= 8;
+    maximum= 255;
+
+    <ESC>  =  49;
+    <AE01> =  38;
+    <AE02> =  39;
+    <AE03> =  40;
+    <AE04> =  41;
+    <AE05> =  42;
+    <AE06> =  43;
+    <AE07> =  44;
+    <AE08> =  45;
+    <AE09> =  46;
+    <AE10> =  47;
+    <AE11> =  53;
+    <AE12> =  54;
+    <BKSL> = 145;	// backslash JP only
+    <BKSP> =  50;	// delete
+
+    <TAB>  =  51;
+    <AD01> =  28;
+    <AD02> =  34;
+    <AD03> =  16;
+    <AD04> =  29;
+    <AD05> =  31;
+    <AD06> =  36;
+    <AD07> =  32;
+    <AD08> =  20;
+    <AD09> =  26;
+    <AD10> =  27;
+    <AD11> =  55;
+    <AD12> =  56;
+    <RTRN> =  48;
+
+    <LCTL> = 232;
+    <AC01> =  12;
+    <AC02> =  30;
+    <AC03> =  15;
+    <AC04> =  17;
+    <AC05> =  18;
+    <AC06> =  19;
+    <AC07> =  21;
+    <AC08> =  22;
+    <AC09> =  23;
+    <AC10> =  59;
+    <AC11> =  60;
+    <AC12> =  58;	// JP only
+    <RCTL> = 236;
+
+    <LFSH> = 233;
+    <AB01> =  37;
+    <AB02> =  35;
+    <AB03> =  14;
+    <AB04> =  33;
+    <AB05> =  13;
+    <AB06> =  25;
+    <AB07> =  24;
+    <AB08> =  62;
+    <AB09> =  63;
+    <AB10> =  64;
+    <AB11> = 143;	// JP only
+    <RTSH> = 237;	// Shift_R
+
+    <CAPS> =  65;
+    <LALT> = 234;
+    <LMTA> = 235;
+    <EISU> = 153;	// JP
+    <SPCE> =  52;
+    <KANA> = 152;	// JP
+    <RMTA> = 239;
+    <RALT> = 238;
+
+    <FK01> =  66;
+    <FK02> =  67;
+    <FK03> =  68;
+    <FK04> =  69;
+    <FK05> =  70;
+    <FK06> =  71;
+    <FK07> =  72;
+    <FK08> =  73;
+    <FK09> =  74;
+    <FK10> =  75;
+    <FK11> =  76;
+    <FK12> =  77;
+
+    <HELP> =  81;
+    <HOME> =  82;
+    <PGUP> =  83;
+    <DELE> =  84;
+    <END>  =  85;
+    <PGDN> =  86;
+
+    <UP>   =  90;
+    <LEFT> =  88;
+    <DOWN> =  89;
+    <RGHT> =  87;
+
+    <KPCL> =  91;
+    <KPEQ> = 111;
+    <KPDV> =  92;
+    <KPMU> =  93;
+
+    <KP7>  = 103;
+    <KP8>  = 104;
+    <KP9>  = 105;
+    <KPSU> =  94;
+
+    <KP4>  = 100;
+    <KP5>  = 101;
+    <KP6>  = 102;
+    <KPAD> =  95;
+
+    <KP1>  =  97;
+    <KP2>  =  98;
+    <KP3>  =  99;
+    <KPEN> =  96;
+
+    <KP0>  = 106;
+    <KPSP> = 141;
+    <KPDL> = 107;
+
+    indicator 1 = "Caps Lock";
+};
Index: xc/programs/xkbcomp/keycodes/x68k
diff -u /dev/null xc/programs/xkbcomp/keycodes/x68k:1.1
--- /dev/null	Sun Aug 12 22:04:03 2007
+++ xc/programs/xkbcomp/keycodes/x68k	Thu Dec 28 16:08:51 2006
@@ -0,0 +1,168 @@
+// $XFree86: xc/programs/xkbcomp/keycodes/x68k,v 1.1 2006/12/28 21:08:51 tsi Exp $
+//
+//Copyright (c) 1996  X Consortium
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and/or sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the X Consortium shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from the X Consortium.
+//
+default xkb_keycodes "x68k" {
+
+    minimum= 8;
+    maximum= 122;
+
+    <ESC>  =   8;
+    <AE01> =   9;
+    <AE02> =  10;
+    <AE03> =  11;
+    <AE04> =  12;
+    <AE05> =  13;
+    <AE06> =  14;
+    <AE07> =  15;
+    <AE08> =  16;
+    <AE09> =  17;
+    <AE10> =  18;
+    <AE11> =  19;
+    <AE12> =  20;
+    <BKSL> =  21;
+    <BKSP> =  22;
+
+    <TAB>  =  23;
+    <AD01> =  24;
+    <AD02> =  25;
+    <AD03> =  26;
+    <AD04> =  27;
+    <AD05> =  28;
+    <AD06> =  29;
+    <AD07> =  30;
+    <AD08> =  31;
+    <AD09> =  32;
+    <AD10> =  33;
+    <AD11> =  34;
+    <AD12> =  35;
+    <RTRN> =  36;
+
+    <LCTL> = 120;
+    <AC01> =  37;
+    <AC02> =  38;
+    <AC03> =  39;
+    <AC04> =  40;
+    <AC05> =  41;
+    <AC06> =  42;
+    <AC07> =  43;
+    <AC08> =  44;
+    <AC09> =  45;
+    <AC10> =  46;
+    <AC11> =  47;
+    <AC12> =  48;
+
+    <LFSH> = 119;
+    <AB01> =  49;
+    <AB02> =  50;
+    <AB03> =  51;
+    <AB04> =  52;
+    <AB05> =  53;
+    <AB06> =  54;
+    <AB07> =  55;
+    <AB08> =  56;
+    <AB09> =  57;
+    <AB10> =  58;
+    <AB11> =  59;
+
+    <HIRA> = 102;
+    <XF1>  =  92;
+    <XF2>  =  93;
+    <SPCE> =  60;
+    <XF3>  =  94;
+    <XF4>  =  95;
+    <XF5>  =  96;
+    <ZEN>  = 103;
+
+    <BRK>  = 104;
+    <PRSC> = 105;
+    <FK01> = 106;
+    <FK02> = 107;
+    <FK03> = 108;
+    <FK04> = 109;
+    <FK05> = 110;
+    <FK06> = 111;
+    <FK07> = 112;
+    <FK08> = 113;
+    <FK09> = 114;
+    <FK10> = 115;
+
+    <HOME> =  61;
+    <INS>  = 101;
+    <DELE> =  62;
+    <PGUP> =  63;
+    <PGDN> =  64;
+    <UNDO> =  65;
+    <UP>   =  67;
+    <LEFT> =  66;
+    <RGHT> =  68;
+    <DOWN> =  69;
+    <OPT1> = 121;
+    <OPT2> = 122;
+
+    <KANA> =  97;
+    <ROME> =  98;
+    <CODE> =  99;
+
+    <CAPS> = 100;
+    <KIGO> =  89;
+    <TORK> =  90;
+    <HELP> =  91;
+
+    <CLR>  =  70;
+    <KPDV> =  71;
+    <KPMU> =  72;
+    <KPSU> =  73;
+
+    <KP7>  =  74;
+    <KP8>  =  75;
+    <KP9>  =  76;
+    <KPAD> =  77;
+
+    <KP4>  =  78;
+    <KP5>  =  79;
+    <KP6>  =  80;
+    <KPEQ> =  81;
+
+    <KP1>  =  82;
+    <KP2>  =  83;
+    <KP3>  =  84;
+    <KPEN> =  85;
+
+    <KP0>  =  86;
+    <KPCM> =  87;
+    <KPPR> =  88;
+
+    indicator 7 = "Zenkaku";
+    indicator 6 = "Hiragana";
+    indicator 5 = "Insert";
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Code Input";
+    indicator 2 = "Romaji";
+    indicator 1 = "Kana";
+};
+
Index: xc/programs/xkbcomp/keycodes/digital/Imakefile
diff -u xc/programs/xkbcomp/keycodes/digital/Imakefile:1.2 xc/programs/xkbcomp/keycodes/digital/Imakefile:1.3
--- xc/programs/xkbcomp/keycodes/digital/Imakefile:1.2	Mon Jan  9 10:01:21 2006
+++ xc/programs/xkbcomp/keycodes/digital/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,11 +1,10 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keycodes/digital/Imakefile,v 1.2 2006/01/09 15:01:21 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keycodes/digital/Imakefile,v 1.3 2006/12/29 19:19:57 tsi Exp $
 
 #undef lk
 #undef pc
 
-     DATAFILES = lk pc 
+    DATAFILES = lk pc
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keycodes/digital)
-DependTarget()
Index: xc/programs/xkbcomp/keycodes/sgi/Imakefile
diff -u xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.3 xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.4
--- xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.3	Mon Jan  9 10:01:21 2006
+++ xc/programs/xkbcomp/keycodes/sgi/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keycodes/sgi/Imakefile,v 3.3 2006/01/09 15:01:21 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keycodes/sgi/Imakefile,v 3.4 2006/12/29 19:19:57 tsi Exp $
 
 #undef indy
 #undef indigo
+#undef iris
 
-     DATAFILES = indy indigo iris
+    DATAFILES = indy indigo iris
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keycodes/sgi)
-DependTarget()
Index: xc/programs/xkbcomp/keymap/Imakefile
diff -u xc/programs/xkbcomp/keymap/Imakefile:3.11 xc/programs/xkbcomp/keymap/Imakefile:3.14
--- xc/programs/xkbcomp/keymap/Imakefile:3.11	Mon Jan  9 10:01:21 2006
+++ xc/programs/xkbcomp/keymap/Imakefile	Fri Dec 29 14:27:16 2006
@@ -1,12 +1,12 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keymap/Imakefile,v 3.11 2006/01/09 15:01:21 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keymap/Imakefile,v 3.14 2006/12/29 19:27:16 tsi Exp $
 
 #define IHaveSubdirs
+#define PassCDebugFlags /**/
 
-     DATAFILES = README amiga ataritt macintosh sony xfree86 xfree98
-       SUBDIRS = digital sgi sun
+    DATAFILES = README amiga ataritt macintosh sony x68k xfree86 xfree98
+      SUBDIRS = digital sgi sun
 
 all::
 
 MakeXkbDir($(LIBDIR)/xkb,keymap)
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keymap)
-DependSubdirs($(SUBDIRS))
Index: xc/programs/xkbcomp/keymap/x68k
diff -u /dev/null xc/programs/xkbcomp/keymap/x68k:1.1
--- /dev/null	Sun Aug 12 22:04:03 2007
+++ xc/programs/xkbcomp/keymap/x68k	Thu Dec 28 16:08:52 2006
@@ -0,0 +1,35 @@
+// $XFree86: xc/programs/xkbcomp/keymap/x68k,v 1.1 2006/12/28 21:08:52 tsi Exp $
+//
+//Copyright (c) 1996  X Consortium
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and/or sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the X Consortium shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from the X Consortium.
+//
+default xkb_keymap "jp" {
+    xkb_keycodes	{ include "x68k"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "sharp/jp(x68k)"	};
+    xkb_geometry	{ include "sharp(x68k)"		};
+};
Index: xc/programs/xkbcomp/keymap/digital/Imakefile
diff -u xc/programs/xkbcomp/keymap/digital/Imakefile:1.2 xc/programs/xkbcomp/keymap/digital/Imakefile:1.3
--- xc/programs/xkbcomp/keymap/digital/Imakefile:1.2	Mon Jan  9 10:01:22 2006
+++ xc/programs/xkbcomp/keymap/digital/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keymap/digital/Imakefile,v 1.2 2006/01/09 15:01:22 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keymap/digital/Imakefile,v 1.3 2006/12/29 19:19:57 tsi Exp $
 
-     DATAFILES = us 
+    DATAFILES = us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keymap/digital)
-DependTarget()
Index: xc/programs/xkbcomp/keymap/sgi/Imakefile
diff -u xc/programs/xkbcomp/keymap/sgi/Imakefile:3.6 xc/programs/xkbcomp/keymap/sgi/Imakefile:3.7
--- xc/programs/xkbcomp/keymap/sgi/Imakefile:3.6	Mon Jan  9 10:01:22 2006
+++ xc/programs/xkbcomp/keymap/sgi/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keymap/sgi/Imakefile,v 3.6 2006/01/09 15:01:22 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keymap/sgi/Imakefile,v 3.7 2006/12/29 19:19:57 tsi Exp $
 
     DATAFILES = be bg ca cz cz_qwerty de de_CH dk dvorak en_US es fi fr fr_CH \
 		gb hu it jp no pl pt ru se sk sk_qwerty th us
@@ -6,4 +6,3 @@
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keymap/sgi)
-DependTarget()
Index: xc/programs/xkbcomp/keymap/sun/Imakefile
diff -u xc/programs/xkbcomp/keymap/sun/Imakefile:3.6 xc/programs/xkbcomp/keymap/sun/Imakefile:3.7
--- xc/programs/xkbcomp/keymap/sun/Imakefile:3.6	Mon Jan  9 10:01:23 2006
+++ xc/programs/xkbcomp/keymap/sun/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/keymap/sun/Imakefile,v 3.6 2006/01/09 15:01:23 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/keymap/sun/Imakefile,v 3.7 2006/12/29 19:19:57 tsi Exp $
 
-     DATAFILES = de es fi fr no pl ru se uk us 
+    DATAFILES = de es fi fr no pl ru se uk us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/keymap/sun)
-DependTarget()
Index: xc/programs/xkbcomp/rules/Imakefile
diff -u xc/programs/xkbcomp/rules/Imakefile:3.6 xc/programs/xkbcomp/rules/Imakefile:3.7
--- xc/programs/xkbcomp/rules/Imakefile:3.6	Mon Jan  9 10:01:24 2006
+++ xc/programs/xkbcomp/rules/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xkbcomp/rules/Imakefile,v 3.6 2006/01/09 15:01:24 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/rules/Imakefile,v 3.7 2006/12/29 19:19:57 tsi Exp $
 
     DATAFILES = README sgi xfree86 sun
     LISTFILES = sgi.lst xfree86.lst xfree86-it.lst sun.lst xfree86.xml
@@ -7,4 +7,3 @@
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/rules)
 InstallMultiple($(LISTFILES),$(LIBDIR)/xkb/rules)
-DependTarget()
Index: xc/programs/xkbcomp/semantics/Imakefile
diff -u xc/programs/xkbcomp/semantics/Imakefile:1.2 xc/programs/xkbcomp/semantics/Imakefile:1.3
--- xc/programs/xkbcomp/semantics/Imakefile:1.2	Mon Jan  9 10:01:24 2006
+++ xc/programs/xkbcomp/semantics/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/semantics/Imakefile,v 1.2 2006/01/09 15:01:24 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/semantics/Imakefile,v 1.3 2006/12/29 19:19:57 tsi Exp $
 
-DATAFILES = basic complete default xtest 
+    DATAFILES = basic complete default xtest
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/semantics)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/Imakefile
diff -u xc/programs/xkbcomp/symbols/Imakefile:3.66 xc/programs/xkbcomp/symbols/Imakefile:3.69
--- xc/programs/xkbcomp/symbols/Imakefile:3.66	Fri Dec 16 20:07:23 2005
+++ xc/programs/xkbcomp/symbols/Imakefile	Fri Dec 29 14:27:16 2006
@@ -1,37 +1,20 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/Imakefile,v 3.66 2005/12/17 01:07:23 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/Imakefile,v 3.69 2006/12/29 19:27:16 tsi Exp $
 
 #define IHaveSubdirs
+#define PassCDebugFlags /**/
 
-      TESTDATA = 
-     DATAFILES = README \
-		 al altwin am ar az \
-		 be ben bg br bs by \
-		 ca ca_enhanced compose ctrl \
-		 czsk cz cz_qwerty \
-		 de de_CH dev dk dvorak dvorak_intl \
-		 ee el en_US es \
-		 fi fo fr fr_CH \
-		 gb ge_la ge_ru group guj gur \
-		 hr hr_US hu hu_US hu_qwerty \
-		 ie il il_phonetic iso9995-3 inet ir is it iu \
-		 jp \
-		 kan keypad ky \
-		 la level3 lo lock lt lt_std lv lat \
-		 ml mk mm mt mt_us \
-		 nl no \
-		 ogham ori \
-		 pc104 pl pl2 pt \
-		 ralt ro ro2 ru \
-		 sapmi se se_FI se_NO se_SE si sk sk_qwerty sr srvr_ctrl \
-		 syr syr_phonetic \
-		 tel th th_tis th_pat tj tml tr tr_f \
-		 ua us us_intl us_group2 us_group3 uz \
-		 vn \
-		 yu \
-		 apple
-
-       SUBDIRS = digital fujitsu hp macintosh nec sgi sony sun xfree68 pc
+     TESTDATA =
+    DATAFILES = README al altwin am apple ar az be ben bg br bs by ca \
+		ca_enhanced compose ctrl czsk cz cz_qwerty de de_CH dev dk \
+		dvorak dvorak_intl ee el en_US es fi fo fr fr_CH gb ge_la \
+		ge_ru group guj gur hr hr_US hu hu_US hu_qwerty ie il \
+		il_phonetic iso9995-3 inet ir is it iu jp kan keypad ky la \
+		level3 lo lock lt lt_std lv lat ml mk mm mt mt_us nl no ogham \
+		ori pc104 pl pl2 pt ralt ro ro2 ru sapmi se se_FI se_NO se_SE \
+		si sk sk_qwerty sr srvr_ctrl syr syr_phonetic tel th th_tis \
+		th_pat tj tml tr tr_f ua us us_intl us_group2 us_group3 uz vn \
+		yu $(TESTDATA)
+      SUBDIRS = digital fujitsu hp macintosh nec pc sgi sharp sony sun xfree68
 
 MakeXkbDir($(LIBDIR)/xkb,symbols)
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols)
-DependSubdirs($(SUBDIRS))
Index: xc/programs/xkbcomp/symbols/digital/Imakefile
diff -u xc/programs/xkbcomp/symbols/digital/Imakefile:1.2 xc/programs/xkbcomp/symbols/digital/Imakefile:1.3
--- xc/programs/xkbcomp/symbols/digital/Imakefile:1.2	Mon Jan  9 10:01:28 2006
+++ xc/programs/xkbcomp/symbols/digital/Imakefile	Fri Dec 29 14:19:57 2006
@@ -1,12 +1,11 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/digital/Imakefile,v 1.2 2006/01/09 15:01:28 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/digital/Imakefile,v 1.3 2006/12/29 19:19:57 tsi Exp $
 
 #undef lk
 #undef pc
 #undef vt
 
-     DATAFILES = lk pc us vt
+    DATAFILES = lk pc us vt
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/digital)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/fujitsu/Imakefile
diff -u xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.2 xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.3
--- xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.2	Mon Jan  9 10:01:28 2006
+++ xc/programs/xkbcomp/symbols/fujitsu/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/fujitsu/Imakefile,v 1.2 2006/01/09 15:01:28 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/fujitsu/Imakefile,v 1.3 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = jp us
+    DATAFILES = jp us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/fujitsu)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/hp/Imakefile
diff -u xc/programs/xkbcomp/symbols/hp/Imakefile:1.3 xc/programs/xkbcomp/symbols/hp/Imakefile:1.4
--- xc/programs/xkbcomp/symbols/hp/Imakefile:1.3	Mon Jan  9 10:01:28 2006
+++ xc/programs/xkbcomp/symbols/hp/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/hp/Imakefile,v 1.3 2006/01/09 15:01:28 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/hp/Imakefile,v 1.4 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = us
+    DATAFILES = us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/hp)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/macintosh/Imakefile
diff -u xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.4 xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.5
--- xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.4	Mon Jan  9 10:01:28 2006
+++ xc/programs/xkbcomp/symbols/macintosh/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.4 2006/01/09 15:01:28 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.5 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us
+    DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/macintosh)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/macintosh/fr
diff -u xc/programs/xkbcomp/symbols/macintosh/fr:1.3 xc/programs/xkbcomp/symbols/macintosh/fr:1.4
--- xc/programs/xkbcomp/symbols/macintosh/fr:1.3	Tue Apr 12 19:27:19 2005
+++ xc/programs/xkbcomp/symbols/macintosh/fr	Mon Jul 10 13:01:30 2006
@@ -1,12 +1,20 @@
-// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr,v 1.3 2005/04/12 23:27:19 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr,v 1.4 2006/07/10 17:01:30 tsi Exp $
 //
 // Marc.Shapiro@inria.fr 19-sep-1998
 // modifications : Etienne Herlent <eherlent@linux-france.org> june 2000
 // adapted to the new input layer :
 //        Martin Costabel <costabel@wanadoo.fr> 3-jan-2001
-// adapted for Latin9 alphabet (ISO-8859-15): 
+// adapted for Latin9 alphabet (ISO-8859-15):
 //        Etienne Herlent <eherlent@linux-france.org> march 2005
-
+//////////////////////////////////////////////////////////////////
+// Petites Modification le juillet 2005 par Bin Zhang <bb.zhang@free.fr> :
+// 1) La ligne 83 : remplacer les deux "VoidSymbol" par oe et OE
+// 2) La ligne 89 : remplacer "VoidSymbol" par "EuroSign"
+// ( 1) et 2) fonctionnent sous UTF-8, mais pas sous iso-8859-1. )
+// 3) Remplacer la ligne 148 par la ligne 149 pour que la touche Alt_L
+// (la touche Apple-Pomme) fonctionne correctement sous Xorg, une idée
+// motivée par http://www.linux-france.org/macintosh/clavier_gentoo.html
+//////////////////////////////////////////////////////////////////
 // This map is an almost-complete mapping of the standard French
 // MacIntosh keyboard under Xwindows.  I tried to remain as faithful
 // as possible to the Mac meaning of each key.	I did this entirely by
@@ -29,19 +37,19 @@
 
     // Alphanumeric section
     key <TLDE> {	[	   at,	  numbersign	],
-			[periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
+			[periodcentered,  Ydiaeresis	]	};
     key <ENTR> {        [    KP_Enter                   ]       };
     key <AE01> {	[   ampersand,	  1		],
 			[  VoidSymbol,	  dead_acute	]	}; // MISSING: Apple
     key <AE02> {	[      eacute,	  2		],
 			[  ediaeresis,	  Eacute	]	};
     key <AE03> {	[    quotedbl,	  3		],
-			[  VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
+			[leftdoublequotemark, rightdoublequotemark	] 	};
     key <AE04> {	[  apostrophe,	  4		],
-			[  VoidSymbol,	  VoidSymbol	] 	};
+			[leftsinglequotemark, rightsinglequotemark	] 	};
     key <AE05> {	[   parenleft,	  5		],
 			[   braceleft,	  bracketleft	]	};
-    key <AE06> {	[     section,	  6		],	// CHECK section
+    key <AE06> {	[     section,	  6		],
 			[   paragraph,	  aring		]	};
     key <AE07> {	[      egrave,	  7		],
 			[guillemotleft,	  guillemotright]	};
@@ -50,11 +58,11 @@
     key <AE09> {	[    ccedilla,	  9		],
 			[    Ccedilla,	  Aacute	]	};
     key <AE10> {	[      agrave,	  0		],
-			[      oslash,	  VoidSymbol	]	}; // MISSING: Oslash
+			[      oslash,	  Oslash	]	};
     key <AE11> {	[  parenright,	  degree	],
 			[  braceright,	  bracketright	]	};
     key <AE12> {	[	minus,	  underscore	],
-			[      emdash,	  endash	]	}; // CHECK dashes
+			[      emdash,	  endash	]	};
     key <BKSP> {	[   BackSpace,    VoidSymbol	],
 			[      Delete,	  VoidSymbol	]	};
 
@@ -68,33 +76,33 @@
     key <AD04> {	[	    r,	R		],
 			[  registered,	currency	]	};
     key <AD05> {	[	    t,	T		],
-			[  VoidSymbol,	VoidSymbol	]	};
+			[      dagger,	trademark	]	};
     key <AD06> {	[	    y,	Y		],
-			[      Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
+			[      Uacute,  Ydiaeresis	]	};
     key <AD07> {	[	    u,	U		],
-			[  VoidSymbol,	ordfeminine	]	}; // MISSING: ordmasculine?
+			[   masculine,	ordfeminine	]	};
     key <AD08> {	[	    i,	I		],
 			[ icircumflex,	idiaeresis	]	};
     key <AD09> {	[	    o,	O		],
-			[          oe,	OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
+			[          oe,	OE      	]	};
     key <AD10> {	[	    p,	P		],
-			[  VoidSymbol,  VoidSymbol	]	};
+			[    Greek_pi,  Greek_PI	]	};
     key <AD11> {	[dead_circumflex,dead_diaeresis	],
 			[ ocircumflex, Ocircumflex	]	};
     key <AD12> {	[      dollar,	asterisk	],
-			[  EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
+			[  EuroSign, yen		]	};
 
     key <CAPS> {	[	Caps_Lock		]	};
     key <AC01> {	[	  q,	Q		],
-			[acircumflex,	Agrave		]	};
+			[doubledagger,	Greek_OMEGA	]	};
     key <AC02> {	[	  s,	S		],
-			[    Ograve,	VoidSymbol	]	};
+			[    Ograve,	Greek_SIGMA	]	};
     key <AC03> {	[	  d,	D		],
-			[VoidSymbol,	VoidSymbol	]	};
+			[Greek_delta,	Greek_DELTA	]	};
     key <AC04> {	[	  f,	F		],
-			[VoidSymbol,	periodcentered	]	}; // MISSING: oblong script f??
+			[VoidSymbol,	periodcentered	]	};
     key <AC05> {	[	  g,	G		],
-			[VoidSymbol,	VoidSymbol	]	}; // MISSING: kerned fi, fl
+			[VoidSymbol,	VoidSymbol	]	}; // MISSING: ligature fi, fl
     key <AC06> {	[	  h,	H		],
 			[    Igrave,	Icircumflex	]	};
     key <AC07> {	[	  j,	J		],
@@ -106,48 +114,38 @@
     key <AC10> {	[	  m,	M		],
 			[  	 mu,	Oacute		]	};
     key <AC11> {	[    ugrave,	percent		],
-			[    Ugrave,	ucircumflex	]	}; // MISSING: per-mille
+			[    Ugrave,	0x1002030	]	};
     key <BKSL> {	[ dead_grave,	sterling	],
 			[	 at,	numbersign	]	};
     key <RTRN> {	[    Return			]	};
 
     key <LSGT> {	[	 less,	  greater	],
-			[VoidSymbol, 	VoidSymbol	]	};
+			[lessthanequal, greaterthanequal	]	};
     key <AB01> {	[	  w,	W		],
-			[VoidSymbol,	VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
+			[guilsinglleft,	guilsinglright	]	}; // MISSING: half-guillemot (single angle bracket)
     key <AB02> {	[	  x,	X		],
-			[VoidSymbol,	VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
+			[VoidSymbol,	VoidSymbol	]	}; // CHECK: similarequal; MISSING: extra-slanted slash
     key <AB03> {	[	  c,	C		],
 			[ copyright,	cent		]	};
     key <AB04> {	[	  v,	V		],
-			[   diamond,	leftradical	]	}; // CHECK diamond, leftradical
+			[   diamond,	radical		]	}; // CHECK diamond
     key <AB05> {	[	  b,	B		],
-			[    ssharp,    VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
+			[    ssharp,    integral	]	};
     key <AB06> {	[	  n,	N		],
 			[ dead_tilde,	asciitilde	]	};
     key <AB07> {	[     comma,	question	],
-			[VoidSymbol,	questiondown	]	};
+			[  infinity,	questiondown	]	};
     key <AB08> {	[ semicolon,	period		],
-			[VoidSymbol,	periodcentered	]	};
+			[  ellipsis,	periodcentered	]	};
     key <AB09> {	[     colon,	slash		],
 			[  division,	backslash	]	};
     key <AB10> {	[     equal,	plus		],
-			[VoidSymbol,	plusminus	]	};
+			[  notequal,	plusminus	]	};
 
     key <SPCE> {	[     space,	space		],
 			[nobreakspace,	nobreakspace	]	};
     // End alphanumeric section
 
-    // Begin modifier mappings
-    key <LWIN> {	[  Alt_L, 	Meta_L	]	};
-    key <LFSH> {	[  Shift_L		]	};
-    key <LCTL> {	[  Control_L		]	};
-    key <LALT> {	[  Mode_switch		]	};
-    key <RMTA> {	[  Meta_R		]	};
-    key <RTSH> {	[  Shift_R		]	};
-    key <RCTL> {	[  Control_R		]	};
-    key <RALT> {	[  script_switch	]	};
-    // End modifier mappings
 
     // Begin "Function" section
     key <FK01> {	[  F1			]	};
@@ -167,6 +165,7 @@
     key <FK15> {	[  F15, Pause		]	};
     // End "Function" section
 
+
     // Begin "Editing" section
     key	 <INS> {	[  Insert		]	};
     key <HOME> {	[  Home			]	};
@@ -181,6 +180,7 @@
     key <RGHT> {	[  Right		]	};
     // End "Editing" section
 
+
     // Begin "Keypad" section
     key <KPCL> {	[  Clear		]	};
     key <KPEQ> {	[  KP_Equal		]	};
@@ -204,7 +204,22 @@
 
     key	 <KP0> {	[  KP_0			]	};
     key <KPDL> {	[  comma,KP_Decimal	]	};
- // End "Keypad" section
+    // End "Keypad" section
+
+
+    // Begin modifier mappings
+    key <LWIN> {	[  Alt_L, 	Meta_L	]	};
+//  key <LMTA> {	[  Meta_L,		]	};
+    key <LFSH> {	[  Shift_L		]	};
+    key <LCTL> {	[  Control_L		]	};
+    key <LALT> {	[  Mode_switch,	Mode_switch	]	};
+
+    key <RWIN> {	[  Alt_R,	Meta_R	]	};
+    key <RMTA> {	[  Meta_R		]	};
+    key <RTSH> {	[  Shift_R		]	};
+    key <RCTL> {	[  Control_R		]	};
+    key <RALT> {	[  Mode_switch,	Mode_switch	]	};
+    // End modifier mappings
 
 
     // begin modifier mappings
@@ -216,5 +231,3 @@
     modifier_map Mod3	{ Mode_switch	       };
     // end modifier mappings
 };
-
-
Index: xc/programs/xkbcomp/symbols/nec/Imakefile
diff -u xc/programs/xkbcomp/symbols/nec/Imakefile:3.3 xc/programs/xkbcomp/symbols/nec/Imakefile:3.4
--- xc/programs/xkbcomp/symbols/nec/Imakefile:3.3	Mon Jan  9 10:01:29 2006
+++ xc/programs/xkbcomp/symbols/nec/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/nec/Imakefile,v 3.3 2006/01/09 15:01:29 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/nec/Imakefile,v 3.4 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = jp
+    DATAFILES = jp
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/nec)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/pc/Imakefile
diff -u xc/programs/xkbcomp/symbols/pc/Imakefile:1.24 xc/programs/xkbcomp/symbols/pc/Imakefile:1.25
--- xc/programs/xkbcomp/symbols/pc/Imakefile:1.24	Tue Jan 24 23:46:00 2006
+++ xc/programs/xkbcomp/symbols/pc/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,28 +1,13 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.24 2006/01/25 04:46:00 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.25 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = al am ar \
-		be ben bg br by \
-		cz cz_qwerty \
-		de dev dk dvorak dvorak_intl dz \
-		ee el en_US es \
-		fi fo fr fr-latin9 \
-		gb ge_la ge_ru guj gur \
-		hr hsb hu \
-		ie il il_phonetic ir is it iu \
-		kan kh ky \
-		la latin lo lt lv lat\
-		mk ml mm mt mt_us \
-		nl no \
-		ogham ori \
-		pc pl pl2 pt \
-		ro ru \
-		sapmi se se_FI se_NO se_SE si sin \
-		sk sk_qwerty sr syr syr_phonetic \
-		tel th th_tis th_pat tj tml tr \
-		ua ur_PK us us_intl uz \
-		yu 
+    DATAFILES = al am ar be ben bg br by cz cz_qwerty de dev dk dvorak \
+		dvorak_intl dz ee el en_US es fi fo fr fr-latin9 gb ge_la \
+		ge_ru guj gur hr hsb hu ie il il_phonetic ir is it iu kan kh \
+		ky la latin lo lt lv lat mk ml mm mt mt_us nl no ogham ori pc \
+		pl pl2 pt ro ru sapmi se se_FI se_NO se_SE si sin sk \
+		sk_qwerty sr syr syr_phonetic tel th th_tis th_pat tj tml tr \
+		ua ur_PK us us_intl uz yu
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/pc)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/sgi/Imakefile
diff -u xc/programs/xkbcomp/symbols/sgi/Imakefile:1.3 xc/programs/xkbcomp/symbols/sgi/Imakefile:1.4
--- xc/programs/xkbcomp/symbols/sgi/Imakefile:1.3	Mon Jan  9 10:01:29 2006
+++ xc/programs/xkbcomp/symbols/sgi/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/sgi/Imakefile,v 1.3 2006/01/09 15:01:29 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/sgi/Imakefile,v 1.4 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = jp
+    DATAFILES = jp
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/sgi)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/sharp/Imakefile
diff -u /dev/null xc/programs/xkbcomp/symbols/sharp/Imakefile:1.2
--- /dev/null	Sun Aug 12 22:04:06 2007
+++ xc/programs/xkbcomp/symbols/sharp/Imakefile	Fri Dec 29 14:19:58 2006
@@ -0,0 +1,7 @@
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/sharp/Imakefile,v 1.2 2006/12/29 19:19:58 tsi Exp $
+
+    DATAFILES = jp
+
+all::
+
+InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/sharp)
Index: xc/programs/xkbcomp/symbols/sharp/jp
diff -u /dev/null xc/programs/xkbcomp/symbols/sharp/jp:1.1
--- /dev/null	Sun Aug 12 22:04:06 2007
+++ xc/programs/xkbcomp/symbols/sharp/jp	Thu Dec 28 16:08:52 2006
@@ -0,0 +1,321 @@
+// $XFree86: xc/programs/xkbcomp/symbols/sharp/jp,v 1.1 2006/12/28 21:08:52 tsi Exp $
+//
+//Copyright (c) 1996  X Consortium
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and/or sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the X Consortium shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from the X Consortium.
+//
+// symbols for a SHARP X68k standard keyboard
+xkb_symbols "standard" {
+
+    key <ESC>  { [ Escape		]	};
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde ], [ kana_HE		]	};
+    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <LCTL> { [ Control_L		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU		]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <HIRA> { [ Hiragana_Katakana    ]       };
+    key  <XF1> { [ Alt_L                ]       };
+    key  <XF2> { [ Meta_L               ]       };
+    key <SPCE> { [ space		]	};
+    key  <XF3> { [ Meta_R               ]       };
+    key  <XF4> { [ Alt_R                ]       };
+    key  <XF5> { [ Control_R            ]       };
+    key <ZEN>  { [ Zenkaku_Hankaku      ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key  <BRK> { [ Break		]	};
+    key <PRSC> { [ Print		]	};
+    key <FK01> { [ F1			]	};
+    key <FK02> { [ F2			]	};
+    key <FK03> { [ F3			]	};
+    key <FK04> { [ F4			]	};
+    key <FK05> { [ F5			]	};
+    key <FK06> { [ F6			]	};
+    key <FK07> { [ F7			]	};
+    key <FK08> { [ F8			]	};
+    key <FK09> { [ F9			]	};
+    key <FK10> { [ F10			]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <HOME> { [ Home   		]	};
+    key <INS>  { [ Insert		]	};
+    key <DELE> { [ Delete		]	};
+    key <PGUP> { [ Prior		]	};
+    key <PGDN> { [ Next			]	};
+    key <UNDO> { [ Undo                 ]       };
+    key <UP>   { [ Up			]	};
+    key <LEFT> { [ Left			]	};
+    key <RGHT> { [ Right		]	};
+    key <DOWN> { [ Down			]	};
+    key <OPT1> { [ Super_L		]	};
+    key <OPT2> { [ Super_R		]	};
+    // End "Editing" section
+
+    key <KANA> { [ Kana_Lock		]	};
+    key <ROME> { [ Romaji		]	};
+    key <CODE> { [ NoSymbol		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <KIGO> { [ NoSymbol		]	};
+    key <TORK> { [ Touroku		]	};
+    key <HELP> { [ Help			]	};
+
+    // Begin "Keypad" section
+    key  <CLR> { [ Clear		]	 };
+    key <KPDV> { [ KP_Divide		]	};
+    key <KPMU> { [ KP_Multiply		]	};
+    key <KPSU> { [ KP_Subtract		]	};
+
+    key  <KP7> { [ KP_7			]	};
+    key  <KP8> { [ KP_8			]	};
+    key  <KP9> { [ KP_9			]	};
+    key <KPAD> { [ KP_Add		]	};
+
+    key  <KP4> { [ KP_4			]	};
+    key  <KP5> { [ KP_5			]	};
+    key  <KP6> { [ KP_6			]	};
+    key <KPEQ> { [ KP_Equal 		]	};
+
+    key  <KP1> { [ KP_1			]	};
+    key  <KP2> { [ KP_2			]	};
+    key  <KP3> { [ KP_3			]	};
+    key <KPEN> { [ KP_Enter		]	}; 
+
+    key  <KP0> { [ KP_0			]	};
+    key <KPCM> { [ comma		]	};
+    key <KPPR> { [ period		]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1   { Alt_L, Alt_R };
+    modifier_map Mod2   { Meta_L, Meta_R };
+};
+
+// symbols for a SHARP X68k ascii map keyboard
+xkb_symbols "ascii" {
+
+    key <ESC>  { [ Escape		]	};
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, at		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, underscore	], [ kana_HO		]	};
+    key <AE12> { [ equal, plus  	], [ kana_HE		]	};
+    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ bracketleft, braceleft ], [ voicedsound	]	};
+    key <AD12> { [ bracketright, braceright ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <LCTL> { [ Control_L		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, colon	], [ kana_RE		]	};
+    key <AC11> { [ quoteright, quotedbl	], [ kana_KE		]	};
+    key <AC12> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU		]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ NoSymbol		], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <HIRA> { [ Hiragana_Katakana    ]       };
+    key  <XF1> { [ Alt_L                ]       };
+    key  <XF2> { [ Meta_L               ]       };
+    key <SPCE> { [ space		]	};
+    key  <XF3> { [ Meta_R               ]       };
+    key  <XF4> { [ Alt_R                ]       };
+    key  <XF5> { [ Control_R            ]       };
+    key <ZEN>  { [ Zenkaku_Hankaku      ]       };
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key  <BRK> { [ Break		]	};
+    key <PRSC> { [ Print		]	};
+    key <FK01> { [ F1			]	};
+    key <FK02> { [ F2			]	};
+    key <FK03> { [ F3			]	};
+    key <FK04> { [ F4			]	};
+    key <FK05> { [ F5			]	};
+    key <FK06> { [ F6			]	};
+    key <FK07> { [ F7			]	};
+    key <FK08> { [ F8			]	};
+    key <FK09> { [ F9			]	};
+    key <FK10> { [ F10			]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <HOME> { [ Home   		]	};
+    key <INS>  { [ Insert		]	};
+    key <DELE> { [ Delete		]	};
+    key <PGUP> { [ Prior		]	};
+    key <PGDN> { [ Next			]	};
+    key <UP>   { [ Up			]	};
+    key <LEFT> { [ Left			]	};
+    key <RGHT> { [ Right		]	};
+    key <DOWN> { [ Down			]	};
+    key <OPT1> { [ Super_L		]	};
+    key <OPT2> { [ Super_R		]	};
+    // End "Editing" section
+
+    key <KANA> { [ Kana_Lock		]	};
+    key <ROME> { [ Romaji		]	};
+    key <CODE> { [ NoSymbol		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <KIGO> { [ NoSymbol		]	};
+    key <TORK> { [ Touroku		]	};
+    key <HELP> { [ Help			]	};
+
+    // Begin "Keypad" section
+    key  <CLR> { [ Clear		]	 };
+    key <KPDV> { [ KP_Divide		]	};
+    key <KPMU> { [ KP_Multiply		]	};
+    key <KPSU> { [ KP_Subtract		]	};
+
+    key  <KP7> { [ KP_7			]	};
+    key  <KP8> { [ KP_8			]	};
+    key  <KP9> { [ KP_9			]	};
+    key <KPAD> { [ KP_Add		]	};
+
+    key  <KP4> { [ KP_4			]	};
+    key  <KP5> { [ KP_5			]	};
+    key  <KP6> { [ KP_6			]	};
+    key <KPEQ> { [ KP_Equal 		]	};
+
+    key  <KP1> { [ KP_1			]	};
+    key  <KP2> { [ KP_2			]	};
+    key  <KP3> { [ KP_3			]	};
+    key <KPEN> { [ KP_Enter		]	}; 
+
+    key  <KP0> { [ KP_0			]	};
+    key <KPCM> { [ KP_Separator		]	};
+    key <KPPR> { [ KP_Decimal		]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1   { Alt_L, Alt_R };
+    modifier_map Mod2   { Meta_L, Meta_R };
+};
+
Index: xc/programs/xkbcomp/symbols/sony/Imakefile
diff -u xc/programs/xkbcomp/symbols/sony/Imakefile:1.2 xc/programs/xkbcomp/symbols/sony/Imakefile:1.3
--- xc/programs/xkbcomp/symbols/sony/Imakefile:1.2	Mon Jan  9 10:01:30 2006
+++ xc/programs/xkbcomp/symbols/sony/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/sony/Imakefile,v 1.2 2006/01/09 15:01:30 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/sony/Imakefile,v 1.3 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = us
+    DATAFILES = us
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/sony)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/sun/Imakefile
diff -u xc/programs/xkbcomp/symbols/sun/Imakefile:1.7 xc/programs/xkbcomp/symbols/sun/Imakefile:1.8
--- xc/programs/xkbcomp/symbols/sun/Imakefile:1.7	Mon Jan  9 10:01:30 2006
+++ xc/programs/xkbcomp/symbols/sun/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/sun/Imakefile,v 1.7 2006/01/09 15:01:30 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/sun/Imakefile,v 1.8 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = se us usb
+    DATAFILES = se us usb
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/sun)
-DependTarget()
Index: xc/programs/xkbcomp/symbols/xfree68/Imakefile
diff -u xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.3 xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.4
--- xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.3	Mon Jan  9 10:01:30 2006
+++ xc/programs/xkbcomp/symbols/xfree68/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,8 +1,7 @@
-XCOMM $XFree86: xc/programs/xkbcomp/symbols/xfree68/Imakefile,v 1.3 2006/01/09 15:01:30 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/symbols/xfree68/Imakefile,v 1.4 2006/12/29 19:19:58 tsi Exp $
 
-     DATAFILES = amiga ataritt
+    DATAFILES = amiga ataritt
 
 all::
 
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/symbols/xfree68)
-DependTarget()
Index: xc/programs/xkbcomp/types/Imakefile
diff -u xc/programs/xkbcomp/types/Imakefile:3.9 xc/programs/xkbcomp/types/Imakefile:3.10
--- xc/programs/xkbcomp/types/Imakefile:3.9	Mon Jan  9 10:01:31 2006
+++ xc/programs/xkbcomp/types/Imakefile	Fri Dec 29 14:19:58 2006
@@ -1,11 +1,9 @@
-XCOMM $XFree86: xc/programs/xkbcomp/types/Imakefile,v 3.9 2006/01/09 15:01:31 dawes Exp $
+XCOMM $XFree86: xc/programs/xkbcomp/types/Imakefile,v 3.10 2006/12/29 19:19:58 tsi Exp $
 
-
-     DATAFILES = README basic caps complete default mousekeys iso9995 \
-		 pc extra numpad
+    DATAFILES = README basic caps complete default extra iso9995 mousekeys \
+		numpad pc
 
 all::
 
 MakeXkbDir($(LIBDIR)/xkb,types)
 InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/types)
-DependTarget()
Index: xc/programs/xkill/xkill.c
diff -u xc/programs/xkill/xkill.c:1.7 xc/programs/xkill/xkill.c:1.8
--- xc/programs/xkill/xkill.c:1.7	Mon Jan  9 10:01:34 2006
+++ xc/programs/xkill/xkill.c	Mon Apr  9 11:37:20 2007
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xkill/xkill.c,v 1.7 2006/01/09 15:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xkill/xkill.c,v 1.8 2007/04/09 15:37:20 tsi Exp $ */
 
 /*
  * xkill - simple program for destroying unwanted clients
@@ -101,7 +101,7 @@
     int screenno;			/* screen number of dpy */
     XID id = None;			/* resource to kill */
     char *button_name = NULL;		/* name of button for window select */
-    int button;				/* button number or negative for all */
+    int button = 0;			/* button number or negative for all */
     Bool kill_all = False;
     Bool top = False;
 
Index: xc/programs/xload/get_load.c
diff -u xc/programs/xload/get_load.c:1.23 xc/programs/xload/get_load.c:1.24
--- xc/programs/xload/get_load.c:1.23	Mon Jan  9 10:01:34 2006
+++ xc/programs/xload/get_load.c	Mon Apr  2 20:21:14 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xload/get_load.c,v 1.23 2006/01/09 15:01:34 dawes Exp $ */
+/* $XFree86: xc/programs/xload/get_load.c,v 1.24 2007/04/03 00:21:14 tsi Exp $ */
 /*
 
 Copyright (c) 1989  X Consortium
@@ -464,7 +464,7 @@
     double *loadavg = (double *)call_data;
 
     struct host_load_info load_data;
-    int host_count;
+    unsigned int host_count;
     kern_return_t kr;
 
     host_count = sizeof(load_data)/sizeof(integer_t);
Index: xc/programs/xlogo/Imakefile
diff -u xc/programs/xlogo/Imakefile:1.7 xc/programs/xlogo/Imakefile:1.8
--- xc/programs/xlogo/Imakefile:1.7	Fri Oct 14 11:17:34 2005
+++ xc/programs/xlogo/Imakefile	Fri May 18 14:02:00 2007
@@ -1,11 +1,11 @@
-XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.7 2005/10/14 15:17:34 tsi Exp $
+XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.8 2007/05/18 18:02:00 tsi Exp $
 
 #ifndef XLogoUseRender
 #define XLogoUseRender BuildRenderLibrary
 #endif
 
 #if XLogoUseRender
-    XRENDERDEFS = -DXRENDER -DXFREE86_FT2
+    XRENDERDEFS = -DXRENDER
     XRENDERDEPS = XftClientDepLibs
     XRENDERLIBS = XftClientLibs
     XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES)
Index: xc/programs/xlsatoms/xlsatoms.c
diff -u xc/programs/xlsatoms/xlsatoms.c:1.7 xc/programs/xlsatoms/xlsatoms.c:1.8
--- xc/programs/xlsatoms/xlsatoms.c:1.7	Mon Jan  9 10:01:35 2006
+++ xc/programs/xlsatoms/xlsatoms.c	Mon Apr  9 11:37:20 2007
@@ -24,7 +24,7 @@
  *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.7 2006/01/09 15:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.8 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -175,7 +175,7 @@
 do_range(Display *dpy, char *format, char *range)
 {
     int mask;
-    long low, high;
+    long low = 0, high = 0;
 
     mask = parse_range (range, &low, &high);
     list_atoms (dpy, format, mask, low, high);
Index: xc/programs/xlsfonts/dsimple.c
diff -u xc/programs/xlsfonts/dsimple.c:3.8 xc/programs/xlsfonts/dsimple.c:3.9
--- xc/programs/xlsfonts/dsimple.c:3.8	Mon Jan  9 10:01:35 2006
+++ xc/programs/xlsfonts/dsimple.c	Mon Sep  4 11:57:55 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.8 2006/01/09 15:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.9 2006/09/04 15:57:55 tsi Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
@@ -402,12 +402,127 @@
 }
 
 
+/* MAKE_RECT converts the original root coordinates and the event root
+ * coordinates into a rectangle in xrect */
+#define MAKE_RECT(etype)	\
+    x = event.etype.x_root;	\
+    y = event.etype.y_root;	\
+    rw = x - rootx;		\
+    if (rw < 0) rw = -rw;	\
+    rh = y - rooty;		\
+    if (rh < 0) rh = -rh;	\
+    rx = x < rootx ? x : rootx;	\
+    ry = y < rooty ? y : rooty
+
+/* MAKE_CURSOR assigns a correct cursor */
+#define MAKE_CURSOR(etype)						\
+    pointer = (event.etype.x_root > rootx ?				\
+	       (event.etype.y_root > rooty ? pointer2 : pointer4) :	\
+	       (event.etype.y_root > rooty ? pointer3 : pointer1));
+
+/*
+ * Routine to let user select a rect using the mouse
+ */
+
+XRectangle Select_Rect(dpy)
+    Display *dpy;
+{
+    int status;
+    XRectangle xrect;
+    XEvent event;
+    unsigned int x, y, rootx, rooty;
+    Cursor pointer1, pointer2, pointer3, pointer4, pointer;
+    int boxDrawn = False, selectionDone = False;
+    int rx, ry, rw = 0, rh = 0;
+    Display *hDisplay = dpy;
+    Window root = RootWindow(dpy,screen);
+    GC gc;
+
+    /* get some cursors for rectangle formation */
+    pointer1 = XCreateFontCursor(hDisplay, XC_ul_angle);
+    pointer2 = XCreateFontCursor(hDisplay, XC_lr_angle);
+    pointer3 = XCreateFontCursor(hDisplay, XC_ll_angle);
+    pointer4 = XCreateFontCursor(hDisplay, XC_ur_angle);
+
+    /* grab the pointer */
+    status = XGrabPointer(dpy, root, False, ButtonPressMask,
+			  GrabModeAsync, GrabModeAsync, root,
+			  pointer1, CurrentTime);
+    if (status != GrabSuccess) Fatal_Error("Can't grab the mouse.");
+
+    /* create a graphics context to draw with */
+    gc = XCreateGC(dpy, root, 0, NULL);
+    if (!gc) Fatal_Error("Could not get drawing resources.");
+
+    XSetSubwindowMode(dpy, gc, IncludeInferiors);
+    XSetForeground(dpy, gc, 255);
+    XSetFunction(dpy, gc, GXinvert);
+
+    /* get a button-press and pull out the root location */
+    XMaskEvent(dpy, ButtonPressMask, &event);
+    rootx = rx = event.xbutton.x_root;
+    rooty = ry = event.xbutton.y_root;
+
+    /* get pointer motion events */
+    XChangeActivePointerGrab(dpy, ButtonMotionMask | ButtonReleaseMask,
+			     pointer2, CurrentTime);
+
+    /* loop to let the user drag a rectangle */
+    while (!selectionDone) {
+	XNextEvent(dpy, &event);
+	switch(event.type) {
+	case ButtonRelease:
+	    if (boxDrawn) {
+		XDrawRectangle(dpy, root, gc, rx, ry, rw, rh);
+		boxDrawn = False;
+	    }
+	    XFlush(dpy);
+	    /* record the final location */
+	    MAKE_RECT(xbutton);
+	    selectionDone = True;
+	    break;
+
+	case MotionNotify:
+	    if (boxDrawn) {
+		XDrawRectangle(dpy, root, gc, rx, ry, rw, rh);
+		boxDrawn = False;
+	    }
+	    while (XCheckTypedEvent(dpy, MotionNotify, &event)) { }
+	    MAKE_RECT(xmotion);
+	    XDrawRectangle(dpy, root, gc, rx, ry, rw, rh);
+	    boxDrawn = True;
+	    MAKE_CURSOR(xmotion);
+	    XChangeActivePointerGrab(dpy,
+				     ButtonMotionMask | ButtonReleaseMask,
+				     pointer, CurrentTime);
+	    break;
+	}
+    }
+
+    xrect.x      = rx;
+    xrect.y      = ry;
+    xrect.width  = rw;
+    xrect.height = rh;
+
+    /* release resources */
+    XFreeGC(dpy, gc);
+    XFreeCursor(dpy, pointer1);
+    XFreeCursor(dpy, pointer2);
+    XFreeCursor(dpy, pointer3);
+    XFreeCursor(dpy, pointer4);
+
+    XUngrabPointer(dpy, CurrentTime);
+
+    return xrect;
+}
+
+
 /*
  * Routine to let user select a window using the mouse
  */
 
 Window Select_Window(dpy)
-     Display *dpy;
+    Display *dpy;
 {
   int status;
   Cursor cursor;
Index: xc/programs/xlsfonts/dsimple.h
diff -u xc/programs/xlsfonts/dsimple.h:1.10 xc/programs/xlsfonts/dsimple.h:1.11
--- xc/programs/xlsfonts/dsimple.h:1.10	Mon Jan  9 10:01:35 2006
+++ xc/programs/xlsfonts/dsimple.h	Mon Sep  4 11:57:55 2006
@@ -25,7 +25,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.10 2006/01/09 15:01:35 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.11 2006/09/04 15:57:55 tsi Exp $ */
 
 /*
  * Just_display.h: This file contains the definitions needed to use the
@@ -74,6 +74,7 @@
 
 unsigned long Resolve_Color(Window, char *);
 Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
+XRectangle Select_Rect(Display *);
 Window Select_Window(Display *);
 void blip(void);
 Window Window_With_Name(Display *, Window, char *);
Index: xc/programs/xman/man.c
diff -u xc/programs/xman/man.c:1.12 xc/programs/xman/man.c:1.13
--- xc/programs/xman/man.c:1.12	Mon Jan  9 10:01:37 2006
+++ xc/programs/xman/man.c	Fri Dec 29 19:58:10 2006
@@ -27,7 +27,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/man.c,v 1.12 2006/01/09 15:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xman/man.c,v 1.13 2006/12/30 00:58:10 tsi Exp $ */
 
 
 #include "globals.h"
@@ -50,6 +50,10 @@
 #endif
 #endif
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <sys/utsname.h>
+#endif
+
 #ifdef DEBUG
 static char error_buf[BUFSIZ];		/* The buffer for error messages. */
 #endif /* DEBUG */
@@ -396,11 +400,17 @@
 static void
 AddToCurrentSection(Manual * local_manual, char * path)
 {
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+  struct utsname uts;
+#endif
   char temp_path[BUFSIZ];
 
 #if defined(__OpenBSD__) || defined(__NetBSD__)
-  sprintf(temp_path, "%s/%s", path, MACHINE);
+  /* XXX: No way to deal w. error here so just move on. */
+  if (uname(&uts) == 0) {
+    sprintf(temp_path, "%s/%s", path, uts.machine);
   ReadCurrentSection(local_manual, temp_path);
+  }
 #endif
   ReadCurrentSection(local_manual, path);
   sprintf(temp_path, "%s.%s", path, COMPRESSION_EXTENSION);
Index: xc/programs/xman/misc.c
diff -u xc/programs/xman/misc.c:1.13 xc/programs/xman/misc.c:1.14
--- xc/programs/xman/misc.c:1.13	Mon Jan  9 10:01:37 2006
+++ xc/programs/xman/misc.c	Fri Dec 29 19:58:10 2006
@@ -27,7 +27,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xman/misc.c,v 1.13 2006/01/09 15:01:37 dawes Exp $ */
+/* $XFree86: xc/programs/xman/misc.c,v 1.14 2006/12/30 00:58:10 tsi Exp $ */
 
 /*
  * xman - X window system manual page display program.
@@ -43,6 +43,10 @@
 #include <X11/Xaw/Dialog.h>
 #include <X11/Shell.h>
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <sys/utsname.h>
+#endif
+
 static FILE * Uncompress(ManpageGlobals * man_globals, char * filename);
 #ifndef HAS_MKSTEMP
 static Boolean UncompressNamed(ManpageGlobals * man_globals, char * filename,
@@ -187,6 +191,9 @@
 #if defined(ISC) || defined(__SCO__)
   int i;
 #endif
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+  struct utsname uts;
+#endif
 
   temp = CreateManpageName(entry, section_num, manual[section_num].flags);
   sprintf(man_globals->manpage_title, "The current manual page is: %s.", temp);
@@ -200,11 +207,14 @@
  * Look for uncompressed files first.
  */
 #if defined(__OpenBSD__) || defined(__NetBSD__)
+  /* XXX: No way to deal w. error here so just move on. */
+  if (uname(&uts) == 0) {
   /* look in machine subdir first */
   sprintf(filename, "%s/%s%s/%s/%s", path, CAT,
-	  section + len_cat, MACHINE, page);
+  	  section + len_cat, uts.machine, page);
   if ( (file = fopen(filename,"r")) != NULL)
     return(file);
+  }
 #endif
 
   sprintf(filename, "%s/%s%s/%s", path, CAT, section + len_cat, page);
@@ -217,11 +227,14 @@
 
 #if !defined(ISC) && !defined(__SCO__)
 #if defined(__OpenBSD__) || defined(__NetBSD__)
+  /* XXX: No way to deal w. error here so just move on. */
+  if (uname(&uts) == 0) {
   /* look in machine subdir first */
   sprintf(filename, "%s/%s%s/%s/%s.%s", path, CAT,
-	  section + len_cat, MACHINE, page, COMPRESSION_EXTENSION);
+	  section + len_cat, uts.machine, page, COMPRESSION_EXTENSION);
   if ( (file = Uncompress(man_globals, filename)) != NULL)
     return(file);
+  }
 #endif
   sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
 	  section + len_cat, page, COMPRESSION_EXTENSION);
@@ -230,11 +243,14 @@
 #ifdef GZIP_EXTENSION
   else {
 #if defined(__OpenBSD__) || defined(__NetBSD__)
+      /* XXX: No way to deal w. error here so just move on. */
+      if (uname(&uts) == 0) {
       /* look in machine subdir first */
       sprintf(filename, "%s/%s%s/%s/%s.%s", path, CAT,
-	      section + len_cat, MACHINE, page, GZIP_EXTENSION);
+	      section + len_cat, uts.machine, page, GZIP_EXTENSION);
       if ( (file = Uncompress(man_globals, filename)) != NULL)
 	  return(file);
+      }
 #endif
     sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
 	    section + len_cat, page, GZIP_EXTENSION);
@@ -726,24 +742,30 @@
 		      char * filename, FILE **file)
 #endif
 {
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+  struct utsname uts;
+#endif
   char path[BUFSIZ], page[BUFSIZ], section[BUFSIZ], input[BUFSIZ];
   int len_cat = strlen(CAT), len_man = strlen(MAN);
 
   ParseEntry(entry, path, section, page);
 
 #if defined(__OpenBSD__) || defined(__NetBSD__)
+  /* XXX: No way to deal w. error here so just move on. */
+  if (uname(&uts) == 0) {
   /*
    * look for uncomressed file in machine subdir first
    */
   sprintf(filename, "%s/%s%s/%s/%s", path, MAN,
-	  section + len_cat, MACHINE, page);
+	  section + len_cat, uts.machine, page);
   if ( access( filename, R_OK ) == 0 ) {
     man_globals->compress = FALSE;
     man_globals->gzip = FALSE;
     sprintf(man_globals->save_file, "%s/%s%s/%s/%s", path,
-	    CAT, section + len_cat, MACHINE, page);
+	    CAT, section + len_cat, uts.machine, page);
     return(TRUE);
   }
+  }
  /*
   * Then for compressed files in an uncompressed directory.
   */
@@ -960,6 +982,9 @@
 ParseEntry(char *entry, char *path, char *sect, char *page)
 {
   char *c, temp[BUFSIZ];
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+  struct utsname uts;
+#endif
 
   strcpy(temp, entry);
 
@@ -975,12 +1000,15 @@
     PrintError("index failure in ParseEntry.");
   *c++ = '\0';
 #if defined(__OpenBSD__) || defined(__NetBSD__)
+  /* XXX: No way to deal w. error here so just move on. */
+  if (uname(&uts) == 0) {
   /* Skip machine subdirectory if present */
-  if (strcmp(c, MACHINE) == 0) {
+    if (strcmp(c, uts.machine) == 0) {
       c = rindex(temp, '/');
       if (c == NULL)
 	  PrintError("index failure in ParseEntry.");
       *c++ = '\0';
+    }
   }
 #endif
   if (sect != NULL)
Index: xc/programs/xmessage/makeform.c
diff -u xc/programs/xmessage/makeform.c:1.8 xc/programs/xmessage/makeform.c:1.9
--- xc/programs/xmessage/makeform.c:1.8	Mon May 23 20:46:23 2005
+++ xc/programs/xmessage/makeform.c	Mon Apr  9 11:37:20 2007
@@ -27,7 +27,7 @@
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xmessage/makeform.c,v 1.8 2005/05/24 00:46:23 dawes Exp $ */
+/* $XFree86: xc/programs/xmessage/makeform.c,v 1.9 2007/04/09 15:37:20 tsi Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
@@ -216,7 +216,7 @@
     Dimension max_width,
     Dimension max_height)
 {
-    ButtonRecord *br;
+    ButtonRecord *br = NULL;
     int npairs, i;
     Widget form, text, prev;
     Arg args[10];
Index: xc/programs/xmh/xmh.h
diff -u xc/programs/xmh/xmh.h:1.4 xc/programs/xmh/xmh.h:1.5
--- xc/programs/xmh/xmh.h:1.4	Mon Jan  9 10:01:40 2006
+++ xc/programs/xmh/xmh.h	Sun Dec 10 10:58:35 2006
@@ -21,7 +21,7 @@
  * used in advertising or publicity pertaining to distribution of the software
  * without specific, written prior permission.
  */
-/* $XFree86: xc/programs/xmh/xmh.h,v 1.4 2006/01/09 15:01:40 dawes Exp $ */
+/* $XFree86: xc/programs/xmh/xmh.h,v 1.5 2006/12/10 15:58:35 tsi Exp $ */
 
 #ifndef _xmh_h
 #define _xmh_h
@@ -61,6 +61,8 @@
 #define xMargin 2
 #define yMargin 2
 
+#undef DEBUG
+
 #define DEBUG(msg) \
 	if (app_resources.debug) \
 	    {(void)fprintf(stderr, msg); (void)fflush(stderr);}
Index: xc/programs/xmodmap/xmodmap.man
diff -u xc/programs/xmodmap/xmodmap.man:1.15 xc/programs/xmodmap/xmodmap.man:1.16
--- xc/programs/xmodmap/xmodmap.man:1.15	Mon Jan  9 10:01:42 2006
+++ xc/programs/xmodmap/xmodmap.man	Mon Nov 27 16:45:46 2006
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.15 2006/01/09 15:01:42 dawes Exp $
+.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.16 2006/11/27 21:45:46 tsi Exp $
 .\" 
 .de EX		\"Begin example
 .ne 5
@@ -139,7 +139,7 @@
 used to perform the corresponding set of \fBkeycode\fP expressions.
 The list of keysym names may be
 found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix)
-or the keysym database \fI__projectroot__/lib/X11/XKeysymDB\fP.  Note that
+or the keysym database \fI\&__projectroot__/lib/X11/XKeysymDB\fP.  Note that
 if the same keysym is bound to multiple keys, the expression is executed
 for each matching keycode.
 .TP 8
Index: xc/programs/xprop/xprop.c
diff -u xc/programs/xprop/xprop.c:1.17 xc/programs/xprop/xprop.c:1.18
--- xc/programs/xprop/xprop.c:1.17	Mon Jan  9 10:01:42 2006
+++ xc/programs/xprop/xprop.c	Mon Apr  9 11:37:20 2007
@@ -1,7 +1,7 @@
 /*
 
 Copyright 1990, 1998  The Open Group
-Copyright (c) 2000  The XFree86 Project, Inc.
+Copyright (c) 2000-2007  The XFree86 Project, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -26,7 +26,7 @@
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xprop/xprop.c,v 1.17 2006/01/09 15:01:42 dawes Exp $ */
+/* $XFree86: xc/programs/xprop/xprop.c,v 1.18 2007/04/09 15:37:20 tsi Exp $ */
 
 
 #include <X11/Xlib.h>
@@ -294,7 +294,7 @@
 static void
 Add_Mapping (Atom atom, const char *format, const char *dformat)
 {
-    thunk t;
+    thunk t = {0, };
 
     if (!_property_formats)
 	_property_formats = Create_Thunk_List();
@@ -1113,7 +1113,7 @@
 Break_Down_Property (const char *pointer, int length, Atom type, const char *format, int size)
 {
     thunk *thunks;
-    thunk t;
+    thunk t = {0, };
     int i;
     char format_char;
 
@@ -1127,8 +1127,10 @@
 	else if (format_char == 't') {
 	    t.extra_encoding = type;
 	    t.value = Extract_Len_String(&pointer,&length,size,&t.extra_value);
-	} else
+	} else {
 	    t.value = Extract_Value(&pointer,&length,size,format_char=='i');
+	    t.extra_value = NULL;
+	}
 	thunks = Add_Thunk(thunks, t);
 	i++;
     }
@@ -1282,7 +1284,7 @@
 Handle_Prop_Requests (int argc, char **argv)
 {
     char *format, *dformat, *prop;
-    thunk *thunks, t;
+    thunk *thunks, t = {0, };
 
     thunks = Create_Thunk_List();
 
@@ -1669,7 +1671,7 @@
 	    continue;
 	}
 	if (!strcmp(argv[0], "-remove")) {
-	    thunk t;
+	    thunk t = {0, };
 	    if (++argv, --argc == 0) usage();
 	    t.propname = argv[0];
 	    if (remove_props == NULL) remove_props = Create_Thunk_List();
@@ -1677,7 +1679,7 @@
 	    continue;
 	}
 	if (!strcmp(argv[0], "-set")) {
-	    thunk t;
+	    thunk t = {0, };
 	    if (argc < 3) usage();
 	    t.propname = argv[1];
 	    t.extra_value = argv[2];
Index: xc/programs/xrx/plugin/Imakefile
diff -u xc/programs/xrx/plugin/Imakefile:1.16 xc/programs/xrx/plugin/Imakefile:1.17
--- xc/programs/xrx/plugin/Imakefile:1.16	Fri Oct 14 11:17:34 2005
+++ xc/programs/xrx/plugin/Imakefile	Wed Jan  3 20:59:07 2007
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xrx/plugin/Imakefile,v 1.16 2005/10/14 15:17:34 tsi Exp $
+XCOMM $XFree86: xc/programs/xrx/plugin/Imakefile,v 1.17 2007/01/04 01:59:07 tsi Exp $
 /*
  * Copyright (c) 1994-2004 by The XFree86 Project, Inc.
  * All rights reserved.
@@ -132,7 +132,7 @@
 #endif /* UseInstalledX11 */
 
  PLUGIN_DEFINES = -DXP_UNIX
-PLUGIN_INCLUDES = -I./include
+PLUGIN_INCLUDES = -Iinclude
 
         DEFINES = StrcasecmpDefines -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) $(XT_DEFINES) $(SOCKET_DEFINES) $(FUNCPROTO_DEFINES)
        INCLUDES = $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES)
Index: xc/programs/xrx/plugin/PProcess.c
diff -u xc/programs/xrx/plugin/PProcess.c:1.9 xc/programs/xrx/plugin/PProcess.c:1.10
--- xc/programs/xrx/plugin/PProcess.c:1.9	Mon Jan  9 10:01:45 2006
+++ xc/programs/xrx/plugin/PProcess.c	Mon Apr  9 11:37:21 2007
@@ -25,7 +25,7 @@
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.9 2006/01/09 15:01:45 dawes Exp $ */
+/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.10 2007/04/09 15:37:21 tsi Exp $ */
 
 #include "RxPlugin.h"
 #include "XUrls.h"
@@ -395,7 +395,7 @@
 	    Position x, y;
 	    Dimension width, height;
 	    Dimension border_width;
-	    Colormap cmap;
+	    Colormap cmap = 0;
 	    int n;
 	    Atom* wm_proto;
 	    windowrec* wp;
Index: xc/programs/xrx/rx/XUrls.c
diff -u xc/programs/xrx/rx/XUrls.c:1.13 xc/programs/xrx/rx/XUrls.c:1.14
--- xc/programs/xrx/rx/XUrls.c:1.13	Mon Jan  9 10:01:46 2006
+++ xc/programs/xrx/rx/XUrls.c	Mon Jun 19 09:43:26 2006
@@ -25,7 +25,7 @@
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.13 2006/01/09 15:01:46 dawes Exp $ */
+/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.14 2006/06/19 13:43:26 tsi Exp $ */
 
 #include "RxI.h"
 #include "XUrls.h"
@@ -135,7 +135,8 @@
 #endif 
   /* none of the above worked, punt */
 
-    uname(&host);
+    if (uname(&host) < 0)
+	host.nodename[0] = '\0';
     strncpy (myname, host.nodename, myname_len);
     myname[MAXHOSTNAMELEN] = '\0';
   } else {	/* otherwise believe the display_name */
Index: xc/programs/xsetroot/xsetroot.man
diff -u xc/programs/xsetroot/xsetroot.man:1.10 xc/programs/xsetroot/xsetroot.man:1.11
--- xc/programs/xsetroot/xsetroot.man:1.10	Mon Jan  9 10:01:48 2006
+++ xc/programs/xsetroot/xsetroot.man	Mon Jul 30 09:30:21 2007
@@ -22,7 +22,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.10 2006/01/09 15:01:48 dawes Exp $
+.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.11 2007/07/30 13:30:21 tsi Exp $
 .\"
 .TH XSETROOT 1 __vendorversion__
 .SH NAME
@@ -37,7 +37,7 @@
 [-solid \fIcolor\fP] [-name \fIstring\fP]
 .SH DESCRIPTION
 The 
-.I setroot
+.I xsetroot
 program
 allows you to tailor the appearance of the background ("root")
 window on a workstation display running X.  Normally, you experiment with
Index: xc/programs/xterm/Imakefile
diff -u xc/programs/xterm/Imakefile:3.73 xc/programs/xterm/Imakefile:3.79
--- xc/programs/xterm/Imakefile:3.73	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/Imakefile	Tue Jul  3 11:19:53 2007
@@ -7,7 +7,7 @@
 XCOMM bcopy (or memcpy) cannot, write a routine called bcopy and link it in
 XCOMM or add -Dbcopy=mybcopy to the DEFINES list below.
 XCOMM
-XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.73 2006/04/10 00:34:36 dickey Exp $
+XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.79 2007/07/03 15:19:53 tsi Exp $
 XCOMM
 
 /* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */
@@ -17,70 +17,78 @@
 #define UTF8support
 
 /*
- * setgid mode works for systems that do not require setuid to open pty.
+ * setgid mode works for systems that do not require root to open a pty,
+ * and that allow a group to (re-)write utmp entries.
+ *
+ * On Linux, the first requirement is met by including devpts support in the
+ * kernel.  The second requirement is trickier, as not all distributions
+ * define a utmp group...
  *
  * This feature could also be applied to FreeBSD, but requires the installer
  * to define a "utmp" group as well as chgrp the utmp file to match.
  *
- * Note: InstallXtermSetUID is always defined; InstallXtermSetGID is defined
- * in newer imake configurations.
+ * Note:  InstallXtermSetUID is almost always defined;  InstallXtermSetGID is
+ * defined for certain OSes in newer imake configurations.
  */
-#if !defined(InstallXtermSetGID) && !InstallXtermSetUID
-#if defined(OpenBSDArchitecture) || \
-    (defined(LinuxArchitecture) && \
-     (LinuxCLibMajorVersion == 6))
-#define InstallXtermSetGID YES
-#endif
+#if !defined(InstallXtermSetGID)
+# if defined(OpenBSDArchitecture) || \
+     (defined(NetBSDArchitecture) && (OSMajorVersion >= 1)) || \
+     (defined(LinuxArchitecture) && \
+      (LinuxCLibMajorVersion == 6))
+#  define InstallXtermSetGID YES
+# endif
 #endif
 
 /*
  * Override the set uid/gid flags to use the utempter library.
  */
 #if defined(UseUtempter)
-#undef InstallXtermSetUID /* imake sets this */
-#undef InstallXtermSetGID /* we set this */
-#define InstallXtermSetUID NO
-#define InstallXtermSetGID NO
+# undef InstallXtermSetUID /* imake sets this */
+# undef InstallXtermSetGID /* we might set this */
         UTMPLIB = -lutempter
 #endif
 
 /*
  * Fixes to allow compile with X11R5, etc.
  */
-#ifndef InstGidFlags
-#define InstGidFlags -m 2755 -g utmp
+#ifndef InstUtmpFlags
+# ifdef InstGidFlags	/* Older, less descriptive, name */
+#  define InstUtmpFlags InstGidFlags
+# else
+#  define InstUtmpFlags -m 2755 -g utmp
+# endif
 #endif
 
 #ifndef InstUidFlags
-#define InstUidFlags -m 4711
+# define InstUidFlags -m 4711
 #endif
 
 #ifndef XkbClientDefines
-#define XkbClientDefines /**/
+# define XkbClientDefines /**/
 #endif
 
 #ifndef InstallXtermSetUID
-#define InstallXtermSetUID NO
+# define InstallXtermSetUID NO
 #endif
 
 #ifndef InstallXtermSetGID
-#define InstallXtermSetGID NO
+# define InstallXtermSetGID NO
 #endif
 
 #ifndef XkbClientDepLibs
-#define XkbClientDepLibs /**/
+# define XkbClientDepLibs /**/
 #endif
 
 #ifndef XkbClientLibs
-#define XkbClientLibs /**/
+# define XkbClientLibs /**/
 #endif
 
 /* This must come before setting DEFINES */
-#if InstallXtermSetUID
-INSTSETIDFLAGS = InstUidFlags 
-#elif InstallXtermSetGID
+#if InstallXtermSetGID
 CSGIDFLAGS = -DUSE_UTMP_SETGID
-INSTSETIDFLAGS = InstGidFlags 
+INSTSETIDFLAGS = InstUtmpFlags 
+#elif InstallXtermSetUID
+INSTSETIDFLAGS = InstUidFlags 
 #else
 INSTSETIDFLAGS = NullParameter 
 #endif
@@ -157,29 +165,46 @@
         UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
         UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
 #endif
+
 #if BuildXftLibrary
 #define XRenderSupport
 #endif
+
 #ifdef XRenderSupport
-         XRFDEF = -DXRENDERFONT -DXFREE86_FT2
+         XRFDEF = -DXRENDERFONT
         XRFLIBS = XftClientLibs
      XRFDEPLIBS = XftClientDepLibs
     XRFINCLUDES = $(XFTINCLUDES)
 #endif
+
 #if !HasPutenv
       PUTENVDEF = -DNOPUTENV
 #endif
+
 #ifdef TraceXTerm
        TRACEDEF = -DOPT_TRACE=1
 #endif
+
+/* Macros with arguments must be #define'd */
+#ifndef XF86_VERSION_NUMERIC
+# define XF86_VERSION_NUMERIC(a,b,c,d,e) 0
+#endif
+
+#if defined(XorgVersion) || !defined(XFree86Version) || \
+    (XFree86Version < XF86_VERSION_NUMERIC(4,5,99,14,0))
+OBSOLETE_INCLUDES = -I.
+#endif
+
    MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(CSGIDFLAGS) \
 		  -DOSMAJORVERSION=$(OSMAJORVERSION) \
 		  -DOSMINORVERSION=$(OSMINORVERSION)
    MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
     XKB_DEFINES = XkbClientDefines
    PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
-        DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
-       INCLUDES = -I. $(XRFINCLUDES)
+        DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) \
+                  $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) \
+                  $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF)
+       INCLUDES = $(OBSOLETE_INCLUDES) $(XRFINCLUDES)
 
 #ifdef OS2Architecture
         MAINSRC = os2main.c
@@ -238,25 +263,23 @@
 SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
 SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
 
-#if InstallXtermSetUID
-SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
-#else
 NormalProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(UTMPLIB) $(PTYLIB))
-#endif
 
-#if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries && (OSMajorVersion < 5)
-#if AlternateUsrLibDir
-#if ((OSMajorVersion == 4) && (OSMinorVersion >= 1))
+#if InstallXtermSetUID || InstallXtermSetGID
+# if defined(SunArchitecture) && HasSharedLibraries && (OSMajorVersion < 5)
+#  if AlternateUsrLibDir
+#   if ((OSMajorVersion == 4) && (OSMinorVersion >= 1))
 LDOVERRIDE = -L$(DESTDIR)$(USRLIBDIR)
-#else
-#if HasGcc
+#   else
+#    if HasGcc
 LDOVERRIDE = -static -L$(DESTDIR)$(USRLIBDIR)
-#else
+#    else
 LDOVERRIDE = -Bstatic -L$(DESTDIR)$(USRLIBDIR)
 LDRESUME = -Bdynamic
-#endif
-#endif
-#endif
+#    endif
+#   endif
+#  endif
+
 install::
 	MakeDir($(DESTDIR)$(BINDIR))
 	RemoveFile(ProgramTargetName(xterm.inst))
@@ -266,8 +289,40 @@
 	$(PTYLIB))
 	$(INSTALL) -c $(INSTPGMFLAGS) $(INSTSETIDFLAGS) ProgramTargetName(xterm.inst) $(DESTDIR)$(BINDIR)/ProgramTargetName(xterm)
 	RemoveFile(ProgramTargetName(xterm.inst))
-#else
+
+# else
+#  if !InstallXtermSetGID || \
+      (!defined(LinuxArchitecture) && !defined(FreeBSDArchitecture))
+
 InstallProgramWithFlags(xterm,$(BINDIR),$(INSTSETIDFLAGS))
+
+#  else
+
+/*
+ * Install xterm either setgid utmp or setuid root.  Base this decision on the
+ * existence of a utmp group.  It would be better to check utmp file
+ * permissions, but we might not really know where utmp entries are stored.
+ */
+
+/* Override these */
+ INSTUIDFLAGS = $(INSTPGMFLAGS) InstUidFlags
+INSTUTMPFLAGS = $(INSTPGMFLAGS) InstUtmpFlags
+
+/* Install xterm setgid if there is a utmp group;  setuid otherwise */
+install::
+	MakeDir($(DESTDIR)$(BINDIR))
+	@if [ "`grep '^utmp:' /etc/group`" ]; then \
+	    InstallNamedInline(xterm,$(INSTUTMPFLAGS),$(BINDIR),xterm); \
+	else \
+	    InstallNamedInline(xterm,$(INSTUIDFLAGS),$(BINDIR),xterm); \
+	fi
+
+#  endif
+# endif
+#else
+
+InstallProgram(xterm,$(BINDIR))
+
 #endif
 
 InstallNamedProg(uxterm,uxterm,$(BINDIR))
Index: xc/programs/xterm/MANIFEST
diff -u xc/programs/xterm/MANIFEST:1.49 xc/programs/xterm/MANIFEST:1.50
--- xc/programs/xterm/MANIFEST:1.49	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/MANIFEST	Sun Jun 18 20:36:50 2006
@@ -1,4 +1,4 @@
-MANIFEST for xterm, version xterm-213
+MANIFEST for xterm, version xterm-214
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 256colres.h                     resource-definitions for 256-color mode
@@ -35,6 +35,7 @@
 configure.in                    template for generating configure script
 configure                       Configuration script for UNIX
 ctlseqs.ms                      documentation: Xterm Control Sequences
+ctlseqs.txt                     generated rendition of ctlseqs.ms
 cursor.c                        VT100 low-level cursor movement
 data.c                          global data declarations
 data.h                          global data external-definitions
Index: xc/programs/xterm/Makefile.in
diff -u xc/programs/xterm/Makefile.in:3.55 xc/programs/xterm/Makefile.in:3.56
--- xc/programs/xterm/Makefile.in:3.55	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/Makefile.in	Sun Jun 18 20:36:50 2006
@@ -1,6 +1,6 @@
-## $XTermId: Makefile.in,v 1.129 2006/04/21 18:57:58 tom Exp $
+## $XTermId: Makefile.in,v 1.133 2006/06/18 19:08:11 tom Exp $
 ##
-## $XFree86: xc/programs/xterm/Makefile.in,v 3.55 2006/04/30 21:55:39 dickey Exp $ ##
+## $XFree86: xc/programs/xterm/Makefile.in,v 3.56 2006/06/19 00:36:50 dickey Exp $ ##
 ##
 ## Copyright 2002-2005,2006 by Thomas E. Dickey
 ##
@@ -38,6 +38,10 @@
 AWK		= @AWK@
 LINK		= $(CC) $(CFLAGS)
 
+LN_S		= @LN_S@
+RM              = rm -f
+LINT		= @LINT@
+
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_SCRIPT	= @INSTALL_SCRIPT@
@@ -67,9 +71,6 @@
 
 #### End of system configuration section. ####
 
-RM              = rm -f
-LINT		= @LINT@
-
 DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
 LIBDIR		= $(DESTDIR)$(libdir)
@@ -162,14 +163,17 @@
 			$(INSTALL_SCRIPT) -m  755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm); \
 		fi'
 	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && rm -f @XTERM_SYMLINK@"
-	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && ln -s $(binary_xterm) @XTERM_SYMLINK@"
+	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && $(LN_S) $(binary_xterm) @XTERM_SYMLINK@"
 	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && echo '... created symbolic link:' && ls -l $(binary_xterm) @XTERM_SYMLINK@"
 
 install \
 install-man \
 install-full :: $(MANDIR)
-	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(APPSDIR)
-	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man   $(MANDIR)/$(actual_resize).$(manext) $(APPSDIR)
+	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(appsdir)
+	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man   $(MANDIR)/$(actual_resize).$(manext) $(appsdir)
+	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext)"
+	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext)"
+	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext)"
 
 @no_appsdir@install \
 @no_appsdir@install-app \
@@ -209,9 +213,6 @@
 	-$(RM) $(BINDIR)/$(binary_xterm)
 	-$(RM) $(BINDIR)/$(binary_resize)
 	-$(RM) $(BINDIR)/$(binary_uxterm)
-
-uninstall-bin \
-uninstall-full ::
 	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && rm -f @XTERM_SYMLINK@"
 
 uninstall \
@@ -219,6 +220,7 @@
 uninstall-full ::
 	-$(RM) $(MANDIR)/$(actual_xterm).$(manext)
 	-$(RM) $(MANDIR)/$(actual_resize).$(manext)
+	@-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext)"
 
 @no_appsdir@uninstall \
 @no_appsdir@uninstall-app \
@@ -246,7 +248,7 @@
 	GROFF_NO_SGR=stupid $(SHELL) -c "tbl ctlseqs.ms | groff -Thtml -ms" >$@
 
 ctlseqs.txt : ctlseqs.ms
-	GROFF_NO_SGR=stupid $(SHELL) -c "tbl ctlseqs.ms | nroff -Tascii -ms" >$@
+	GROFF_NO_SGR=stupid $(SHELL) -c "tbl ctlseqs.ms | nroff -Tascii -ms | col -bx" >$@
 
 ctlseqs.ps : ctlseqs.ms
 	tbl ctlseqs.ms | groff -ms >$@
Index: xc/programs/xterm/aclocal.m4
diff -u xc/programs/xterm/aclocal.m4:3.64 xc/programs/xterm/aclocal.m4:3.65
--- xc/programs/xterm/aclocal.m4:3.64	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/aclocal.m4	Sun Jun 18 20:36:50 2006
@@ -1,6 +1,6 @@
-dnl $XTermId: aclocal.m4,v 1.222 2006/04/02 20:41:59 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.226 2006/06/18 23:39:23 tom Exp $
 dnl
-dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.64 2006/04/10 00:34:36 dickey Exp $
+dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.65 2006/06/19 00:36:50 dickey Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -1199,6 +1199,44 @@
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_POSIX_SAVED_IDS version: 4 updated: 2006/06/18 19:38:48
+dnl ------------------
+dnl
+dnl Check first if saved-ids are always supported.  Some systems
+dnl such require runtime checks.
+AC_DEFUN([CF_POSIX_SAVED_IDS],
+[
+AC_CACHE_CHECK(if POSIX saved-ids are supported,cf_cv_posix_saved_ids,[
+AC_TRY_LINK(
+[
+#include <unistd.h>
+],[
+#if defined(_POSIX_SAVED_IDS) && (_POSIX_SAVED_IDS > 0)
+int x = seteuid(geteuid());
+#else
+make an error
+#endif
+],[cf_cv_posix_saved_ids=yes
+],[
+AC_TRY_RUN([
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <unistd.h>
+int main()
+{
+	long code = sysconf(_SC_SAVED_IDS);
+	exit ((code > 0) ? 0 : 1);
+}],
+	cf_cv_posix_saved_ids=yes,
+	cf_cv_posix_saved_ids=no,
+	cf_cv_posix_saved_ids=unknown)
+])
+])
+
+test "$cf_cv_posix_saved_ids" = yes && AC_DEFINE(HAVE_POSIX_SAVED_IDS)
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_POSIX_WAIT version: 2 updated: 2000/05/29 16:16:04
 dnl -------------
 dnl Check for POSIX wait support
Index: xc/programs/xterm/button.c
diff -u xc/programs/xterm/button.c:3.87 xc/programs/xterm/button.c:3.88
--- xc/programs/xterm/button.c:3.87	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/button.c	Sun Jun 18 20:36:50 2006
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.243 2006/04/09 20:22:15 tom Exp $ */
+/* $XTermId: button.c,v 1.245 2006/06/16 22:29:53 tom Exp $ */
 
 /*
  * Copyright 1999-2005,2006 by Thomas E. Dickey
@@ -51,7 +51,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/programs/xterm/button.c,v 3.87 2006/04/10 00:34:36 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/button.c,v 3.88 2006/06/19 00:36:50 dickey Exp $ */
 
 /*
 button.c	Handles button events in the terminal emulator.
@@ -87,6 +87,7 @@
 #endif
 
 #if OPT_WIDE_CHARS
+#include <ctype.h>
 #include <wcwidth.h>
 #else
 #define CharacterClass(value) \
@@ -1397,7 +1398,7 @@
     if (screen->base64_pad & 3)
 	tty_vwrite(screen->respond,
 		   (Char *) "===",
-		   4 - (screen->base64_pad & 3));
+		   (unsigned) (4 - (screen->base64_pad & 3)));
     screen->base64_count = 0;
     screen->base64_accu = 0;
     screen->base64_pad = 0;
@@ -2374,11 +2375,12 @@
 /*
  * Returns the number of cells on the range of rows.
  */
-static int
+static unsigned
 lengthOfLines(TScreen * screen, int firstRow, int lastRow)
 {
-    int length = 0;
+    unsigned length = 0;
     int n;
+
     for (n = firstRow; n <= lastRow; ++n) {
 	int value = LastTextCol(screen, n);
 	if (value >= 0)
@@ -2393,7 +2395,7 @@
  * the line.
  */
 static char *
-make_indexed_text(TScreen * screen, int row, int length, int *indexed)
+make_indexed_text(TScreen * screen, int row, unsigned length, int *indexed)
 {
     Char *result = 0;
     unsigned need = (length + 1);
@@ -2407,8 +2409,9 @@
     });
 
     if ((result = TypeCallocN(Char, need + 1)) != 0) {
-	int used = 0;
+	unsigned used = 0;
 	Char *last = result;
+
 	do {
 	    int col = 0;
 	    int limit = LastTextCol(screen, row);
@@ -2516,7 +2519,7 @@
 	if (regcomp(&preg, expr, REG_EXTENDED) == 0) {
 	    int firstRow = firstRowOfLine(screen, startc->row, True);
 	    int lastRow = lastRowOfLine(screen, firstRow);
-	    int size = lengthOfLines(screen, firstRow, lastRow);
+	    unsigned size = lengthOfLines(screen, firstRow, lastRow);
 	    int actual = cellToColumn(screen, startc);
 
 	    TRACE(("regcomp ok rows %d..%d bytes %d\n",
@@ -2944,7 +2947,7 @@
 }
 
 static void
-AppendStrToSelectionBuffer(TScreen * screen, Char * text, int len)
+AppendStrToSelectionBuffer(TScreen * screen, Char * text, unsigned len)
 {
     if (len != 0) {
 	int j = screen->selection_length + len;		/* New length */
Index: xc/programs/xterm/charproc.c
diff -u xc/programs/xterm/charproc.c:3.183 xc/programs/xterm/charproc.c:3.186
--- xc/programs/xterm/charproc.c:3.183	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/charproc.c	Sun Dec 10 10:58:35 2006
@@ -1,6 +1,6 @@
-/* $XTermId: charproc.c,v 1.674 2006/04/30 17:27:28 tom Exp $ */
+/* $XTermId: charproc.c,v 1.681 2006/06/19 22:45:57 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/charproc.c,v 3.183 2006/04/30 21:55:39 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/charproc.c,v 3.186 2006/12/10 15:58:35 tsi Exp $ */
 
 /*
 
@@ -595,6 +595,8 @@
 #if OPT_MOD_FKEYS
     Ires(XtNmodifyCursorKeys, XtCModifyCursorKeys,
 	 keyboard.modify_cursor_keys, 2),
+    Ires(XtNmodifyOtherKeys, XtCModifyOtherKeys,
+	 keyboard.modify_other_keys, 0),
 #endif
 
 #if OPT_NUM_LOCK
@@ -1451,7 +1453,7 @@
 	    /*
 	     * form feed, line feed, vertical tab
 	     */
-	    xtermAutoPrint((int) c);
+	    xtermAutoPrint(c);
 	    xtermIndex(screen, 1);
 	    if (term->flags & LINEFEED)
 		CarriageReturn(screen);
@@ -2810,8 +2812,8 @@
     }
 #ifdef DEBUG
     if (debug) {
-	fprintf(stderr, "v_write called with %d bytes (%d left over)",
-		len, v_bufptr - v_bufstr);
+	fprintf(stderr, "v_write called with %d bytes (%ld left over)",
+		len, (unsigned long)(v_bufptr - v_bufstr));
 	if (len > 1 && len < 10)
 	    fprintf(stderr, " \"%.*s\"", len, (char *) data);
 	fprintf(stderr, "\n");
@@ -2845,8 +2847,8 @@
 		/* possibly overlapping memmove here */
 #ifdef DEBUG
 		if (debug)
-		    fprintf(stderr, "moving data down %d\n",
-			    v_bufstr - v_buffer);
+		    fprintf(stderr, "moving data down %ld\n",
+			    (unsigned long)(v_bufstr - v_buffer));
 #endif
 		memmove(v_buffer, v_bufstr, (unsigned) (v_bufptr - v_bufstr));
 		v_bufptr -= v_bufstr - v_buffer;
@@ -2923,9 +2925,10 @@
 	}
 #ifdef DEBUG
 	if (debug)
-	    fprintf(stderr, "write called with %d, wrote %d\n",
+	    fprintf(stderr, "write called with %ld, wrote %d\n",
+		    (unsigned long)(
 		    v_bufptr - v_bufstr <= MAX_PTY_WRITE ?
-		    v_bufptr - v_bufstr : MAX_PTY_WRITE,
+		    v_bufptr - v_bufstr : MAX_PTY_WRITE),
 		    riten);
 #endif
 	v_bufstr += riten;
@@ -3179,7 +3182,7 @@
 	} else if (resource.sessionMgt) {
 	    /*
 	     * When session management is enabled, we should not block since
-	     * session related events can arrive any time. 
+	     * session related events can arrive any time.
 	     */
 	    select_timeout.tv_sec = 1;
 	    select_timeout.tv_usec = 0;
@@ -3545,7 +3548,7 @@
 	    Changename(icon_name);
 	}
 	if (zIconBeep > 0) {
-#if defined(HAVE_XKBBELL)
+#if defined(HAVE_XKB_BELL_EXT)
 	    XkbBell(XtDisplay(toplevel), VShellWindow, zIconBeep, XkbBI_Info);
 #else
 	    XBell(XtDisplay(toplevel), zIconBeep);
@@ -4690,7 +4693,7 @@
  * Swap buffer line pointers between alternate and regular screens.
  * visbuf contains pointers from allbuf or altbuf for the visible screen,
  * and pointers from allbuf for the saved lines.  That makes it simple to
- * scroll back over the saved lines without juggling pointers for the 
+ * scroll back over the saved lines without juggling pointers for the
  * regular and alternate screens.
  */
 void
@@ -5735,6 +5738,7 @@
     wnew->initflags = wnew->flags;
 
     init_Ires(keyboard.modify_cursor_keys);
+    init_Ires(keyboard.modify_other_keys);
 
     init_Ires(misc.appcursorDefault);
     if (wnew->misc.appcursorDefault)
@@ -5755,28 +5759,54 @@
     GC reverseCursorGC = screen->reversecursorGC;
     GC cursorOutlineGC = screen->cursoroutlineGC;
 
-    if (cursorGC)
-	XFreeGC(screen->display, cursorGC);
-    screen->cursorGC = 0;
-
-    if (fillCursorGC && (fillCursorGC != cursorGC))
-	XFreeGC(screen->display, fillCursorGC);
-    screen->fillCursorGC = 0;
-
-    if (reverseCursorGC
-	&& (reverseCursorGC != cursorGC)
-	&& (reverseCursorGC != fillCursorGC)
-	)
-	XFreeGC(screen->display, screen->reversecursorGC);
-    screen->reversecursorGC = 0;
-
-    if (cursorOutlineGC
-	&& (cursorOutlineGC != cursorGC)
-	&& (cursorOutlineGC != fillCursorGC)
-	&& (cursorOutlineGC != reverseCursorGC)
-	)
-	XFreeGC(screen->display, screen->cursoroutlineGC);
-    screen->cursoroutlineGC = 0;
+#if OPT_ISO_COLORS
+    if (screen->colorMode) {
+	if (cursorGC)
+	    XFreeGC(screen->display, cursorGC);
+	screen->cursorGC = 0;
+
+	if (fillCursorGC
+	    && (fillCursorGC != cursorGC))
+	    XFreeGC(screen->display, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if (reverseCursorGC
+	    && (reverseCursorGC != cursorGC)
+	    && (reverseCursorGC != fillCursorGC))
+	    XFreeGC(screen->display, screen->reversecursorGC);
+	screen->reversecursorGC = 0;
+
+	if (cursorOutlineGC
+	    && (cursorOutlineGC != cursorGC)
+	    && (cursorOutlineGC != fillCursorGC)
+	    && (cursorOutlineGC != reverseCursorGC))
+	    XFreeGC(screen->display, screen->cursoroutlineGC);
+	screen->cursoroutlineGC = 0;
+    } else
+#endif
+    {
+	if (cursorGC)
+	    XtReleaseGC((Widget) term, cursorGC);
+	screen->cursorGC = 0;
+
+	if ((fillCursorGC)
+	    && (fillCursorGC != cursorGC))
+	    XtReleaseGC((Widget) term, fillCursorGC);
+	screen->fillCursorGC = 0;
+
+	if ((reverseCursorGC)
+	    && (reverseCursorGC != cursorGC)
+	    && (reverseCursorGC != fillCursorGC))
+	    XtReleaseGC((Widget) term, reverseCursorGC);
+	screen->reversecursorGC = 0;
+
+	if ((cursorOutlineGC)
+	    && (cursorOutlineGC != cursorGC)
+	    && (cursorOutlineGC != fillCursorGC)
+	    && (cursorOutlineGC != reverseCursorGC))
+	    XtReleaseGC((Widget) term, cursorOutlineGC);
+	screen->cursoroutlineGC = 0;
+    }
 }
 
 #ifdef NO_LEAKS
Index: xc/programs/xterm/config.guess
diff -u xc/programs/xterm/config.guess:1.24 xc/programs/xterm/config.guess:1.25
--- xc/programs/xterm/config.guess:1.24	Tue Jan  3 21:10:20 2006
+++ xc/programs/xterm/config.guess	Sun Jun 18 20:36:51 2006
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-11-11'
+timestamp='2006-04-26'
 
 # 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
@@ -106,7 +107,7 @@
 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" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$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 ; } ;
@@ -206,6 +207,9 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@@ -214,11 +218,11 @@
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	    *4.0)
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	    *5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -290,7 +294,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -745,14 +749,14 @@
 	exit ;;
     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}"
+        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 ;;
     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}"
+        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 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -764,7 +768,14 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -773,14 +784,17 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -824,7 +838,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -851,7 +865,11 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,12 +888,16 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-    	echo or32-unknown-linux-gnu
-    	exit ;;
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -911,7 +933,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -919,6 +941,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -964,7 +989,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +999,11 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1024,7 +1053,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1192,8 +1221,8 @@
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-	    UNAME_PROCESSOR=i386
-	    UNAME_MACHINE=pc
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
@@ -1245,13 +1274,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1263,6 +1292,9 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
Index: xc/programs/xterm/config.sub
diff -u xc/programs/xterm/config.sub:1.24 xc/programs/xterm/config.sub:1.25
--- xc/programs/xterm/config.sub:1.24	Tue Jan  3 21:10:21 2006
+++ xc/programs/xterm/config.sub	Sun Jun 18 20:36:51 2006
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-11-13'
+timestamp='2006-05-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@
 # 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* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | 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/'`
     ;;
@@ -247,7 +249,8 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -265,18 +268,19 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
@@ -284,9 +288,6 @@
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -294,13 +295,16 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# 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*86 | x86_64)
-		basic_machine=$basic_machine-pc
-		;;
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -324,7 +328,7 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -344,19 +348,20 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -367,8 +372,6 @@
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -385,7 +388,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -704,6 +707,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -811,6 +817,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -867,6 +879,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1109,7 +1125,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1153,8 +1169,8 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1182,21 +1198,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -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* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | haiku*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1235,7 +1253,7 @@
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1284,7 +1302,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1348,6 +1366,9 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1357,8 +1378,8 @@
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1409,7 +1430,7 @@
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
Index: xc/programs/xterm/configure
diff -u xc/programs/xterm/configure:3.92 xc/programs/xterm/configure:3.93
--- xc/programs/xterm/configure:3.92	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/configure	Sun Jun 18 20:36:51 2006
@@ -2217,6 +2217,17 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+echo "$as_me:2220: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:2224: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:2227: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
+fi
+
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2234,7 +2245,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2237: checking for $ac_word" >&5
+echo "$as_me:2248: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2249,7 +2260,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:2252: found $ac_dir/$ac_word" >&5
+echo "$as_me:2263: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2257,10 +2268,10 @@
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2260: result: $LINT" >&5
+  echo "$as_me:2271: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2263: result: no" >&5
+  echo "$as_me:2274: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2269,10 +2280,10 @@
 
 ###	checks for UNIX variants that set C preprocessor variables
 
-echo "$as_me:2272: checking for AIX" >&5
+echo "$as_me:2283: checking for AIX" >&5
 echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 2275 "configure"
+#line 2286 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2281,24 +2292,24 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$as_me:2284: result: yes" >&5
+  echo "$as_me:2295: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$as_me:2291: result: no" >&5
+  echo "$as_me:2302: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo "$as_me:2296: checking for POSIXized ISC" >&5
+echo "$as_me:2307: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2301: result: yes" >&5
+  echo "$as_me:2312: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2312,14 +2323,14 @@
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2315: result: no" >&5
+  echo "$as_me:2326: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
 
 ###	checks for compiler characteristics
 
-echo "$as_me:2322: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2333: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2413,7 +2424,7 @@
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2416 "configure"
+#line 2427 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -2434,16 +2445,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2448: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2440: \$? = $ac_status" >&5
+  echo "$as_me:2451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2446: \$? = $ac_status" >&5
+  echo "$as_me:2457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -2456,7 +2467,7 @@
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2459: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2470: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -2538,7 +2549,7 @@
 fi
 fi
 
-echo "$as_me:2541: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2552: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2546,7 +2557,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2549 "configure"
+#line 2560 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2595,16 +2606,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2598: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2601: \$? = $ac_status" >&5
+  echo "$as_me:2612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2607: \$? = $ac_status" >&5
+  echo "$as_me:2618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2621,21 +2632,21 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2624: result: none needed" >&5
+    echo "$as_me:2635: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2627: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2638: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:2632: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2643: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2638 "configure"
+#line 2649 "configure"
 #include "confdefs.h"
 
 int
@@ -2693,16 +2704,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2696: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2699: \$? = $ac_status" >&5
+  echo "$as_me:2710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2705: \$? = $ac_status" >&5
+  echo "$as_me:2716: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2712,7 +2723,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2715: result: $ac_cv_c_const" >&5
+echo "$as_me:2726: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2739,7 +2750,7 @@
 #define PROG_EXT "$PROG_EXT"
 EOF
 
-echo "$as_me:2742: checking if $CC -U and -D options work together" >&5
+echo "$as_me:2753: checking if $CC -U and -D options work together" >&5
 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2748,7 +2759,7 @@
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2751 "configure"
+#line 2762 "configure"
 #include "confdefs.h"
 
 int
@@ -2767,16 +2778,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2781: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2773: \$? = $ac_status" >&5
+  echo "$as_me:2784: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2779: \$? = $ac_status" >&5
+  echo "$as_me:2790: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_cc_u_d_options=yes
@@ -2790,7 +2801,7 @@
 	CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:2793: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:2804: result: $cf_cv_cc_u_d_options" >&5
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=500
@@ -2816,14 +2827,14 @@
 	;;
 linux*|gnu*) #(vi
 
-echo "$as_me:2819: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2830: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 2826 "configure"
+#line 2837 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2838,16 +2849,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2841: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2844: \$? = $ac_status" >&5
+  echo "$as_me:2855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2850: \$? = $ac_status" >&5
+  echo "$as_me:2861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2856,7 +2867,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2859 "configure"
+#line 2870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2871,16 +2882,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2877: \$? = $ac_status" >&5
+  echo "$as_me:2888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2883: \$? = $ac_status" >&5
+  echo "$as_me:2894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -2895,7 +2906,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:2898: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2909: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -2922,14 +2933,14 @@
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:2925: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:2936: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2932 "configure"
+#line 2943 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2944,16 +2955,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2950: \$? = $ac_status" >&5
+  echo "$as_me:2961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2956: \$? = $ac_status" >&5
+  echo "$as_me:2967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -2962,7 +2973,7 @@
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 2965 "configure"
+#line 2976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -2977,16 +2988,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2983: \$? = $ac_status" >&5
+  echo "$as_me:2994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2989: \$? = $ac_status" >&5
+  echo "$as_me:3000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -3001,7 +3012,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3004: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3015: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -3035,16 +3046,16 @@
 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:3038: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3049: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "(line 3044) testing if the symbol is already defined go no further ..." 1>&5
+echo "(line 3055) testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3047 "configure"
+#line 3058 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3059,16 +3070,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3073: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3065: \$? = $ac_status" >&5
+  echo "$as_me:3076: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3071: \$? = $ac_status" >&5
+  echo "$as_me:3082: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -3089,7 +3100,7 @@
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3092 "configure"
+#line 3103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3104,16 +3115,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3110: \$? = $ac_status" >&5
+  echo "$as_me:3121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3116: \$? = $ac_status" >&5
+  echo "$as_me:3127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3124,15 +3135,15 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "(line 3127) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "(line 3138) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "(line 3132) testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "(line 3143) testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 3135 "configure"
+#line 3146 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -3147,16 +3158,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3153: \$? = $ac_status" >&5
+  echo "$as_me:3164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3159: \$? = $ac_status" >&5
+  echo "$as_me:3170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3172,7 +3183,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3175: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3186: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -3189,14 +3200,14 @@
 	;;
 esac
 
-echo "$as_me:3192: checking if SIGWINCH is defined" >&5
+echo "$as_me:3203: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3199 "configure"
+#line 3210 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3205,29 +3216,29 @@
 int
 main ()
 {
-int x = xSIGWINCH
+int x = SIGWINCH
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3225: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3217: \$? = $ac_status" >&5
+  echo "$as_me:3228: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3223: \$? = $ac_status" >&5
+  echo "$as_me:3234: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 3230 "configure"
+#line 3241 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -3245,16 +3256,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3251: \$? = $ac_status" >&5
+  echo "$as_me:3262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3257: \$? = $ac_status" >&5
+  echo "$as_me:3268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -3268,12 +3279,12 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:3271: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:3282: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:3275: checking to fixup SIGWINCH definition" >&5
-echo $ECHO_N "checking to fixup SIGWINCH definition... $ECHO_C" >&6
+echo "$as_me:3286: checking for actual SIGWINCH definition" >&5
+echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3283,7 +3294,7 @@
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3286 "configure"
+#line 3297 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -3305,16 +3316,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3308: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3311: \$? = $ac_status" >&5
+  echo "$as_me:3322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3317: \$? = $ac_status" >&5
+  echo "$as_me:3328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -3328,7 +3339,7 @@
 done
 
 fi
-echo "$as_me:3331: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:3342: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -3347,23 +3358,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3350: checking for $ac_header" >&5
+echo "$as_me:3361: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3356 "configure"
+#line 3367 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3360: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3371: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3366: \$? = $ac_status" >&5
+  echo "$as_me:3377: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3382,7 +3393,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3385: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3396: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3392,13 +3403,13 @@
 fi
 done
 
-echo "$as_me:3395: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:3406: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3401 "configure"
+#line 3412 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3414,16 +3425,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3420: \$? = $ac_status" >&5
+  echo "$as_me:3431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3426: \$? = $ac_status" >&5
+  echo "$as_me:3437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -3433,7 +3444,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3436: result: $ac_cv_header_time" >&5
+echo "$as_me:3447: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -3443,13 +3454,13 @@
 
 fi
 
-  echo "$as_me:3446: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:3457: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3452 "configure"
+#line 3463 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -3461,16 +3472,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3467: \$? = $ac_status" >&5
+  echo "$as_me:3478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3473: \$? = $ac_status" >&5
+  echo "$as_me:3484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -3481,7 +3492,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:3484: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:3495: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -3493,7 +3504,7 @@
 
 ###	checks for typedefs
 
-echo "$as_me:3496: checking for signal global datatype" >&5
+echo "$as_me:3507: checking for signal global datatype" >&5
 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
 if test "${cf_cv_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3505,7 +3516,7 @@
 		"int"
 	do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3508 "configure"
+#line 3519 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3528,16 +3539,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3534: \$? = $ac_status" >&5
+  echo "$as_me:3545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3540: \$? = $ac_status" >&5
+  echo "$as_me:3551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sig_atomic_t=$cf_type
 else
@@ -3551,20 +3562,20 @@
 
 fi
 
-echo "$as_me:3554: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:3565: result: $cf_cv_sig_atomic_t" >&5
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
 EOF
 
-echo "$as_me:3560: checking for size_t in <sys/types.h> or <stdio.h>" >&5
+echo "$as_me:3571: checking for size_t in <sys/types.h> or <stdio.h>" >&5
 echo $ECHO_N "checking for size_t in <sys/types.h> or <stdio.h>... $ECHO_C" >&6
 if test "${cf_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3567 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -3582,16 +3593,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3585: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3596: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3588: \$? = $ac_status" >&5
+  echo "$as_me:3599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3594: \$? = $ac_status" >&5
+  echo "$as_me:3605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_size_t=yes
 else
@@ -3603,19 +3614,19 @@
 
 fi
 
-echo "$as_me:3606: result: $cf_cv_type_size_t" >&5
+echo "$as_me:3617: result: $cf_cv_type_size_t" >&5
 echo "${ECHO_T}$cf_cv_type_size_t" >&6
 test $cf_cv_type_size_t = no && cat >>confdefs.h <<\EOF
 #define size_t unsigned
 EOF
 
-echo "$as_me:3612: checking for ANSI C header files" >&5
+echo "$as_me:3623: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3618 "configure"
+#line 3629 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3623,13 +3634,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3626: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3637: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3632: \$? = $ac_status" >&5
+  echo "$as_me:3643: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3651,7 +3662,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 <<_ACEOF
-#line 3654 "configure"
+#line 3665 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3669,7 +3680,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 <<_ACEOF
-#line 3672 "configure"
+#line 3683 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3690,7 +3701,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3693 "configure"
+#line 3704 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3716,15 +3727,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3722: \$? = $ac_status" >&5
+  echo "$as_me:3733: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3727: \$? = $ac_status" >&5
+  echo "$as_me:3738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3737,7 +3748,7 @@
 fi
 fi
 fi
-echo "$as_me:3740: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3751: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -3753,28 +3764,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3756: checking for $ac_header" >&5
+echo "$as_me:3767: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3762 "configure"
+#line 3773 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3771: \$? = $ac_status" >&5
+  echo "$as_me:3782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -3784,7 +3795,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3787: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3798: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3794,13 +3805,13 @@
 fi
 done
 
-echo "$as_me:3797: checking for time_t" >&5
+echo "$as_me:3808: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3803 "configure"
+#line 3814 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3815,16 +3826,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3821: \$? = $ac_status" >&5
+  echo "$as_me:3832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3827: \$? = $ac_status" >&5
+  echo "$as_me:3838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -3834,7 +3845,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3837: result: $ac_cv_type_time_t" >&5
+echo "$as_me:3848: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 if test $ac_cv_type_time_t = yes; then
   :
@@ -3846,13 +3857,13 @@
 
 fi
 
-echo "$as_me:3849: checking for mode_t" >&5
+echo "$as_me:3860: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3855 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3867,16 +3878,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3870: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3881: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3873: \$? = $ac_status" >&5
+  echo "$as_me:3884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3879: \$? = $ac_status" >&5
+  echo "$as_me:3890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -3886,7 +3897,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3889: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:3900: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -3898,13 +3909,13 @@
 
 fi
 
-echo "$as_me:3901: checking for pid_t" >&5
+echo "$as_me:3912: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3907 "configure"
+#line 3918 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3919,16 +3930,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3933: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3925: \$? = $ac_status" >&5
+  echo "$as_me:3936: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3931: \$? = $ac_status" >&5
+  echo "$as_me:3942: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -3938,7 +3949,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3941: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:3952: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -3950,13 +3961,13 @@
 
 fi
 
-echo "$as_me:3953: checking for uid_t in sys/types.h" >&5
+echo "$as_me:3964: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3959 "configure"
+#line 3970 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -3970,7 +3981,7 @@
 rm -f conftest*
 
 fi
-echo "$as_me:3973: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:3984: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -3984,6 +3995,58 @@
 
 fi
 
+echo "$as_me:3998: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+if test "${ac_cv_type_off_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4004 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+if ((off_t *) 0)
+  return 0;
+if (sizeof (off_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4019: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4022: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4025: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4028: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_off_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_off_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:4038: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6
+if test $ac_cv_type_off_t = yes; then
+  :
+else
+
+cat >>confdefs.h <<EOF
+#define off_t long
+EOF
+
+fi
+
 ###	checks for library functions
 
 for ac_func in \
@@ -4001,13 +4064,13 @@
 	wcwidth
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4004: checking for $ac_func" >&5
+echo "$as_me:4067: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4010 "configure"
+#line 4073 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4038,16 +4101,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4044: \$? = $ac_status" >&5
+  echo "$as_me:4107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4050: \$? = $ac_status" >&5
+  echo "$as_me:4113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4057,7 +4120,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4060: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4123: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4067,13 +4130,13 @@
 fi
 done
 
-echo "$as_me:4070: checking for memmove" >&5
+echo "$as_me:4133: checking for memmove" >&5
 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
 if test "${ac_cv_func_memmove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4076 "configure"
+#line 4139 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */
@@ -4104,16 +4167,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4110: \$? = $ac_status" >&5
+  echo "$as_me:4173: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4116: \$? = $ac_status" >&5
+  echo "$as_me:4179: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else
@@ -4123,19 +4186,19 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4126: result: $ac_cv_func_memmove" >&5
+echo "$as_me:4189: result: $ac_cv_func_memmove" >&5
 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 if test $ac_cv_func_memmove = yes; then
   :
 else
 
-echo "$as_me:4132: checking for bcopy" >&5
+echo "$as_me:4195: checking for bcopy" >&5
 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
 if test "${ac_cv_func_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4138 "configure"
+#line 4201 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */
@@ -4166,16 +4229,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4172: \$? = $ac_status" >&5
+  echo "$as_me:4235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4178: \$? = $ac_status" >&5
+  echo "$as_me:4241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else
@@ -4185,11 +4248,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4188: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:4251: result: $ac_cv_func_bcopy" >&5
 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 if test $ac_cv_func_bcopy = yes; then
 
-	echo "$as_me:4192: checking if bcopy does overlapping moves" >&5
+	echo "$as_me:4255: checking if bcopy does overlapping moves" >&5
 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
 if test "${cf_cv_good_bcopy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4199,7 +4262,7 @@
   cf_cv_good_bcopy=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4202 "configure"
+#line 4265 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4213,15 +4276,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4219: \$? = $ac_status" >&5
+  echo "$as_me:4282: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4224: \$? = $ac_status" >&5
+  echo "$as_me:4287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else
@@ -4234,7 +4297,7 @@
 fi
 
 fi
-echo "$as_me:4237: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:4300: result: $cf_cv_good_bcopy" >&5
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
@@ -4258,23 +4321,23 @@
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4261: checking for $ac_header" >&5
+echo "$as_me:4324: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4267 "configure"
+#line 4330 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4271: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4334: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4277: \$? = $ac_status" >&5
+  echo "$as_me:4340: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4293,7 +4356,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4296: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4359: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4303,14 +4366,14 @@
 fi
 done
 
-echo "$as_me:4306: checking for lastlog path" >&5
+echo "$as_me:4369: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 4313 "configure"
+#line 4376 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4330,16 +4393,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4336: \$? = $ac_status" >&5
+  echo "$as_me:4399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4342: \$? = $ac_status" >&5
+  echo "$as_me:4405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -4354,13 +4417,13 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4357: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:4420: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:4363: checking for utmp implementation" >&5
+echo "$as_me:4426: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4377,7 +4440,7 @@
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4380 "configure"
+#line 4443 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -4391,16 +4454,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4397: \$? = $ac_status" >&5
+  echo "$as_me:4460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4403: \$? = $ac_status" >&5
+  echo "$as_me:4466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -4409,7 +4472,7 @@
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4412 "configure"
+#line 4475 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -4423,16 +4486,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4429: \$? = $ac_status" >&5
+  echo "$as_me:4492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4435: \$? = $ac_status" >&5
+  echo "$as_me:4498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -4447,7 +4510,7 @@
 done
 
 fi
-echo "$as_me:4450: result: $cf_cv_have_utmp" >&5
+echo "$as_me:4513: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -4460,14 +4523,14 @@
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:4463: checking if utmp.ut_host is declared" >&5
+echo "$as_me:4526: checking if utmp.ut_host is declared" >&5
 echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4470 "configure"
+#line 4533 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4481,16 +4544,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4487: \$? = $ac_status" >&5
+  echo "$as_me:4550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4493: \$? = $ac_status" >&5
+  echo "$as_me:4556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -4502,7 +4565,7 @@
 
 fi
 
-echo "$as_me:4505: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:4568: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -4511,7 +4574,7 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:4514: checking if utmp.ut_name is declared" >&5
+echo "$as_me:4577: checking if utmp.ut_name is declared" >&5
 echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4528,7 +4591,7 @@
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4531 "configure"
+#line 4594 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -4542,16 +4605,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4548: \$? = $ac_status" >&5
+  echo "$as_me:4611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4554: \$? = $ac_status" >&5
+  echo "$as_me:4617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -4563,12 +4626,12 @@
 done
 
 fi
-echo "$as_me:4566: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:4629: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:4571: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:4634: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -4582,7 +4645,7 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:4585: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:4648: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4595,7 +4658,7 @@
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 4598 "configure"
+#line 4661 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4609,16 +4672,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4615: \$? = $ac_status" >&5
+  echo "$as_me:4678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4621: \$? = $ac_status" >&5
+  echo "$as_me:4684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -4631,7 +4694,7 @@
 done
 
 fi
-echo "$as_me:4634: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:4697: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -4646,14 +4709,14 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:4649: checking if utmp.ut_xtime is declared" >&5
+echo "$as_me:4712: checking if utmp.ut_xtime is declared" >&5
 echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4656 "configure"
+#line 4719 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4667,23 +4730,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4673: \$? = $ac_status" >&5
+  echo "$as_me:4736: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4679: \$? = $ac_status" >&5
+  echo "$as_me:4742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 4686 "configure"
+#line 4749 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4697,16 +4760,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4703: \$? = $ac_status" >&5
+  echo "$as_me:4766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4709: \$? = $ac_status" >&5
+  echo "$as_me:4772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -4720,7 +4783,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4723: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:4786: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -4737,14 +4800,14 @@
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:4740: checking if utmp.ut_session is declared" >&5
+echo "$as_me:4803: checking if utmp.ut_session is declared" >&5
 echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4747 "configure"
+#line 4810 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4758,16 +4821,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4764: \$? = $ac_status" >&5
+  echo "$as_me:4827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4770: \$? = $ac_status" >&5
+  echo "$as_me:4833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -4778,7 +4841,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4781: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:4844: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -4788,7 +4851,7 @@
 fi
 fi
 
-echo "$as_me:4791: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:4854: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4796,7 +4859,7 @@
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4799 "configure"
+#line 4862 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4815,16 +4878,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4881: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4821: \$? = $ac_status" >&5
+  echo "$as_me:4884: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4827: \$? = $ac_status" >&5
+  echo "$as_me:4890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -4835,7 +4898,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:4838: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:4901: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -4846,23 +4909,23 @@
 for ac_header in lastlog.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4849: checking for $ac_header" >&5
+echo "$as_me:4912: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4855 "configure"
+#line 4918 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4859: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4922: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4865: \$? = $ac_status" >&5
+  echo "$as_me:4928: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4881,7 +4944,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4884: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4947: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4891,7 +4954,7 @@
 fi
 done
 
-echo "$as_me:4894: checking for struct lastlog" >&5
+echo "$as_me:4957: checking for struct lastlog" >&5
 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6
 if test "${cf_cv_struct_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4902,7 +4965,7 @@
 cf_cv_struct_lastlog=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4905 "configure"
+#line 4968 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4916,15 +4979,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4922: \$? = $ac_status" >&5
+  echo "$as_me:4985: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4927: \$? = $ac_status" >&5
+  echo "$as_me:4990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cf_cv_struct_lastlog=yes
@@ -4938,13 +5001,106 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4941: result: $cf_cv_struct_lastlog" >&5
+echo "$as_me:5004: result: $cf_cv_struct_lastlog" >&5
 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6
 
 test $cf_cv_struct_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_STRUCT_LASTLOG 1
 EOF
 
+echo "$as_me:5011: checking if POSIX saved-ids are supported" >&5
+echo $ECHO_N "checking if POSIX saved-ids are supported... $ECHO_C" >&6
+if test "${cf_cv_posix_saved_ids+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 5018 "configure"
+#include "confdefs.h"
+
+#include <unistd.h>
+
+int
+main ()
+{
+
+#if defined(_POSIX_SAVED_IDS) && (_POSIX_SAVED_IDS > 0)
+int x = seteuid(geteuid());
+#else
+make an error
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5038: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5041: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5044: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5047: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_posix_saved_ids=yes
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+if test "$cross_compiling" = yes; then
+  cf_cv_posix_saved_ids=unknown
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5059 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <unistd.h>
+int main()
+{
+	long code = sysconf(_SC_SAVED_IDS);
+	exit ((code > 0) ? 0 : 1);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:5073: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5076: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:5078: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5081: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_posix_saved_ids=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_posix_saved_ids=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+fi
+echo "$as_me:5097: result: $cf_cv_posix_saved_ids" >&5
+echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6
+
+test "$cf_cv_posix_saved_ids" = yes && cat >>confdefs.h <<\EOF
+#define HAVE_POSIX_SAVED_IDS 1
+EOF
+
 # compute a reasonable value for $TERM to give tgetent(), since we may be
 # running in 'screen', which sets $TERMCAP to a specific entry that is not
 # necessarily in /etc/termcap - unsetenv is not portable, so we cannot simply
@@ -4953,7 +5109,7 @@
 test -n "$TERMCAP" && cf_TERMVAR="$TERM"
 test -z "$cf_TERMVAR" && cf_TERMVAR=vt100
 
-echo "$as_me:4956: checking if we want full tgetent function" >&5
+echo "$as_me:5112: checking if we want full tgetent function" >&5
 echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6
 
 # Check whether --enable-full-tgetent or --disable-full-tgetent was given.
@@ -4970,7 +5126,7 @@
   cf_full_tgetent=yes
 
 fi;
-echo "$as_me:4973: result: $cf_full_tgetent" >&5
+echo "$as_me:5129: result: $cf_full_tgetent" >&5
 echo "${ECHO_T}$cf_full_tgetent" >&6
 
 if test "$cf_full_tgetent" = yes ; then
@@ -4979,7 +5135,7 @@
 	cf_test_message="tgetent"
 fi
 
-echo "$as_me:4982: checking for $cf_test_message function" >&5
+echo "$as_me:5138: checking for $cf_test_message function" >&5
 echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
 if test "${cf_cv_lib_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5001,7 +5157,7 @@
   echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5004 "configure"
+#line 5160 "configure"
 #include "confdefs.h"
 
 /* terminfo implementations ignore the buffer argument, making it useless for
@@ -5016,15 +5172,15 @@
 	exit($cf_TERMTST); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5022: \$? = $ac_status" >&5
+  echo "$as_me:5178: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5027: \$? = $ac_status" >&5
+  echo "$as_me:5183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5
 	 if test -n "$cf_termlib" ; then
@@ -5045,7 +5201,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:5048: result: $cf_cv_lib_tgetent" >&5
+echo "$as_me:5204: result: $cf_cv_lib_tgetent" >&5
 echo "${ECHO_T}$cf_cv_lib_tgetent" >&6
 
 # If we found a working tgetent(), set LIBS and check for termcap.h.
@@ -5059,7 +5215,7 @@
 EOF
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 5062 "configure"
+#line 5218 "configure"
 #include "confdefs.h"
 
 #include <termcap.h>
@@ -5075,16 +5231,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5081: \$? = $ac_status" >&5
+  echo "$as_me:5237: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5087: \$? = $ac_status" >&5
+  echo "$as_me:5243: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define HAVE_TERMCAP_H 1
@@ -5101,7 +5257,7 @@
         # a crippled one.  A crippled tgetent() is still useful to
         # validate values for the TERM environment variable given to
         # child processes.
-	echo "$as_me:5104: checking for partial tgetent function" >&5
+	echo "$as_me:5260: checking for partial tgetent function" >&5
 echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6
 if test "${cf_cv_lib_part_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5111,7 +5267,7 @@
 	for cf_termlib in $cf_TERMLIB ; do
 		LIBS="$cf_save_LIBS -l$cf_termlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5114 "configure"
+#line 5270 "configure"
 #include "confdefs.h"
 
 int
@@ -5123,16 +5279,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5129: \$? = $ac_status" >&5
+  echo "$as_me:5285: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5135: \$? = $ac_status" >&5
+  echo "$as_me:5291: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   echo "there is a terminfo/tgetent in $cf_termlib" 1>&5
 			 cf_cv_lib_part_tgetent="-l$cf_termlib"
@@ -5146,7 +5302,7 @@
 	LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:5149: result: $cf_cv_lib_part_tgetent" >&5
+echo "$as_me:5305: result: $cf_cv_lib_part_tgetent" >&5
 echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6
 
 	if test "$cf_cv_lib_part_tgetent" != no ; then
@@ -5155,23 +5311,23 @@
 for ac_header in termcap.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5158: checking for $ac_header" >&5
+echo "$as_me:5314: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5164 "configure"
+#line 5320 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5168: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5324: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5174: \$? = $ac_status" >&5
+  echo "$as_me:5330: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5190,7 +5346,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5193: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5349: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -5209,7 +5365,7 @@
 	fi
 fi
 
-echo "$as_me:5212: checking for directory to install resource files" >&5
+echo "$as_me:5368: checking for directory to install resource files" >&5
 echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6
 
 # Check whether --with-app-defaults or --without-app-defaults was given.
@@ -5238,7 +5394,7 @@
   withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%`
   ;;
 *)
-  { { echo "$as_me:5241: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:5397: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -5246,7 +5402,7 @@
 
 eval appsdir="$withval"
 
-echo "$as_me:5249: result: $appsdir" >&5
+echo "$as_me:5405: result: $appsdir" >&5
 echo "${ECHO_T}$appsdir" >&6
 
 no_appsdir=
@@ -5254,7 +5410,7 @@
 
 # inherit SINSTALL_OPTS from environment to allow packager to customize it.
 
-echo "$as_me:5257: checking for install-permissions reference" >&5
+echo "$as_me:5413: checking for install-permissions reference" >&5
 echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6
 
 # Check whether --with-reference or --without-reference was given.
@@ -5264,7 +5420,7 @@
 else
   with_reference=xterm
 fi;
-echo "$as_me:5267: result: $with_reference" >&5
+echo "$as_me:5423: result: $with_reference" >&5
 echo "${ECHO_T}$with_reference" >&6
 
 with_full_paths=yes
@@ -5274,7 +5430,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:5277: checking for $ac_word" >&5
+echo "$as_me:5433: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XTERM_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5291,7 +5447,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XTERM_PATH="$ac_dir/$ac_word"
-   echo "$as_me:5294: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5450: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -5302,10 +5458,10 @@
 XTERM_PATH=$ac_cv_path_XTERM_PATH
 
 if test -n "$XTERM_PATH"; then
-  echo "$as_me:5305: result: $XTERM_PATH" >&5
+  echo "$as_me:5461: result: $XTERM_PATH" >&5
 echo "${ECHO_T}$XTERM_PATH" >&6
 else
-  echo "$as_me:5308: result: no" >&5
+  echo "$as_me:5464: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5367,7 +5523,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 5370) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 5526) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define XTERM_PATH_PATH "$cf_path_prog"
@@ -5387,7 +5543,7 @@
 if test "$program_transform_name" != "'s,,,'" ; then
 cf_name=`echo "$program_transform_name" | sed -e 's,\\$\\$,$,g'`
 cf_name=`echo xterm |sed -e "$cf_name"`
-echo "$as_me:5390: checking for symbolic link to create to $cf_name" >&5
+echo "$as_me:5546: checking for symbolic link to create to $cf_name" >&5
 echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6
 
 # Check whether --with-xterm-symlink or --without-xterm-symlink was given.
@@ -5397,7 +5553,7 @@
 else
   with_symlink=xterm
 fi;
-echo "$as_me:5400: result: $with_symlink" >&5
+echo "$as_me:5556: result: $with_symlink" >&5
 echo "${ECHO_T}$with_symlink" >&6
 test -n "$with_symlink" && \
 	test "$with_symlink" != no && \
@@ -5405,7 +5561,7 @@
 	XTERM_SYMLINK="$with_symlink"
 fi
 
-echo "$as_me:5408: checking if you want to disable setuid" >&5
+echo "$as_me:5564: checking if you want to disable setuid" >&5
 echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6
 
 # Check whether --enable-setuid or --disable-setuid was given.
@@ -5422,10 +5578,10 @@
   disable_setuid=no
 
 fi;
-echo "$as_me:5425: result: $disable_setuid" >&5
+echo "$as_me:5581: result: $disable_setuid" >&5
 echo "${ECHO_T}$disable_setuid" >&6
 
-echo "$as_me:5428: checking if you want to run xterm setuid to a given user" >&5
+echo "$as_me:5584: checking if you want to run xterm setuid to a given user" >&5
 echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6
 
 # Check whether --with-setuid or --without-setuid was given.
@@ -5435,7 +5591,7 @@
 else
   use_given_setuid=no
 fi;
-echo "$as_me:5438: result: $use_given_setuid" >&5
+echo "$as_me:5594: result: $use_given_setuid" >&5
 echo "${ECHO_T}$use_given_setuid" >&6
 
 if test "$use_given_setuid" != no ; then
@@ -5447,7 +5603,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid"
 fi
 
-echo "$as_me:5450: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
+echo "$as_me:5606: checking if you want to run xterm setgid to match utmp/utmpx file" >&5
 echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6
 
 # Check whether --with-utmp-setgid or --without-utmp-setgid was given.
@@ -5457,14 +5613,14 @@
 else
   use_utmp_setgid=no
 fi;
-echo "$as_me:5460: result: $use_utmp_setgid" >&5
+echo "$as_me:5616: result: $use_utmp_setgid" >&5
 echo "${ECHO_T}$use_utmp_setgid" >&6
 
 if test "$use_utmp_setgid" != no ; then
 	if test "$use_utmp_setgid" = yes ; then
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:5467: checking for utmp/utmpx group" >&5
+echo "$as_me:5623: checking for utmp/utmpx group" >&5
 echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6
 if test "${cf_cv_utmp_group+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5506,10 +5662,10 @@
 done
 
 fi
-echo "$as_me:5509: result: $cf_cv_utmp_group" >&5
+echo "$as_me:5665: result: $cf_cv_utmp_group" >&5
 echo "${ECHO_T}$cf_cv_utmp_group" >&6
 else
-	{ { echo "$as_me:5512: error: cannot find utmp group" >&5
+	{ { echo "$as_me:5668: error: cannot find utmp group" >&5
 echo "$as_me: error: cannot find utmp group" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5517,6 +5673,10 @@
 	else
 		cf_cv_utmp_group=$use_utmp_setgid
 	fi
+	if test "$cf_cv_posix_saved_ids" != yes ; then
+		{ echo "$as_me:5677: WARNING: Your system does not support POSIX saved-ids" >&5
+echo "$as_me: WARNING: Your system does not support POSIX saved-ids" >&2;}
+	fi
 	cat >>confdefs.h <<\EOF
 #define USE_UTMP_SETGID 1
 EOF
@@ -5524,7 +5684,7 @@
 	SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group"
 fi
 
-echo "$as_me:5527: checking if you want to link with utempter" >&5
+echo "$as_me:5687: checking if you want to link with utempter" >&5
 echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6
 
 # Check whether --with-utempter or --without-utempter was given.
@@ -5534,12 +5694,12 @@
 else
   use_utempter=no
 fi;
-echo "$as_me:5537: result: $use_utempter" >&5
+echo "$as_me:5697: result: $use_utempter" >&5
 echo "${ECHO_T}$use_utempter" >&6
 
 if test "$use_utempter" = yes ; then
 
-echo "$as_me:5542: checking if we can link with utempter library" >&5
+echo "$as_me:5702: checking if we can link with utempter library" >&5
 echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6
 if test "${cf_cv_have_utempter+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5548,7 +5708,7 @@
 cf_save_LIBS="$LIBS"
 LIBS="-lutempter $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5551 "configure"
+#line 5711 "configure"
 #include "confdefs.h"
 
 #include <utempter.h>
@@ -5565,16 +5725,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5571: \$? = $ac_status" >&5
+  echo "$as_me:5731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5577: \$? = $ac_status" >&5
+  echo "$as_me:5737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_have_utempter=yes
@@ -5588,7 +5748,7 @@
 LIBS="$cf_save_LIBS"
 
 fi
-echo "$as_me:5591: result: $cf_cv_have_utempter" >&5
+echo "$as_me:5751: result: $cf_cv_have_utempter" >&5
 echo "${ECHO_T}$cf_cv_have_utempter" >&6
 if test "$cf_cv_have_utempter" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -5603,14 +5763,14 @@
 
 ###	checks for external data
 
-echo "$as_me:5606: checking if external errno is declared" >&5
+echo "$as_me:5766: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 5613 "configure"
+#line 5773 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -5628,16 +5788,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5634: \$? = $ac_status" >&5
+  echo "$as_me:5794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5640: \$? = $ac_status" >&5
+  echo "$as_me:5800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -5648,7 +5808,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5651: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:5811: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -5663,14 +5823,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:5666: checking if external errno exists" >&5
+echo "$as_me:5826: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 5673 "configure"
+#line 5833 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -5685,16 +5845,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5848: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5691: \$? = $ac_status" >&5
+  echo "$as_me:5851: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5697: \$? = $ac_status" >&5
+  echo "$as_me:5857: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -5705,7 +5865,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5708: result: $cf_cv_have_errno" >&5
+echo "$as_me:5868: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -5718,7 +5878,7 @@
 
 fi
 
-echo "$as_me:5721: checking for explicit tty group name" >&5
+echo "$as_me:5881: checking for explicit tty group name" >&5
 echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6
 
 # Check whether --with-tty-group or --without-tty-group was given.
@@ -5730,11 +5890,11 @@
 fi;
 test -z "$cf_tty_group"    && cf_tty_group=auto...
 test "$cf_tty_group" = yes && cf_tty_group=auto...
-echo "$as_me:5733: result: $cf_tty_group" >&5
+echo "$as_me:5893: result: $cf_tty_group" >&5
 echo "${ECHO_T}$cf_tty_group" >&6
 
 if test "$cf_tty_group" = "auto..." ; then
-echo "$as_me:5737: checking for tty group name" >&5
+echo "$as_me:5897: checking for tty group name" >&5
 echo $ECHO_N "checking for tty group name... $ECHO_C" >&6
 if test "${cf_cv_tty_group_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5787,7 +5947,7 @@
 fi
 
 fi
-echo "$as_me:5790: result: $cf_cv_tty_group_name" >&5
+echo "$as_me:5950: result: $cf_cv_tty_group_name" >&5
 echo "${ECHO_T}$cf_cv_tty_group_name" >&6
 cf_tty_group="$cf_cv_tty_group_name"
 else
@@ -5806,7 +5966,7 @@
 # does apply to the device.  We cannot perform this test if we are in batch
 # mode, or if we are cross-compiling.
 
-echo "$as_me:5809: checking if we may use the $cf_tty_group group" >&5
+echo "$as_me:5969: checking if we may use the $cf_tty_group group" >&5
 echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6
 if test "${cf_cv_tty_group+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5819,7 +5979,7 @@
   cf_cv_tty_group=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5822 "configure"
+#line 5982 "configure"
 #include "confdefs.h"
 
 #include <unistd.h>
@@ -5845,15 +6005,15 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5851: \$? = $ac_status" >&5
+  echo "$as_me:6011: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5856: \$? = $ac_status" >&5
+  echo "$as_me:6016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tty_group=yes
 else
@@ -5871,11 +6031,11 @@
 fi
 
 fi
-echo "$as_me:5874: result: $cf_cv_tty_group" >&5
+echo "$as_me:6034: result: $cf_cv_tty_group" >&5
 echo "${ECHO_T}$cf_cv_tty_group" >&6
 
 if test $cf_cv_tty_group = no ; then
-	{ echo "$as_me:5878: WARNING: Cannot use $cf_tty_group group" >&5
+	{ echo "$as_me:6038: WARNING: Cannot use $cf_tty_group group" >&5
 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;}
 else
 	cat >>confdefs.h <<\EOF
@@ -5886,13 +6046,13 @@
 
 ###	checks for system services and user specified options
 
-echo "$as_me:5889: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "$as_me:6049: checking for sys/wait.h that is POSIX.1 compatible" >&5
 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5895 "configure"
+#line 6055 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -5914,16 +6074,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5920: \$? = $ac_status" >&5
+  echo "$as_me:6080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5926: \$? = $ac_status" >&5
+  echo "$as_me:6086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_sys_wait_h=yes
 else
@@ -5933,7 +6093,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5936: result: $ac_cv_header_sys_wait_h" >&5
+echo "$as_me:6096: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
 
@@ -5943,14 +6103,14 @@
 
 fi
 
-echo "$as_me:5946: checking for POSIX wait functions" >&5
+echo "$as_me:6106: checking for POSIX wait functions" >&5
 echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6
 if test "${cf_cv_posix_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 5953 "configure"
+#line 6113 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5973,16 +6133,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5979: \$? = $ac_status" >&5
+  echo "$as_me:6139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5985: \$? = $ac_status" >&5
+  echo "$as_me:6145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_wait=yes
 else
@@ -5993,20 +6153,20 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:5996: result: $cf_cv_posix_wait" >&5
+echo "$as_me:6156: result: $cf_cv_posix_wait" >&5
 echo "${ECHO_T}$cf_cv_posix_wait" >&6
 test "$cf_cv_posix_wait" = yes && cat >>confdefs.h <<\EOF
 #define USE_POSIX_WAIT 1
 EOF
 
-echo "$as_me:6002: checking if external sys_nerr is declared" >&5
+echo "$as_me:6162: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6009 "configure"
+#line 6169 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6024,16 +6184,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6187: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6030: \$? = $ac_status" >&5
+  echo "$as_me:6190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6036: \$? = $ac_status" >&5
+  echo "$as_me:6196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -6044,7 +6204,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6047: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6207: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -6059,14 +6219,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6062: checking if external sys_nerr exists" >&5
+echo "$as_me:6222: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6069 "configure"
+#line 6229 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -6081,16 +6241,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6084: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6087: \$? = $ac_status" >&5
+  echo "$as_me:6247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6093: \$? = $ac_status" >&5
+  echo "$as_me:6253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -6101,7 +6261,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6104: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6264: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -6114,14 +6274,14 @@
 
 fi
 
-echo "$as_me:6117: checking if external sys_errlist is declared" >&5
+echo "$as_me:6277: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6124 "configure"
+#line 6284 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -6139,16 +6299,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6145: \$? = $ac_status" >&5
+  echo "$as_me:6305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6151: \$? = $ac_status" >&5
+  echo "$as_me:6311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -6159,7 +6319,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6162: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:6322: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -6174,14 +6334,14 @@
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:6177: checking if external sys_errlist exists" >&5
+echo "$as_me:6337: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 6184 "configure"
+#line 6344 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -6196,16 +6356,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6202: \$? = $ac_status" >&5
+  echo "$as_me:6362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6208: \$? = $ac_status" >&5
+  echo "$as_me:6368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -6216,7 +6376,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6219: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:6379: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -6235,23 +6395,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6238: checking for $ac_header" >&5
+echo "$as_me:6398: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6244 "configure"
+#line 6404 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6248: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6408: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6254: \$? = $ac_status" >&5
+  echo "$as_me:6414: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6270,7 +6430,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6273: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6433: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -6280,14 +6440,14 @@
 fi
 done
 
-echo "$as_me:6283: checking if we should define SYSV" >&5
+echo "$as_me:6443: checking if we should define SYSV" >&5
 echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6
 if test "${cf_cv_sysv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6290 "configure"
+#line 6450 "configure"
 #include "confdefs.h"
 
 #undef  SYSV
@@ -6325,16 +6485,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6331: \$? = $ac_status" >&5
+  echo "$as_me:6491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6337: \$? = $ac_status" >&5
+  echo "$as_me:6497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv=yes
 else
@@ -6345,13 +6505,13 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6348: result: $cf_cv_sysv" >&5
+echo "$as_me:6508: result: $cf_cv_sysv" >&5
 echo "${ECHO_T}$cf_cv_sysv" >&6
 test "$cf_cv_sysv" = yes && cat >>confdefs.h <<\EOF
 #define SYSV 1
 EOF
 
-echo "$as_me:6354: checking for elf_begin in -lelf" >&5
+echo "$as_me:6514: checking for elf_begin in -lelf" >&5
 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6359,7 +6519,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6362 "configure"
+#line 6522 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6378,16 +6538,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6541: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6384: \$? = $ac_status" >&5
+  echo "$as_me:6544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6390: \$? = $ac_status" >&5
+  echo "$as_me:6550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_elf_elf_begin=yes
 else
@@ -6398,18 +6558,18 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6401: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "$as_me:6561: result: $ac_cv_lib_elf_elf_begin" >&5
 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6
 if test $ac_cv_lib_elf_elf_begin = yes; then
 
-echo "$as_me:6405: checking if this is an SVR4 system" >&5
+echo "$as_me:6565: checking if this is an SVR4 system" >&5
 echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6
 if test "${cf_cv_svr4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6412 "configure"
+#line 6572 "configure"
 #include "confdefs.h"
 
 #include <elf.h>
@@ -6435,16 +6595,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6441: \$? = $ac_status" >&5
+  echo "$as_me:6601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6447: \$? = $ac_status" >&5
+  echo "$as_me:6607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_svr4=yes
 else
@@ -6455,7 +6615,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:6458: result: $cf_cv_svr4" >&5
+echo "$as_me:6618: result: $cf_cv_svr4" >&5
 echo "${ECHO_T}$cf_cv_svr4" >&6
 
 fi
@@ -6464,7 +6624,7 @@
 #define SVR4 1
 EOF
 
-echo "$as_me:6467: checking for X" >&5
+echo "$as_me:6627: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -6561,17 +6721,17 @@
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 6564 "configure"
+#line 6724 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:6568: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6728: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:6574: \$? = $ac_status" >&5
+  echo "$as_me:6734: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6604,7 +6764,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 6607 "configure"
+#line 6767 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -6616,16 +6776,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6622: \$? = $ac_status" >&5
+  echo "$as_me:6782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6628: \$? = $ac_status" >&5
+  echo "$as_me:6788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -6663,7 +6823,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:6666: result: $have_x" >&5
+  echo "$as_me:6826: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -6673,7 +6833,7 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:6676: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:6836: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -6697,11 +6857,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:6700: checking whether -R must be followed by a space" >&5
+      echo "$as_me:6860: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 6704 "configure"
+#line 6864 "configure"
 #include "confdefs.h"
 
 int
@@ -6713,16 +6873,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6719: \$? = $ac_status" >&5
+  echo "$as_me:6879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6725: \$? = $ac_status" >&5
+  echo "$as_me:6885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -6732,13 +6892,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:6735: result: no" >&5
+	echo "$as_me:6895: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 6741 "configure"
+#line 6901 "configure"
 #include "confdefs.h"
 
 int
@@ -6750,16 +6910,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6756: \$? = $ac_status" >&5
+  echo "$as_me:6916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6762: \$? = $ac_status" >&5
+  echo "$as_me:6922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -6769,11 +6929,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:6772: result: yes" >&5
+	  echo "$as_me:6932: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:6776: result: neither works" >&5
+	  echo "$as_me:6936: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -6793,7 +6953,7 @@
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 6796 "configure"
+#line 6956 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6812,22 +6972,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6818: \$? = $ac_status" >&5
+  echo "$as_me:6978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6824: \$? = $ac_status" >&5
+  echo "$as_me:6984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:6830: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:6990: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6835,7 +6995,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6838 "configure"
+#line 6998 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6854,16 +7014,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6860: \$? = $ac_status" >&5
+  echo "$as_me:7020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6866: \$? = $ac_status" >&5
+  echo "$as_me:7026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -6874,14 +7034,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6877: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7037: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:6884: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:7044: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6889,7 +7049,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6892 "configure"
+#line 7052 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6908,16 +7068,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6911: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6914: \$? = $ac_status" >&5
+  echo "$as_me:7074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6920: \$? = $ac_status" >&5
+  echo "$as_me:7080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -6928,7 +7088,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6931: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7091: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -6947,13 +7107,13 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:6950: checking for gethostbyname" >&5
+    echo "$as_me:7110: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6956 "configure"
+#line 7116 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -6984,16 +7144,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6990: \$? = $ac_status" >&5
+  echo "$as_me:7150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6996: \$? = $ac_status" >&5
+  echo "$as_me:7156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -7003,11 +7163,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7006: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7166: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:7010: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:7170: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7015,7 +7175,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7018 "configure"
+#line 7178 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7034,16 +7194,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7040: \$? = $ac_status" >&5
+  echo "$as_me:7200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7046: \$? = $ac_status" >&5
+  echo "$as_me:7206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -7054,14 +7214,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7057: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7217: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:7064: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:7224: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7069,7 +7229,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7072 "configure"
+#line 7232 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7088,16 +7248,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7094: \$? = $ac_status" >&5
+  echo "$as_me:7254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7100: \$? = $ac_status" >&5
+  echo "$as_me:7260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -7108,7 +7268,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7111: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:7271: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -7124,13 +7284,13 @@
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:7127: checking for connect" >&5
+    echo "$as_me:7287: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7133 "configure"
+#line 7293 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -7161,16 +7321,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7167: \$? = $ac_status" >&5
+  echo "$as_me:7327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7173: \$? = $ac_status" >&5
+  echo "$as_me:7333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -7180,11 +7340,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7183: result: $ac_cv_func_connect" >&5
+echo "$as_me:7343: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:7187: checking for connect in -lsocket" >&5
+      echo "$as_me:7347: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7192,7 +7352,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7195 "configure"
+#line 7355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7211,16 +7371,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7217: \$? = $ac_status" >&5
+  echo "$as_me:7377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7223: \$? = $ac_status" >&5
+  echo "$as_me:7383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -7231,7 +7391,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7234: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7394: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -7240,13 +7400,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:7243: checking for remove" >&5
+    echo "$as_me:7403: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7249 "configure"
+#line 7409 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -7277,16 +7437,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7283: \$? = $ac_status" >&5
+  echo "$as_me:7443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7289: \$? = $ac_status" >&5
+  echo "$as_me:7449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -7296,11 +7456,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7299: result: $ac_cv_func_remove" >&5
+echo "$as_me:7459: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:7303: checking for remove in -lposix" >&5
+      echo "$as_me:7463: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7308,7 +7468,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7311 "configure"
+#line 7471 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7327,16 +7487,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7333: \$? = $ac_status" >&5
+  echo "$as_me:7493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7339: \$? = $ac_status" >&5
+  echo "$as_me:7499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -7347,7 +7507,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7350: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:7510: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -7356,13 +7516,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:7359: checking for shmat" >&5
+    echo "$as_me:7519: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7365 "configure"
+#line 7525 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -7393,16 +7553,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7399: \$? = $ac_status" >&5
+  echo "$as_me:7559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7405: \$? = $ac_status" >&5
+  echo "$as_me:7565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -7412,11 +7572,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7415: result: $ac_cv_func_shmat" >&5
+echo "$as_me:7575: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:7419: checking for shmat in -lipc" >&5
+      echo "$as_me:7579: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7424,7 +7584,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7427 "configure"
+#line 7587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7443,16 +7603,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7449: \$? = $ac_status" >&5
+  echo "$as_me:7609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7455: \$? = $ac_status" >&5
+  echo "$as_me:7615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -7463,7 +7623,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7466: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:7626: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -7481,7 +7641,7 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:7484: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:7644: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7489,7 +7649,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7492 "configure"
+#line 7652 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7508,16 +7668,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7514: \$? = $ac_status" >&5
+  echo "$as_me:7674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7520: \$? = $ac_status" >&5
+  echo "$as_me:7680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -7528,7 +7688,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7531: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:7691: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -7622,7 +7782,7 @@
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 7625 "configure"
+#line 7785 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7634,16 +7794,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7640: \$? = $ac_status" >&5
+  echo "$as_me:7800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7646: \$? = $ac_status" >&5
+  echo "$as_me:7806: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7660,13 +7820,13 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:7663: checking for XOpenDisplay" >&5
+echo "$as_me:7823: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7669 "configure"
+#line 7829 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -7697,16 +7857,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -7716,13 +7876,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7719: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:7879: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-echo "$as_me:7725: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:7885: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7730,7 +7890,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7733 "configure"
+#line 7893 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7749,16 +7909,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7755: \$? = $ac_status" >&5
+  echo "$as_me:7915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7761: \$? = $ac_status" >&5
+  echo "$as_me:7921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -7769,7 +7929,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7772: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:7932: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -7777,13 +7937,13 @@
 
 fi
 
-echo "$as_me:7780: checking for XtAppInitialize" >&5
+echo "$as_me:7940: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7786 "configure"
+#line 7946 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -7814,16 +7974,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7820: \$? = $ac_status" >&5
+  echo "$as_me:7980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7826: \$? = $ac_status" >&5
+  echo "$as_me:7986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -7833,13 +7993,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7836: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:7996: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-echo "$as_me:7842: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:8002: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7847,7 +8007,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7850 "configure"
+#line 8010 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7866,16 +8026,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7872: \$? = $ac_status" >&5
+  echo "$as_me:8032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7878: \$? = $ac_status" >&5
+  echo "$as_me:8038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -7886,7 +8046,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7889: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8049: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -7900,7 +8060,7 @@
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:7903: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:8063: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -7915,23 +8075,23 @@
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7918: checking for $ac_header" >&5
+echo "$as_me:8078: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7924 "configure"
+#line 8084 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7928: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8088: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7934: \$? = $ac_status" >&5
+  echo "$as_me:8094: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7950,7 +8110,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7953: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8113: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -7962,7 +8122,7 @@
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:7965: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:8125: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -7973,14 +8133,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:7976: result: yes" >&5
+	echo "$as_me:8136: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:7979: result: no" >&5
+	echo "$as_me:8139: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:7983: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:8143: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -7991,14 +8151,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:7994: result: yes" >&5
+	echo "$as_me:8154: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:7997: result: no" >&5
+	echo "$as_me:8157: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:8001: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:8161: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -8009,14 +8169,14 @@
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:8012: result: yes" >&5
+	echo "$as_me:8172: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:8015: result: no" >&5
+	echo "$as_me:8175: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:8019: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:8179: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8024,7 +8184,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8027 "configure"
+#line 8187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8043,16 +8203,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8049: \$? = $ac_status" >&5
+  echo "$as_me:8209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8055: \$? = $ac_status" >&5
+  echo "$as_me:8215: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -8063,7 +8223,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8066: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:8226: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -8085,14 +8245,14 @@
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:8088: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:8248: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:8091: checking for $cf_test" >&5
+			echo "$as_me:8251: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8095 "configure"
+#line 8255 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -8106,16 +8266,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8112: \$? = $ac_status" >&5
+  echo "$as_me:8272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8118: \$? = $ac_status" >&5
+  echo "$as_me:8278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8124,7 +8284,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:8127: result: $cf_result" >&5
+		echo "$as_me:8287: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -8136,7 +8296,7 @@
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:8139: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:8299: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -8161,17 +8321,17 @@
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:8164: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:8324: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:8168: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:8328: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cf_SAVE="$LIBS"
 			LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 8174 "configure"
+#line 8334 "configure"
 #include "confdefs.h"
 
 int
@@ -8183,16 +8343,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8186: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8346: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8189: \$? = $ac_status" >&5
+  echo "$as_me:8349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8195: \$? = $ac_status" >&5
+  echo "$as_me:8355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -8201,7 +8361,7 @@
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:8204: result: $cf_result" >&5
+			echo "$as_me:8364: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -8215,7 +8375,7 @@
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:8218: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:8378: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8226,14 +8386,14 @@
 #define $cf_x_athena_LIBS 1
 EOF
 
-echo "$as_me:8229: checking for declaration of fd_set" >&5
+echo "$as_me:8389: checking for declaration of fd_set" >&5
 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6
 if test "${cf_cv_type_fd_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo "trying sys/types alone" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8236 "configure"
+#line 8396 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8246,16 +8406,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8252: \$? = $ac_status" >&5
+  echo "$as_me:8412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8258: \$? = $ac_status" >&5
+  echo "$as_me:8418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/types.h
 else
@@ -8263,7 +8423,7 @@
 cat conftest.$ac_ext >&5
 echo "trying X11/Xpoll.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8266 "configure"
+#line 8426 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_X11_XPOLL_H
@@ -8278,16 +8438,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8284: \$? = $ac_status" >&5
+  echo "$as_me:8444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8290: \$? = $ac_status" >&5
+  echo "$as_me:8450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=X11/Xpoll.h
 else
@@ -8295,7 +8455,7 @@
 cat conftest.$ac_ext >&5
 echo "trying sys/select.h" 1>&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8298 "configure"
+#line 8458 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8309,16 +8469,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8315: \$? = $ac_status" >&5
+  echo "$as_me:8475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8321: \$? = $ac_status" >&5
+  echo "$as_me:8481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_fd_set=sys/select.h
 else
@@ -8332,7 +8492,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8335: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:8495: result: $cf_cv_type_fd_set" >&5
 echo "${ECHO_T}$cf_cv_type_fd_set" >&6
 if test $cf_cv_type_fd_set = sys/select.h ; then
 	cat >>confdefs.h <<\EOF
@@ -8341,14 +8501,14 @@
 
 fi
 
-echo "$as_me:8344: checking for IRIX 6.5 baud-rate redefinitions" >&5
+echo "$as_me:8504: checking for IRIX 6.5 baud-rate redefinitions" >&5
 echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6
 if test "${cf_cv_termio_c_ispeed+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8351 "configure"
+#line 8511 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8366,16 +8526,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8372: \$? = $ac_status" >&5
+  echo "$as_me:8532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8378: \$? = $ac_status" >&5
+  echo "$as_me:8538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_c_ispeed=yes
 
@@ -8387,7 +8547,7 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8390: result: $cf_cv_termio_c_ispeed" >&5
+echo "$as_me:8550: result: $cf_cv_termio_c_ispeed" >&5
 echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6
 test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TERMIO_C_ISPEED 1
@@ -8400,7 +8560,7 @@
 case $host_os in #(vi
 freebsd*|netbsd*)	# 2004/8/15 - revisit this if/when grantpt is known to work.
 
-echo "$as_me:8403: checking for openpty in -lutil" >&5
+echo "$as_me:8563: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8408,7 +8568,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8411 "configure"
+#line 8571 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8427,16 +8587,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8433: \$? = $ac_status" >&5
+  echo "$as_me:8593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8439: \$? = $ac_status" >&5
+  echo "$as_me:8599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -8447,7 +8607,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8450: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:8610: result: $ac_cv_lib_util_openpty" >&5
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test $ac_cv_lib_util_openpty = yes; then
   cat >>confdefs.h <<EOF
@@ -8464,13 +8624,13 @@
 for ac_func in grantpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8467: checking for $ac_func" >&5
+echo "$as_me:8627: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8473 "configure"
+#line 8633 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8501,16 +8661,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8507: \$? = $ac_status" >&5
+  echo "$as_me:8667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8513: \$? = $ac_status" >&5
+  echo "$as_me:8673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8520,7 +8680,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8523: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8683: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8529,7 +8689,7 @@
 
 else
 
-echo "$as_me:8532: checking for openpty in -lutil" >&5
+echo "$as_me:8692: checking for openpty in -lutil" >&5
 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
 if test "${ac_cv_lib_util_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8537,7 +8697,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8540 "configure"
+#line 8700 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8556,16 +8716,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8562: \$? = $ac_status" >&5
+  echo "$as_me:8722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8568: \$? = $ac_status" >&5
+  echo "$as_me:8728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_util_openpty=yes
 else
@@ -8576,7 +8736,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8579: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:8739: result: $ac_cv_lib_util_openpty" >&5
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 if test $ac_cv_lib_util_openpty = yes; then
   cat >>confdefs.h <<EOF
@@ -8593,14 +8753,14 @@
 	;;
 esac
 
-echo "$as_me:8596: checking for XKB Bell extension" >&5
+echo "$as_me:8756: checking for XKB Bell extension" >&5
 echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6
 if test "${cf_cv_xkb_bell_ext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8603 "configure"
+#line 8763 "configure"
 #include "confdefs.h"
 
 #include <X11/XKBlib.h>		/* has the prototype */
@@ -8621,16 +8781,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8627: \$? = $ac_status" >&5
+  echo "$as_me:8787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8633: \$? = $ac_status" >&5
+  echo "$as_me:8793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xkb_bell_ext=yes
 else
@@ -8641,7 +8801,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:8644: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:8804: result: $cf_cv_xkb_bell_ext" >&5
 echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6
 
 test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF
@@ -8651,13 +8811,13 @@
 for ac_func in Xutf8LookupString
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8654: checking for $ac_func" >&5
+echo "$as_me:8814: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8660 "configure"
+#line 8820 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8688,16 +8848,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8694: \$? = $ac_status" >&5
+  echo "$as_me:8854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8700: \$? = $ac_status" >&5
+  echo "$as_me:8860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8707,7 +8867,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8710: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8870: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8723,7 +8883,7 @@
 fi
 done
 
-echo "$as_me:8726: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:8886: checking if you want narrow prototypes for X libraries" >&5
 echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
 
 case `$ac_config_guess` in #(vi
@@ -8749,10 +8909,10 @@
   enable_narrowproto=$cf_default_narrowproto
 
 fi;
-echo "$as_me:8752: result: $enable_narrowproto" >&5
+echo "$as_me:8912: result: $enable_narrowproto" >&5
 echo "${ECHO_T}$enable_narrowproto" >&6
 
-echo "$as_me:8755: checking if we should use imake to help" >&5
+echo "$as_me:8915: checking if we should use imake to help" >&5
 echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
 
 # Check whether --enable-imake or --disable-imake was given.
@@ -8769,7 +8929,7 @@
   enable_imake=yes
 
 fi;
-echo "$as_me:8772: result: $enable_imake" >&5
+echo "$as_me:8932: result: $enable_imake" >&5
 echo "${ECHO_T}$enable_imake" >&6
 
 if test "$enable_imake" = yes ; then
@@ -8778,7 +8938,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:8781: checking for $ac_word" >&5
+echo "$as_me:8941: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_IMAKE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8795,7 +8955,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_IMAKE="$ac_dir/$ac_word"
-   echo "$as_me:8798: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8958: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8806,10 +8966,10 @@
 IMAKE=$ac_cv_path_IMAKE
 
 if test -n "$IMAKE"; then
-  echo "$as_me:8809: result: $IMAKE" >&5
+  echo "$as_me:8969: result: $IMAKE" >&5
 echo "${ECHO_T}$IMAKE" >&6
 else
-  echo "$as_me:8812: result: no" >&5
+  echo "$as_me:8972: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8882,7 +9042,7 @@
 			esac
 		done
 		if test -z "$cf_config" ; then
-			{ echo "$as_me:8885: WARNING: Could not find imake config-directory" >&5
+			{ echo "$as_me:9045: WARNING: Could not find imake config-directory" >&5
 echo "$as_me: WARNING: Could not find imake config-directory" >&2;}
 		else
 			cf_imake_opts="$cf_imake_opts -I$cf_config"
@@ -8891,7 +9051,7 @@
 				test -n "$verbose" && echo "	Using $IMAKE $cf_config" 1>&6
 
 			else
-				{ echo "$as_me:8894: WARNING: Cannot run $IMAKE" >&5
+				{ echo "$as_me:9054: WARNING: Cannot run $IMAKE" >&5
 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
 			fi
 		fi
@@ -9147,7 +9307,7 @@
 
 fi
 
-echo "$as_me:9150: checking for default terminal-id" >&5
+echo "$as_me:9310: checking for default terminal-id" >&5
 echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6
 
 # Check whether --with-terminal-id or --without-terminal-id was given.
@@ -9157,7 +9317,7 @@
 else
   default_termid=vt100
 fi;
-echo "$as_me:9160: result: $default_termid" >&5
+echo "$as_me:9320: result: $default_termid" >&5
 echo "${ECHO_T}$default_termid" >&6
 case $default_termid in
 vt*)	default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -9167,7 +9327,7 @@
 #define DFT_DECID "$default_termid"
 EOF
 
-echo "$as_me:9170: checking for default terminal-type" >&5
+echo "$as_me:9330: checking for default terminal-type" >&5
 echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6
 
 # Check whether --with-terminal-type or --without-terminal-type was given.
@@ -9177,13 +9337,13 @@
 else
   default_TERM=xterm
 fi;
-echo "$as_me:9180: result: $default_TERM" >&5
+echo "$as_me:9340: result: $default_TERM" >&5
 echo "${ECHO_T}$default_TERM" >&6
 cat >>confdefs.h <<EOF
 #define DFT_TERMTYPE "$default_TERM"
 EOF
 
-echo "$as_me:9186: checking for private terminfo-directory" >&5
+echo "$as_me:9346: checking for private terminfo-directory" >&5
 echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6
 
 # Check whether --with-own-terminfo or --without-own-terminfo was given.
@@ -9193,10 +9353,10 @@
 else
   TERMINFO_DIR=${TERMINFO-none}
 fi;
-echo "$as_me:9196: result: $TERMINFO_DIR" >&5
+echo "$as_me:9356: result: $TERMINFO_DIR" >&5
 echo "${ECHO_T}$TERMINFO_DIR" >&6
 if test "$TERMINFO_DIR" = yes ; then
-	{ echo "$as_me:9199: WARNING: no value given" >&5
+	{ echo "$as_me:9359: WARNING: no value given" >&5
 echo "$as_me: WARNING: no value given" >&2;}
 elif test "$TERMINFO_DIR" != none ; then
 	if test -d $TERMINFO_DIR ; then
@@ -9205,7 +9365,7 @@
 EOF
 
 	else
-		{ echo "$as_me:9208: WARNING: not a directory" >&5
+		{ echo "$as_me:9368: WARNING: not a directory" >&5
 echo "$as_me: WARNING: not a directory" >&2;}
 	fi
 elif test "$prefix" != NONE ; then
@@ -9223,7 +9383,7 @@
 
 ###############################################################################
 
-echo "$as_me:9226: checking if you want active-icons" >&5
+echo "$as_me:9386: checking if you want active-icons" >&5
 echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6
 
 # Check whether --enable-active-icon or --disable-active-icon was given.
@@ -9240,7 +9400,7 @@
   enable_active_icon=yes
 
 fi;
-echo "$as_me:9243: result: $enable_active_icon" >&5
+echo "$as_me:9403: result: $enable_active_icon" >&5
 echo "${ECHO_T}$enable_active_icon" >&6
 if test "$enable_active_icon" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -9249,7 +9409,7 @@
 
 fi
 
-echo "$as_me:9252: checking if you want ANSI color" >&5
+echo "$as_me:9412: checking if you want ANSI color" >&5
 echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6
 
 # Check whether --enable-ansi-color or --disable-ansi-color was given.
@@ -9266,7 +9426,7 @@
   enable_ansi_color=yes
 
 fi;
-echo "$as_me:9269: result: $enable_ansi_color" >&5
+echo "$as_me:9429: result: $enable_ansi_color" >&5
 echo "${ECHO_T}$enable_ansi_color" >&6
 test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF
 #define OPT_ISO_COLORS 0
@@ -9274,7 +9434,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:9277: checking if you want 16 colors like aixterm" >&5
+	echo "$as_me:9437: checking if you want 16 colors like aixterm" >&5
 echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6
 
 # Check whether --enable-16-color or --disable-16-color was given.
@@ -9291,13 +9451,13 @@
   enable_16_color=yes
 
 fi;
-	echo "$as_me:9294: result: $enable_16_color" >&5
+	echo "$as_me:9454: result: $enable_16_color" >&5
 echo "${ECHO_T}$enable_16_color" >&6
 	test "$enable_16_color" = no && cat >>confdefs.h <<\EOF
 #define OPT_AIX_COLORS 0
 EOF
 
-	echo "$as_me:9300: checking if you want 256 colors" >&5
+	echo "$as_me:9460: checking if you want 256 colors" >&5
 echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6
 
 # Check whether --enable-256-color or --disable-256-color was given.
@@ -9314,7 +9474,7 @@
   enable_256_color=no
 
 fi;
-	echo "$as_me:9317: result: $enable_256_color" >&5
+	echo "$as_me:9477: result: $enable_256_color" >&5
 echo "${ECHO_T}$enable_256_color" >&6
 	if test "$enable_256_color" = yes ; then
 		CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h"
@@ -9324,7 +9484,7 @@
 EOF
 
 	else
-	echo "$as_me:9327: checking if you want 88 colors" >&5
+	echo "$as_me:9487: checking if you want 88 colors" >&5
 echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6
 
 # Check whether --enable-88-color or --disable-88-color was given.
@@ -9341,7 +9501,7 @@
   enable_88_color=no
 
 fi;
-	echo "$as_me:9344: result: $enable_88_color" >&5
+	echo "$as_me:9504: result: $enable_88_color" >&5
 echo "${ECHO_T}$enable_88_color" >&6
 	if test "$enable_88_color" = yes ; then
 		CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h"
@@ -9355,7 +9515,7 @@
 
 fi
 
-echo "$as_me:9358: checking if you want blinking cursor" >&5
+echo "$as_me:9518: checking if you want blinking cursor" >&5
 echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6
 
 # Check whether --enable-blink-cursor or --disable-blink-cursor was given.
@@ -9372,13 +9532,13 @@
   enable_blink_curs=yes
 
 fi;
-echo "$as_me:9375: result: $enable_blink_curs" >&5
+echo "$as_me:9535: result: $enable_blink_curs" >&5
 echo "${ECHO_T}$enable_blink_curs" >&6
 test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF
 #define OPT_BLINK_CURS 0
 EOF
 
-echo "$as_me:9381: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:9541: checking if you want to ignore Linux's broken palette-strings" >&5
 echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6
 
 case $host_os in #(vi
@@ -9402,7 +9562,7 @@
   enable_broken_osc=$enableval
 
 fi;
-echo "$as_me:9405: result: $enable_broken_osc" >&5
+echo "$as_me:9565: result: $enable_broken_osc" >&5
 echo "${ECHO_T}$enable_broken_osc" >&6
 if test "$enable_broken_osc" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -9416,7 +9576,7 @@
 
 fi
 
-echo "$as_me:9419: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:9579: checking if you want to allow broken string-terminators" >&5
 echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6
 
 # Check whether --enable-broken-st or --disable-broken-st was given.
@@ -9433,13 +9593,13 @@
   enable_broken_st=no
 
 fi;
-echo "$as_me:9436: result: $enable_broken_st" >&5
+echo "$as_me:9596: result: $enable_broken_st" >&5
 echo "${ECHO_T}$enable_broken_st" >&6
 test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF
 #define OPT_BROKEN_ST 0
 EOF
 
-echo "$as_me:9442: checking if you want printable 128-159" >&5
+echo "$as_me:9602: checking if you want printable 128-159" >&5
 echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6
 
 # Check whether --enable-c1-print or --disable-c1-print was given.
@@ -9456,7 +9616,7 @@
   enable_c1_print=yes
 
 fi;
-echo "$as_me:9459: result: $enable_c1_print" >&5
+echo "$as_me:9619: result: $enable_c1_print" >&5
 echo "${ECHO_T}$enable_c1_print" >&6
 test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF
 #define OPT_C1_PRINT 0
@@ -9464,7 +9624,7 @@
 
 if test "$enable_ansi_color" = yes ; then
 
-	echo "$as_me:9467: checking if you want bold colors mapped like IBM PC" >&5
+	echo "$as_me:9627: checking if you want bold colors mapped like IBM PC" >&5
 echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6
 
 # Check whether --enable-bold-color or --disable-bold-color was given.
@@ -9481,13 +9641,13 @@
   enable_pc_color=yes
 
 fi;
-	echo "$as_me:9484: result: $enable_pc_color" >&5
+	echo "$as_me:9644: result: $enable_pc_color" >&5
 echo "${ECHO_T}$enable_pc_color" >&6
 	test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF
 #define OPT_PC_COLORS 0
 EOF
 
-	echo "$as_me:9490: checking if you want separate color-classes" >&5
+	echo "$as_me:9650: checking if you want separate color-classes" >&5
 echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6
 
 # Check whether --enable-color-class or --disable-color-class was given.
@@ -9504,13 +9664,13 @@
   enable_color_class=yes
 
 fi;
-	echo "$as_me:9507: result: $enable_color_class" >&5
+	echo "$as_me:9667: result: $enable_color_class" >&5
 echo "${ECHO_T}$enable_color_class" >&6
 	test "$enable_color_class" = no && cat >>confdefs.h <<\EOF
 #define OPT_COLOR_CLASS FALSE
 EOF
 
-	echo "$as_me:9513: checking if you want color-mode enabled by default" >&5
+	echo "$as_me:9673: checking if you want color-mode enabled by default" >&5
 echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6
 
 # Check whether --enable-color-mode or --disable-color-mode was given.
@@ -9527,7 +9687,7 @@
   default_colormode=yes
 
 fi;
-	echo "$as_me:9530: result: $default_colormode" >&5
+	echo "$as_me:9690: result: $default_colormode" >&5
 echo "${ECHO_T}$default_colormode" >&6
 	test "$default_colormode" = no && cat >>confdefs.h <<\EOF
 #define DFT_COLORMODE FALSE
@@ -9535,7 +9695,7 @@
 
 fi
 
-echo "$as_me:9538: checking if you want support for color highlighting" >&5
+echo "$as_me:9698: checking if you want support for color highlighting" >&5
 echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6
 
 # Check whether --enable-highlighting or --disable-highlighting was given.
@@ -9552,13 +9712,13 @@
   default_highlight=yes
 
 fi;
-echo "$as_me:9555: result: $default_highlight" >&5
+echo "$as_me:9715: result: $default_highlight" >&5
 echo "${ECHO_T}$default_highlight" >&6
 test "$default_highlight" = no && cat >>confdefs.h <<\EOF
 #define OPT_HIGHLIGHT_COLOR 0
 EOF
 
-echo "$as_me:9561: checking if you want support for doublesize characters" >&5
+echo "$as_me:9721: checking if you want support for doublesize characters" >&5
 echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6
 
 # Check whether --enable-doublechars or --disable-doublechars was given.
@@ -9575,13 +9735,13 @@
   enable_doublechars=yes
 
 fi;
-echo "$as_me:9578: result: $enable_doublechars" >&5
+echo "$as_me:9738: result: $enable_doublechars" >&5
 echo "${ECHO_T}$enable_doublechars" >&6
 test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF
 #define OPT_DEC_CHRSET 0
 EOF
 
-echo "$as_me:9584: checking if you want fallback-support for box characters" >&5
+echo "$as_me:9744: checking if you want fallback-support for box characters" >&5
 echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6
 
 # Check whether --enable-boxchars or --disable-boxchars was given.
@@ -9598,13 +9758,13 @@
   enable_boxchars=yes
 
 fi;
-echo "$as_me:9601: result: $enable_boxchars" >&5
+echo "$as_me:9761: result: $enable_boxchars" >&5
 echo "${ECHO_T}$enable_boxchars" >&6
 test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF
 #define OPT_BOX_CHARS 0
 EOF
 
-echo "$as_me:9607: checking if you want to use FreeType library" >&5
+echo "$as_me:9767: checking if you want to use FreeType library" >&5
 echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6
 
 # Check whether --enable-freetype or --disable-freetype was given.
@@ -9621,7 +9781,7 @@
   enable_freetype=yes
 
 fi;
-echo "$as_me:9624: result: $enable_freetype" >&5
+echo "$as_me:9784: result: $enable_freetype" >&5
 echo "${ECHO_T}$enable_freetype" >&6
 if test "$enable_freetype" = yes ; then
 
@@ -9631,7 +9791,7 @@
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:9634: checking for $ac_word" >&5
+echo "$as_me:9794: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9648,7 +9808,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:9651: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9811: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9660,10 +9820,10 @@
 FREETYPE_PKG_CONFIG=$ac_cv_path_FREETYPE_PKG_CONFIG
 
 if test -n "$FREETYPE_PKG_CONFIG"; then
-  echo "$as_me:9663: result: $FREETYPE_PKG_CONFIG" >&5
+  echo "$as_me:9823: result: $FREETYPE_PKG_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_PKG_CONFIG" >&6
 else
-  echo "$as_me:9666: result: no" >&5
+  echo "$as_me:9826: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9673,7 +9833,7 @@
 else
 	# Extract the first word of "xft-config", so it can be a program name with args.
 set dummy xft-config; ac_word=$2
-echo "$as_me:9676: checking for $ac_word" >&5
+echo "$as_me:9836: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9690,7 +9850,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:9693: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9853: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9702,10 +9862,10 @@
 FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG
 
 if test -n "$FREETYPE_XFT_CONFIG"; then
-  echo "$as_me:9705: result: $FREETYPE_XFT_CONFIG" >&5
+  echo "$as_me:9865: result: $FREETYPE_XFT_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6
 else
-  echo "$as_me:9708: result: no" >&5
+  echo "$as_me:9868: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9715,7 +9875,7 @@
 		cf_extra_freetype_libs="-lXft"
 		# Extract the first word of "freetype-config", so it can be a program name with args.
 set dummy freetype-config; ac_word=$2
-echo "$as_me:9718: checking for $ac_word" >&5
+echo "$as_me:9878: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9732,7 +9892,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:9735: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9895: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -9744,10 +9904,10 @@
 FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG
 
 if test -n "$FREETYPE_OLD_CONFIG"; then
-  echo "$as_me:9747: result: $FREETYPE_OLD_CONFIG" >&5
+  echo "$as_me:9907: result: $FREETYPE_OLD_CONFIG" >&5
 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6
 else
-  echo "$as_me:9750: result: no" >&5
+  echo "$as_me:9910: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -9768,7 +9928,7 @@
 
 else
 
-echo "$as_me:9771: checking for X FreeType headers" >&5
+echo "$as_me:9931: checking for X FreeType headers" >&5
 echo $ECHO_N "checking for X FreeType headers... $ECHO_C" >&6
 if test "${cf_cv_x_freetype_incs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9777,7 +9937,7 @@
 	cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`"
 
 fi
-echo "$as_me:9780: result: $cf_cv_x_freetype_incs" >&5
+echo "$as_me:9940: result: $cf_cv_x_freetype_incs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
 fi;
 withval=
@@ -9790,7 +9950,7 @@
 
 else
 
-echo "$as_me:9793: checking for X FreeType libraries" >&5
+echo "$as_me:9953: checking for X FreeType libraries" >&5
 echo $ECHO_N "checking for X FreeType libraries... $ECHO_C" >&6
 if test "${cf_cv_x_freetype_libs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9805,7 +9965,7 @@
 CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9808 "configure"
+#line 9968 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -9822,16 +9982,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9985: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9828: \$? = $ac_status" >&5
+  echo "$as_me:9988: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9991: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9834: \$? = $ac_status" >&5
+  echo "$as_me:9994: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9844,7 +10004,7 @@
 	CPPFLAGS="$cf_save_INCS"
 
 fi
-echo "$as_me:9847: result: $cf_cv_x_freetype_libs" >&5
+echo "$as_me:10007: result: $cf_cv_x_freetype_libs" >&5
 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
 fi;
 
@@ -9924,13 +10084,13 @@
 EOF
 
 else
-	{ echo "$as_me:9927: WARNING: No libraries found for FreeType" >&5
+	{ echo "$as_me:10087: WARNING: No libraries found for FreeType" >&5
 echo "$as_me: WARNING: No libraries found for FreeType" >&2;}
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
 else
-	{ echo "$as_me:9933: WARNING: Cannot find FreeType configuration program" >&5
+	{ echo "$as_me:10093: WARNING: Cannot find FreeType configuration program" >&5
 echo "$as_me: WARNING: Cannot find FreeType configuration program" >&2;}
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
@@ -9941,7 +10101,7 @@
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
 fi
 
-echo "$as_me:9944: checking if you want support for HP-style function keys" >&5
+echo "$as_me:10104: checking if you want support for HP-style function keys" >&5
 echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6
 
 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
@@ -9958,7 +10118,7 @@
   enable_hp_fkeys=no
 
 fi;
-echo "$as_me:9961: result: $enable_hp_fkeys" >&5
+echo "$as_me:10121: result: $enable_hp_fkeys" >&5
 echo "${ECHO_T}$enable_hp_fkeys" >&6
 if test "$enable_hp_fkeys" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -9967,7 +10127,7 @@
 
 fi
 
-echo "$as_me:9970: checking if you want support for SCO-style function keys" >&5
+echo "$as_me:10130: checking if you want support for SCO-style function keys" >&5
 echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6
 
 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
@@ -9984,7 +10144,7 @@
   enable_sco_fkeys=no
 
 fi;
-echo "$as_me:9987: result: $enable_sco_fkeys" >&5
+echo "$as_me:10147: result: $enable_sco_fkeys" >&5
 echo "${ECHO_T}$enable_sco_fkeys" >&6
 if test "$enable_sco_fkeys" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -9993,7 +10153,7 @@
 
 fi
 
-echo "$as_me:9996: checking if you want support for internationalization" >&5
+echo "$as_me:10156: checking if you want support for internationalization" >&5
 echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6
 
 # Check whether --enable-i18n or --disable-i18n was given.
@@ -10010,7 +10170,7 @@
   enable_i18n=yes
 
 fi;
-echo "$as_me:10013: result: $enable_i18n" >&5
+echo "$as_me:10173: result: $enable_i18n" >&5
 echo "${ECHO_T}$enable_i18n" >&6
 if test "$enable_i18n" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -10019,7 +10179,7 @@
 
 fi
 
-echo "$as_me:10022: checking if you want support for initial-erase setup" >&5
+echo "$as_me:10182: checking if you want support for initial-erase setup" >&5
 echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6
 
 # Check whether --enable-initial-erase or --disable-initial-erase was given.
@@ -10036,7 +10196,7 @@
   enable_ie=yes
 
 fi;
-echo "$as_me:10039: result: $enable_ie" >&5
+echo "$as_me:10199: result: $enable_ie" >&5
 echo "${ECHO_T}$enable_ie" >&6
 if test "$enable_ie" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -10045,7 +10205,7 @@
 
 fi
 
-echo "$as_me:10048: checking if you want support for input-method" >&5
+echo "$as_me:10208: checking if you want support for input-method" >&5
 echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6
 
 # Check whether --enable-input-method or --disable-input-method was given.
@@ -10062,17 +10222,17 @@
   enable_ximp=yes
 
 fi;
-echo "$as_me:10065: result: $enable_ximp" >&5
+echo "$as_me:10225: result: $enable_ximp" >&5
 echo "${ECHO_T}$enable_ximp" >&6
 
-echo "$as_me:10068: checking if X libraries support input-method" >&5
+echo "$as_me:10228: checking if X libraries support input-method" >&5
 echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6
 if test "${cf_cv_input_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10075 "configure"
+#line 10235 "configure"
 #include "confdefs.h"
 
 #include <X11/IntrinsicP.h>
@@ -10104,16 +10264,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10110: \$? = $ac_status" >&5
+  echo "$as_me:10270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10116: \$? = $ac_status" >&5
+  echo "$as_me:10276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_input_method=yes
 else
@@ -10123,7 +10283,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10126: result: $cf_cv_input_method" >&5
+echo "$as_me:10286: result: $cf_cv_input_method" >&5
 echo "${ECHO_T}$cf_cv_input_method" >&6
 
 test "$cf_cv_input_method" = no && enable_ximp=no
@@ -10134,7 +10294,7 @@
 
 fi
 
-echo "$as_me:10137: checking if you want support for load-vt-fonts" >&5
+echo "$as_me:10297: checking if you want support for load-vt-fonts" >&5
 echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6
 
 # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given.
@@ -10151,7 +10311,7 @@
   enable_load_vt_fonts=no
 
 fi;
-echo "$as_me:10154: result: $enable_load_vt_fonts" >&5
+echo "$as_me:10314: result: $enable_load_vt_fonts" >&5
 echo "${ECHO_T}$enable_load_vt_fonts" >&6
 if test "$enable_load_vt_fonts" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10160,7 +10320,7 @@
 
 fi
 
-echo "$as_me:10163: checking if you want support for logging" >&5
+echo "$as_me:10323: checking if you want support for logging" >&5
 echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6
 
 # Check whether --enable-logging or --disable-logging was given.
@@ -10177,14 +10337,14 @@
   enable_logging=no
 
 fi;
-echo "$as_me:10180: result: $enable_logging" >&5
+echo "$as_me:10340: result: $enable_logging" >&5
 echo "${ECHO_T}$enable_logging" >&6
 if test "$enable_logging" = yes ; then
 	cat >>confdefs.h <<\EOF
 #define ALLOWLOGGING 1
 EOF
 
-	echo "$as_me:10187: checking if you want to allow logging via a pipe" >&5
+	echo "$as_me:10347: checking if you want to allow logging via a pipe" >&5
 echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6
 
 # Check whether --enable-logfile-exec or --disable-logfile-exec was given.
@@ -10201,7 +10361,7 @@
   enable_log_exec=no
 
 fi;
-	echo "$as_me:10204: result: $enable_log_exec" >&5
+	echo "$as_me:10364: result: $enable_log_exec" >&5
 echo "${ECHO_T}$enable_log_exec" >&6
 	if test "$enable_log_exec" = yes ; then
 		cat >>confdefs.h <<\EOF
@@ -10211,7 +10371,7 @@
 	fi
 fi
 
-echo "$as_me:10214: checking if you want support for iconify/maximize translations" >&5
+echo "$as_me:10374: checking if you want support for iconify/maximize translations" >&5
 echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6
 
 # Check whether --enable-maximize or --disable-maximize was given.
@@ -10228,13 +10388,13 @@
   enable_maximize=yes
 
 fi;
-echo "$as_me:10231: result: $enable_maximize" >&5
+echo "$as_me:10391: result: $enable_maximize" >&5
 echo "${ECHO_T}$enable_maximize" >&6
 test "$enable_maximize" = no && cat >>confdefs.h <<\EOF
 #define OPT_MAXIMIZE 0
 EOF
 
-echo "$as_me:10237: checking if you want NumLock to override keyboard tables" >&5
+echo "$as_me:10397: checking if you want NumLock to override keyboard tables" >&5
 echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6
 
 # Check whether --enable-num-lock or --disable-num-lock was given.
@@ -10251,13 +10411,13 @@
   enable_numlock=yes
 
 fi;
-echo "$as_me:10254: result: $enable_numlock" >&5
+echo "$as_me:10414: result: $enable_numlock" >&5
 echo "${ECHO_T}$enable_numlock" >&6
 test "$enable_numlock" = no && cat >>confdefs.h <<\EOF
 #define OPT_NUM_LOCK 0
 EOF
 
-echo "$as_me:10260: checking if you want support for get/set of base64 selection data" >&5
+echo "$as_me:10420: checking if you want support for get/set of base64 selection data" >&5
 echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6
 
 # Check whether --enable-paste64 or --disable-paste64 was given.
@@ -10274,7 +10434,7 @@
   enable_paste64=no
 
 fi;
-echo "$as_me:10277: result: $enable_paste64" >&5
+echo "$as_me:10437: result: $enable_paste64" >&5
 echo "${ECHO_T}$enable_paste64" >&6
 if test "$enable_paste64" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10288,7 +10448,7 @@
 
 fi
 
-echo "$as_me:10291: checking if you want support for pty-handshaking" >&5
+echo "$as_me:10451: checking if you want support for pty-handshaking" >&5
 echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6
 
 # Check whether --enable-pty-handshake or --disable-pty-handshake was given.
@@ -10305,7 +10465,7 @@
   enable_pty_handshake=yes
 
 fi;
-echo "$as_me:10308: result: $enable_pty_handshake" >&5
+echo "$as_me:10468: result: $enable_pty_handshake" >&5
 echo "${ECHO_T}$enable_pty_handshake" >&6
 if test "$enable_pty_handshake" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10319,7 +10479,7 @@
 
 fi
 
-echo "$as_me:10322: checking if you want support for mouse in readline applications" >&5
+echo "$as_me:10482: checking if you want support for mouse in readline applications" >&5
 echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6
 
 # Check whether --enable-readline-mouse or --disable-readline-mouse was given.
@@ -10336,7 +10496,7 @@
   enable_readline_mouse=no
 
 fi;
-echo "$as_me:10339: result: $enable_readline_mouse" >&5
+echo "$as_me:10499: result: $enable_readline_mouse" >&5
 echo "${ECHO_T}$enable_readline_mouse" >&6
 if test "$enable_readline_mouse" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10345,7 +10505,7 @@
 
 fi
 
-echo "$as_me:10348: checking if you want support for regular-expression selections" >&5
+echo "$as_me:10508: checking if you want support for regular-expression selections" >&5
 echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6
 
 # Check whether --enable-regex or --disable-regex was given.
@@ -10362,11 +10522,11 @@
   enable_regex=yes
 
 fi;
-echo "$as_me:10365: result: $enable_regex" >&5
+echo "$as_me:10525: result: $enable_regex" >&5
 echo "${ECHO_T}$enable_regex" >&6
 if test "$enable_regex" = yes ; then
 
-echo "$as_me:10369: checking if you want to use PCRE for regular-expressions" >&5
+echo "$as_me:10529: checking if you want to use PCRE for regular-expressions" >&5
 echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre or --without-pcre was given.
@@ -10375,11 +10535,11 @@
 
 fi;
 test -z "$with_pcre" && with_pcre=no
-echo "$as_me:10378: result: $with_pcre" >&5
+echo "$as_me:10538: result: $with_pcre" >&5
 echo "${ECHO_T}$with_pcre" >&6
 
 if test "$with_pcre" != no ; then
-	echo "$as_me:10382: checking for pcre_compile in -lpcre" >&5
+	echo "$as_me:10542: checking for pcre_compile in -lpcre" >&5
 echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10387,7 +10547,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10390 "configure"
+#line 10550 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10406,16 +10566,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10412: \$? = $ac_status" >&5
+  echo "$as_me:10572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10418: \$? = $ac_status" >&5
+  echo "$as_me:10578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pcre_pcre_compile=yes
 else
@@ -10426,26 +10586,26 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10429: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "$as_me:10589: result: $ac_cv_lib_pcre_pcre_compile" >&5
 echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6
 if test $ac_cv_lib_pcre_pcre_compile = yes; then
-  echo "$as_me:10432: checking for pcreposix.h" >&5
+  echo "$as_me:10592: checking for pcreposix.h" >&5
 echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6
 if test "${ac_cv_header_pcreposix_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10438 "configure"
+#line 10598 "configure"
 #include "confdefs.h"
 #include <pcreposix.h>
 _ACEOF
-if { (eval echo "$as_me:10442: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10602: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:10448: \$? = $ac_status" >&5
+  echo "$as_me:10608: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10464,10 +10624,10 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10467: result: $ac_cv_header_pcreposix_h" >&5
+echo "$as_me:10627: result: $ac_cv_header_pcreposix_h" >&5
 echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6
 if test $ac_cv_header_pcreposix_h = yes; then
-  echo "$as_me:10470: checking for pcreposix_regcomp in -lpcreposix" >&5
+  echo "$as_me:10630: checking for pcreposix_regcomp in -lpcreposix" >&5
 echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10475,7 +10635,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix "-lpcre" $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10478 "configure"
+#line 10638 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10494,16 +10654,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10500: \$? = $ac_status" >&5
+  echo "$as_me:10660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10506: \$? = $ac_status" >&5
+  echo "$as_me:10666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 else
@@ -10514,7 +10674,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10517: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
+echo "$as_me:10677: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5
 echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6
 if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then
   cat >>confdefs.h <<\EOF
@@ -10527,19 +10687,19 @@
 
 				 LIBS="-lpcreposix -lpcre $LIBS"
 else
-  { { echo "$as_me:10530: error: Cannot find PCRE POSIX library" >&5
+  { { echo "$as_me:10690: error: Cannot find PCRE POSIX library" >&5
 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-  { { echo "$as_me:10536: error: Cannot find PCRE POSIX header" >&5
+  { { echo "$as_me:10696: error: Cannot find PCRE POSIX header" >&5
 echo "$as_me: error: Cannot find PCRE POSIX header" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
-  { { echo "$as_me:10542: error: Cannot find PCRE library" >&5
+  { { echo "$as_me:10702: error: Cannot find PCRE library" >&5
 echo "$as_me: error: Cannot find PCRE library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10548,14 +10708,14 @@
 
 	if test "$with_pcre" = no ; then
 
-echo "$as_me:10551: checking for regular-expression headers" >&5
+echo "$as_me:10711: checking for regular-expression headers" >&5
 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
 if test "${cf_cv_regex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10558 "configure"
+#line 10718 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <regex.h>
@@ -10573,16 +10733,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10579: \$? = $ac_status" >&5
+  echo "$as_me:10739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10585: \$? = $ac_status" >&5
+  echo "$as_me:10745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_regex="regex.h"
 else
@@ -10590,7 +10750,7 @@
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10593 "configure"
+#line 10753 "configure"
 #include "confdefs.h"
 #include <regexp.h>
 int
@@ -10605,16 +10765,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10611: \$? = $ac_status" >&5
+  echo "$as_me:10771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10617: \$? = $ac_status" >&5
+  echo "$as_me:10777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_regex="regexp.h"
 else
@@ -10624,7 +10784,7 @@
 		cf_save_LIBS="$LIBS"
 		LIBS="-lgen $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10627 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 #include <regexpr.h>
 int
@@ -10639,16 +10799,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10645: \$? = $ac_status" >&5
+  echo "$as_me:10805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10651: \$? = $ac_status" >&5
+  echo "$as_me:10811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_regex="regexpr.h"
 else
@@ -10664,7 +10824,7 @@
 
 fi
 
-echo "$as_me:10667: result: $cf_cv_regex" >&5
+echo "$as_me:10827: result: $cf_cv_regex" >&5
 echo "${ECHO_T}$cf_cv_regex" >&6
 case $cf_cv_regex in
 	regex.h)   cat >>confdefs.h <<\EOF
@@ -10682,7 +10842,7 @@
 esac
 
 		if test "X$cf_cv_regex" != "Xregex.h" ; then
-			{ { echo "$as_me:10685: error: Only POSIX or PCRE regular expressions are supported" >&5
+			{ { echo "$as_me:10845: error: Only POSIX or PCRE regular expressions are supported" >&5
 echo "$as_me: error: Only POSIX or PCRE regular expressions are supported" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -10693,7 +10853,7 @@
 
 fi
 
-echo "$as_me:10696: checking if you want support for right-scrollbar" >&5
+echo "$as_me:10856: checking if you want support for right-scrollbar" >&5
 echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6
 
 # Check whether --enable-rightbar or --disable-rightbar was given.
@@ -10710,7 +10870,7 @@
   enable_rightbar=yes
 
 fi;
-echo "$as_me:10713: result: $enable_rightbar" >&5
+echo "$as_me:10873: result: $enable_rightbar" >&5
 echo "${ECHO_T}$enable_rightbar" >&6
 if test "$enable_rightbar" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10719,7 +10879,7 @@
 
 fi
 
-echo "$as_me:10722: checking if you want check for redundant name-change" >&5
+echo "$as_me:10882: checking if you want check for redundant name-change" >&5
 echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6
 
 # Check whether --enable-samename or --disable-samename was given.
@@ -10736,13 +10896,13 @@
   enable_samename=yes
 
 fi;
-echo "$as_me:10739: result: $enable_samename" >&5
+echo "$as_me:10899: result: $enable_samename" >&5
 echo "${ECHO_T}$enable_samename" >&6
 test "$enable_samename" = no && cat >>confdefs.h <<\EOF
 #define OPT_SAME_NAME 0
 EOF
 
-echo "$as_me:10745: checking if you want support for session management" >&5
+echo "$as_me:10905: checking if you want support for session management" >&5
 echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6
 
 # Check whether --enable-session-mgt or --disable-session-mgt was given.
@@ -10759,13 +10919,13 @@
   enable_session_mgt=yes
 
 fi;
-echo "$as_me:10762: result: $enable_session_mgt" >&5
+echo "$as_me:10922: result: $enable_session_mgt" >&5
 echo "${ECHO_T}$enable_session_mgt" >&6
 test "$enable_session_mgt" = no && cat >>confdefs.h <<\EOF
 #define OPT_SESSION_MGT 0
 EOF
 
-echo "$as_me:10768: checking if you want to use termcap-query/report" >&5
+echo "$as_me:10928: checking if you want to use termcap-query/report" >&5
 echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6
 
 # Check whether --enable-tcap-query or --disable-tcap-query was given.
@@ -10782,13 +10942,13 @@
   enable_tcap_query=no
 
 fi;
-echo "$as_me:10785: result: $enable_tcap_query" >&5
+echo "$as_me:10945: result: $enable_tcap_query" >&5
 echo "${ECHO_T}$enable_tcap_query" >&6
 test "$enable_tcap_query" = yes && cat >>confdefs.h <<\EOF
 #define OPT_TCAP_QUERY 1
 EOF
 
-echo "$as_me:10791: checking if you want support for tek4014" >&5
+echo "$as_me:10951: checking if you want support for tek4014" >&5
 echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6
 
 # Check whether --enable-tek4014 or --disable-tek4014 was given.
@@ -10805,7 +10965,7 @@
   enable_tek4014=yes
 
 fi;
-echo "$as_me:10808: result: $enable_tek4014" >&5
+echo "$as_me:10968: result: $enable_tek4014" >&5
 echo "${ECHO_T}$enable_tek4014" >&6
 if test "$enable_tek4014" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -10818,7 +10978,7 @@
 	EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o"
 fi
 
-echo "$as_me:10821: checking if you want pulldown menus with a toolbar" >&5
+echo "$as_me:10981: checking if you want pulldown menus with a toolbar" >&5
 echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6
 
 # Check whether --enable-toolbar or --disable-toolbar was given.
@@ -10835,7 +10995,7 @@
   enable_toolbar=no
 
 fi;
-echo "$as_me:10838: result: $enable_toolbar" >&5
+echo "$as_me:10998: result: $enable_toolbar" >&5
 echo "${ECHO_T}$enable_toolbar" >&6
 if test "$enable_toolbar" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10844,7 +11004,7 @@
 
 fi
 
-echo "$as_me:10847: checking if you want VT52 emulation" >&5
+echo "$as_me:11007: checking if you want VT52 emulation" >&5
 echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6
 
 # Check whether --enable-vt52 or --disable-vt52 was given.
@@ -10861,13 +11021,13 @@
   enable_vt52=yes
 
 fi;
-echo "$as_me:10864: result: $enable_vt52" >&5
+echo "$as_me:11024: result: $enable_vt52" >&5
 echo "${ECHO_T}$enable_vt52" >&6
 test "$enable_vt52" = no && cat >>confdefs.h <<\EOF
 #define OPT_VT52_MODE 0
 EOF
 
-echo "$as_me:10870: checking if you want to use mini-luit/Latin9 built-in support" >&5
+echo "$as_me:11030: checking if you want to use mini-luit/Latin9 built-in support" >&5
 echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6
 
 # Check whether --enable-mini-luit or --disable-mini-luit was given.
@@ -10884,7 +11044,7 @@
   enable_mini_luit=no
 
 fi;
-echo "$as_me:10887: result: $enable_mini_luit" >&5
+echo "$as_me:11047: result: $enable_mini_luit" >&5
 echo "${ECHO_T}$enable_mini_luit" >&6
 if test "$enable_mini_luit" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10893,7 +11053,7 @@
 
 fi
 
-echo "$as_me:10896: checking if you want to use luit" >&5
+echo "$as_me:11056: checking if you want to use luit" >&5
 echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6
 
 # Check whether --enable-luit or --disable-luit was given.
@@ -10910,7 +11070,7 @@
   enable_luit=$enable_mini_luit
 
 fi;
-echo "$as_me:10913: result: $enable_luit" >&5
+echo "$as_me:11073: result: $enable_luit" >&5
 echo "${ECHO_T}$enable_luit" >&6
 if test "$enable_luit" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -10922,7 +11082,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:10925: checking for $ac_word" >&5
+echo "$as_me:11085: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LUIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10939,7 +11099,7 @@
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LUIT="$ac_dir/$ac_word"
-   echo "$as_me:10942: found $ac_dir/$ac_word" >&5
+   echo "$as_me:11102: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10950,10 +11110,10 @@
 LUIT=$ac_cv_path_LUIT
 
 if test -n "$LUIT"; then
-  echo "$as_me:10953: result: $LUIT" >&5
+  echo "$as_me:11113: result: $LUIT" >&5
 echo "${ECHO_T}$LUIT" >&6
 else
-  echo "$as_me:10956: result: no" >&5
+  echo "$as_me:11116: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11015,7 +11175,7 @@
 
 if test -n "$cf_path_prog" ; then
 
-echo "(line 11018) testing defining path for ${cf_path_prog} ..." 1>&5
+echo "(line 11178) testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define LUIT_PATH "$cf_path_prog"
@@ -11029,7 +11189,7 @@
 
 fi
 
-echo "$as_me:11032: checking if you want wide-character support" >&5
+echo "$as_me:11192: checking if you want wide-character support" >&5
 echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6
 
 # Check whether --enable-wide-chars or --disable-wide-chars was given.
@@ -11046,7 +11206,7 @@
   enable_wchar=$enable_luit
 
 fi;
-echo "$as_me:11049: result: $enable_wchar" >&5
+echo "$as_me:11209: result: $enable_wchar" >&5
 echo "${ECHO_T}$enable_wchar" >&6
 if test "$enable_wchar" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11058,7 +11218,7 @@
 	EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o"
 fi
 
-echo "$as_me:11061: checking if you want dynamic-abbreviation support" >&5
+echo "$as_me:11221: checking if you want dynamic-abbreviation support" >&5
 echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6
 
 # Check whether --enable-dabbrev or --disable-dabbrev was given.
@@ -11075,7 +11235,7 @@
   enable_dabbrev=no
 
 fi;
-echo "$as_me:11078: result: $enable_dabbrev" >&5
+echo "$as_me:11238: result: $enable_dabbrev" >&5
 echo "${ECHO_T}$enable_dabbrev" >&6
 if test "$enable_dabbrev" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11084,7 +11244,7 @@
 
 fi
 
-echo "$as_me:11087: checking if you want DECterm Locator support" >&5
+echo "$as_me:11247: checking if you want DECterm Locator support" >&5
 echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6
 
 # Check whether --enable-dec-locator or --disable-dec-locator was given.
@@ -11101,7 +11261,7 @@
   enable_dec_locator=no
 
 fi;
-echo "$as_me:11104: result: $enable_dec_locator" >&5
+echo "$as_me:11264: result: $enable_dec_locator" >&5
 echo "${ECHO_T}$enable_dec_locator" >&6
 if test "$enable_dec_locator" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11110,7 +11270,7 @@
 
 fi
 
-echo "$as_me:11113: checking if you want -ziconbeep option" >&5
+echo "$as_me:11273: checking if you want -ziconbeep option" >&5
 echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6
 
 # Check whether --enable-ziconbeep or --disable-ziconbeep was given.
@@ -11127,7 +11287,7 @@
   enable_ziconbeep=yes
 
 fi;
-echo "$as_me:11130: result: $enable_ziconbeep" >&5
+echo "$as_me:11290: result: $enable_ziconbeep" >&5
 echo "${ECHO_T}$enable_ziconbeep" >&6
 test "$enable_ziconbeep" = no && cat >>confdefs.h <<\EOF
 #define OPT_ZICONBEEP 0
@@ -11135,7 +11295,7 @@
 
 ###############################################################################
 
-echo "$as_me:11138: checking if you want debugging traces" >&5
+echo "$as_me:11298: checking if you want debugging traces" >&5
 echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -11152,7 +11312,7 @@
   enable_trace=no
 
 fi;
-echo "$as_me:11155: result: $enable_trace" >&5
+echo "$as_me:11315: result: $enable_trace" >&5
 echo "${ECHO_T}$enable_trace" >&6
 if test "$enable_trace" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11163,7 +11323,7 @@
 	EXTRAOBJS="$EXTRAOBJS trace.o"
 fi
 
-echo "$as_me:11166: checking if you want to test memory leaks" >&5
+echo "$as_me:11326: checking if you want to test memory leaks" >&5
 echo $ECHO_N "checking if you want to test memory leaks... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
@@ -11180,7 +11340,7 @@
   disable_leaks=no
 
 fi;
-echo "$as_me:11183: result: $disable_leaks" >&5
+echo "$as_me:11343: result: $disable_leaks" >&5
 echo "${ECHO_T}$disable_leaks" >&6
 if test "$disable_leaks" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11189,7 +11349,7 @@
 
 fi
 
-echo "$as_me:11192: checking if you want to see long compiling messages" >&5
+echo "$as_me:11352: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -11223,10 +11383,10 @@
     ECHO_CC=''
 
 fi;
-echo "$as_me:11226: result: $enableval" >&5
+echo "$as_me:11386: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:11229: checking if you want magic cookie emulation" >&5
+echo "$as_me:11389: checking if you want magic cookie emulation" >&5
 echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6
 
 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
@@ -11243,7 +11403,7 @@
   enable_xmc=no
 
 fi;
-echo "$as_me:11246: result: $enable_xmc" >&5
+echo "$as_me:11406: result: $enable_xmc" >&5
 echo "${ECHO_T}$enable_xmc" >&6
 if test "$enable_xmc" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -11255,7 +11415,7 @@
 fi
 
 if test -n "$GCC" ; then
-echo "$as_me:11258: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:11418: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -11272,7 +11432,7 @@
   with_warnings=no
 
 fi;
-echo "$as_me:11275: result: $with_warnings" >&5
+echo "$as_me:11435: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = yes
 then
@@ -11295,10 +11455,10 @@
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:11298: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:11458: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 11301 "configure"
+#line 11461 "configure"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -11336,12 +11496,12 @@
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:11339: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:11499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11342: \$? = $ac_status" >&5
+  echo "$as_me:11502: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:11344: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:11504: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -11354,11 +11514,11 @@
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:11357: checking version of $CC" >&5
+	echo "$as_me:11517: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:11361: result: $GCC_VERSION" >&5
+	echo "$as_me:11521: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -11367,12 +11527,12 @@
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:11370: checking if this is really Intel C compiler" >&5
+		echo "$as_me:11530: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11375 "configure"
+#line 11535 "configure"
 #include "confdefs.h"
 
 int
@@ -11389,16 +11549,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11395: \$? = $ac_status" >&5
+  echo "$as_me:11555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11401: \$? = $ac_status" >&5
+  echo "$as_me:11561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -11409,14 +11569,14 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:11412: result: $INTEL_COMPILER" >&5
+		echo "$as_me:11572: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 11419 "configure"
+#line 11579 "configure"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -11434,7 +11594,7 @@
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:11437: checking for $CC warning options..." >&5
+	{ echo "$as_me:11597: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -11451,12 +11611,12 @@
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:11454: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:11614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11457: \$? = $ac_status" >&5
+  echo "$as_me:11617: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:11459: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:11619: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -11465,7 +11625,7 @@
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:11468: checking for $CC warning options..." >&5
+	{ echo "$as_me:11628: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -11485,12 +11645,12 @@
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:11648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11491: \$? = $ac_status" >&5
+  echo "$as_me:11651: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:11493: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:11653: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -11624,7 +11784,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:11627: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:11787: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -11797,7 +11957,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:11800: error: ambiguous option: $1
+    { { echo "$as_me:11960: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -11816,7 +11976,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:11819: error: unrecognized option: $1
+  -*) { { echo "$as_me:11979: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -11853,7 +12013,7 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;;
-  *) { { echo "$as_me:11856: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:12016: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -11954,6 +12114,7 @@
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@LN_S@,$LN_S,;t t
 s,@LINT@,$LINT,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@PROG_EXT@,$PROG_EXT,;t t
@@ -12104,7 +12265,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:12107: creating $ac_file" >&5
+    { echo "$as_me:12268: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -12122,7 +12283,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:12125: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:12286: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -12135,7 +12296,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:12138: error: cannot find input file: $f" >&5
+           { { echo "$as_me:12299: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -12201,7 +12362,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:12204: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:12365: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -12212,7 +12373,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:12215: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:12376: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -12225,7 +12386,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:12228: error: cannot find input file: $f" >&5
+           { { echo "$as_me:12389: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -12343,7 +12504,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:12346: $ac_file is unchanged" >&5
+      { echo "$as_me:12507: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: xc/programs/xterm/configure.in
diff -u xc/programs/xterm/configure.in:3.76 xc/programs/xterm/configure.in:3.77
--- xc/programs/xterm/configure.in:3.76	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/configure.in	Sun Jun 18 20:36:51 2006
@@ -1,6 +1,6 @@
-dnl $XTermId: configure.in,v 1.209 2006/04/02 20:10:26 tom Exp $
+dnl $XTermId: configure.in,v 1.214 2006/06/19 00:11:51 tom Exp $
 dnl
-dnl $XFree86: xc/programs/xterm/configure.in,v 3.76 2006/04/10 00:34:36 dickey Exp $
+dnl $XFree86: xc/programs/xterm/configure.in,v 3.77 2006/06/19 00:36:51 dickey Exp $
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
@@ -51,6 +51,7 @@
 AC_GCC_TRADITIONAL
 AC_PROG_AWK
 AC_PROG_INSTALL
+AC_PROG_LN_S
 AC_ARG_PROGRAM
 AC_CHECK_PROGS(LINT, tdlint lint alint)
 
@@ -83,6 +84,7 @@
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
 AC_TYPE_UID_T
+AC_TYPE_OFF_T
 
 ###	checks for library functions
 AC_CHECK_FUNCS( \
@@ -101,6 +103,7 @@
 CF_FUNC_MEMMOVE
 CF_UTMP
 CF_STRUCT_LASTLOG
+CF_POSIX_SAVED_IDS
 
 CF_HELP_MESSAGE(Compile/Install Options:)
 CF_FUNC_TGETENT
@@ -186,6 +189,9 @@
 	else
 		cf_cv_utmp_group=$use_utmp_setgid
 	fi
+	if test "$cf_cv_posix_saved_ids" != yes ; then
+		AC_MSG_WARN(Your system does not support POSIX saved-ids)
+	fi
 	AC_DEFINE(USE_UTMP_SETGID)
 	SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group"
 fi
Index: xc/programs/xterm/input.c
diff -u xc/programs/xterm/input.c:3.75 xc/programs/xterm/input.c:3.76
--- xc/programs/xterm/input.c:3.75	Sun Feb 12 20:14:59 2006
+++ xc/programs/xterm/input.c	Sun Jun 18 20:36:51 2006
@@ -1,6 +1,6 @@
-/* $XTermId: input.c,v 1.175 2006/02/12 22:45:50 tom Exp $ */
+/* $XTermId: input.c,v 1.185 2006/06/18 21:19:22 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/input.c,v 3.75 2006/02/13 01:14:59 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/input.c,v 3.76 2006/06/19 00:36:51 dickey Exp $ */
 
 /*
  * Copyright 1999-2005,2006 by Thomas E. Dickey
@@ -80,6 +80,18 @@
 #include <data.h>
 #include <fontutils.h>
 
+#define IsControlAlias(n) ((n) != 0 && strchr("2345678 @`\\/^~_?", (n)) != 0)
+
+#define IsControlInput(n) (((n) <= 0x1f) \
+			|| ((n) >= 0x40 && (n) <= 0x5f) \
+			|| ((n) >= 0x60 && (n) <= 0x7f))
+
+#ifdef XK_ISO_Left_Tab
+#define IsTabKey(n) ((n) == XK_Tab || (n) == XK_ISO_Left_Tab)
+#else
+#define IsTabKey(n) ((n) == XK_Tab)
+#endif
+
 #define MAP(from, to) case from: return(to)
 
 #define KEYSYM_FMT "0x%04lX"	/* simplify matching <X11/keysymdef.h> */
@@ -324,15 +336,60 @@
     if (screen->xic) {
 	Status status_return;
 #if OPT_WIDE_CHARS
-	if (screen->utf8_mode)
+	if (screen->utf8_mode) {
 	    nbytes = Xutf8LookupString(screen->xic, event,
 				       strbuf, sizeof(strbuf),
 				       &keysym, &status_return);
-	else
+	} else
 #endif
+	{
 	    nbytes = XmbLookupString(screen->xic, event,
 				     strbuf, sizeof(strbuf),
 				     &keysym, &status_return);
+	}
+#if OPT_MOD_FKEYS
+	/*
+	 * X "normally" has some built-in translations, which the user may
+	 * want to suppress when processing the modifyOtherKeys resource.
+	 * In particular, the control modifier applied to some of the keyboard
+	 * digits gives results for control characters (see the IsControlAlias
+	 * macro):
+	 *
+	 * control 2   0    NUL
+	 * control SPC 0    NUL
+	 * control @   0    NUL
+	 * control `   0    NUL
+	 * control 3   0x1b ESC
+	 * control 4   0x1c FS
+	 * control \   0x1c FS
+	 * control 5   0x1d GS
+	 * control 6   0x1e RS
+	 * control ^   0x1e RS
+	 * control ~   0x1e RS
+	 * control 7   0x1f US
+	 * control /   0x1f US
+	 * control _   0x1f US
+	 * control 8   0x7f DEL
+	 *
+	 * It is possible that some other keyboards do not work for these
+	 * combinations, but they do work with modifyOtherKeys=2 for the US
+	 * keyboard:
+	 *
+	 * control `   0    NUL
+	 * control [   0x1b ESC
+	 * control \   0x1c FS
+	 * control ]   0x1d GS
+	 * control ?   0x7f DEL
+	 */
+	if (status_return == XLookupBoth
+	    && nbytes <= 1
+	    && keysym < 256
+	    && (keyboard->modify_other_keys > 1)
+	    && !IsControlInput(keysym)) {
+	    nbytes = 1;
+	    strbuf[0] = keysym;
+	}
+#endif /* OPT_MOD_FKEYS */
     } else
 #endif
     {
@@ -481,6 +538,21 @@
     }
 #endif /* OPT_MOD_FKEYS */
 
+#if OPT_MOD_FKEYS
+    /*
+     * Shift-tab is often mapped to XK_ISO_Left_Tab which is classified as
+     * IsEditFunctionKey(), and the conversion does not produce any bytes. 
+     * Check for this special case so we have data when handling the
+     * modifyOtherKeys resource.
+     */
+    if (keyboard->modify_other_keys > 1) {
+	if (IsTabKey(keysym) && nbytes == 0) {
+	    nbytes = 1;
+	    strbuf[0] = '\t';
+	}
+    }
+#endif
+
     /* VT300 & up: backarrow toggle */
     if ((nbytes == 1)
 	&& (((keyboard->flags & MODE_DECBKM) == 0)
@@ -557,9 +629,15 @@
 	MODIFIER_PARM;
 	unparseseq(&reply, pty);
 	key = True;
-    } else if (IsFunctionKey(keysym)
-	       || IsMiscFunctionKey(keysym)
-	       || IsEditFunctionKey(keysym)
+    } else if (((IsFunctionKey(keysym)
+		 || IsMiscFunctionKey(keysym)
+		 || IsEditFunctionKey(keysym))
+#if OPT_MOD_FKEYS
+		&& ((keyboard->modify_other_keys < 2)
+		    || (modify_parm != 5)
+		    || (!IsTabKey(keysym)))
+#endif
+	       )
 #ifdef SunXK_F36
 	       || keysym == SunXK_F36
 	       || keysym == SunXK_F37
@@ -631,6 +709,32 @@
 	    unparseputc(kypd_num[keysym - XK_KP_Space], pty);
 	}
 	key = True;
+#if OPT_MOD_FKEYS
+    } else if ((keyboard->modify_other_keys > 0)
+	       && (nbytes == 1)
+	       && (modify_parm != 0)
+	       && (modify_parm != 2 || keysym >= 256)
+	       && (!(event->state & ControlMask)
+		   || (keyboard->modify_other_keys > 1
+		       && !IsControlInput(keysym))
+		   || (keyboard->modify_other_keys == 1
+		       && !(IsControlInput(keysym)
+			    || IsControlAlias(keysym))))) {
+	/*
+	 * Function-key code 27 happens to not be used in the vt220-style
+	 * encoding.  xterm uses this to represent modified non-function-keys
+	 * such as control/+ in the Sun/PC keyboard layout.  See the
+	 * modifyOtherKeys resource in the manpage for more information.
+	 */
+	TRACE(("...modifyOtherKeys %d;%d\n", modify_parm, strbuf[0]));
+	reply.a_type = CSI;
+	APPEND_PARM(27);
+	APPEND_PARM(modify_parm);
+	APPEND_PARM(strbuf[0]);
+	reply.a_final = '~';
+
+	unparseseq(&reply, pty);
+#endif
     } else if (nbytes > 0) {
 #if OPT_TEK4014
 	if (screen->TekGIN) {
Index: xc/programs/xterm/main.c
diff -u xc/programs/xterm/main.c:3.210 xc/programs/xterm/main.c:3.214
--- xc/programs/xterm/main.c:3.210	Sun Apr  9 20:34:36 2006
+++ xc/programs/xterm/main.c	Mon Apr  9 11:19:12 2007
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.496 2006/04/02 21:35:06 tom Exp $ */
+/* $XTermId: main.c,v 1.502 2006/06/19 22:54:00 e.giaquinta Exp $ */
 
 /*
  *				 W A R N I N G
@@ -87,7 +87,7 @@
 
 ******************************************************************/
 
-/* $XFree86: xc/programs/xterm/main.c,v 3.210 2006/04/10 00:34:36 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/main.c,v 3.214 2007/04/09 15:19:12 tsi Exp $ */
 
 /* main.c */
 
@@ -706,6 +706,10 @@
  * to implement xterm -ls.  They can turn on USE_LOGIN_DASH_P and turn off
  * WTMP and USE_LASTLOG.
  */
+#ifdef __APPLE__
+#define USE_LOGIN_DASH_P
+#define LOGIN_FILENAME "/usr/bin/login"
+#endif
 #ifdef USE_LOGIN_DASH_P
 #ifndef LOGIN_FILENAME
 #define LOGIN_FILENAME "/bin/login"
@@ -1579,6 +1583,82 @@
 
 #endif /* linux && _POSIX_SOURCE */
 
+#if defined(DISABLE_SETUID)
+static void
+disableSetUid(void)
+{
+    int ruid;
+
+    TRACE(("disableSetUid\n"));
+
+    ruid = getuid();
+    if (seteuid(ruid) == -1) {
+	fprintf(stderr, "%s: unable to reset effective uid\n", ProgramName);
+	exit(1);
+    }
+    if (setuid(ruid) == -1) {
+	fprintf(stderr, "%s: unable to reset uid\n", ProgramName);
+	exit(1);
+    }
+}
+#endif
+
+#if defined(USE_UTMP_SETGID)
+static void
+revoke_utmp_gid(void)
+{
+    int rgid = getgid(), egid = getegid();
+
+    /* Switch to real gid */
+    if (rgid != egid) {
+	utmpGid = egid;
+	setegid(rgid);
+	TRACE(("switch to real gid %d after writing utmp\n", (int) getgid()));
+    }
+}
+
+static void
+acquire_utmp_gid(void)
+{
+    if (utmpGid != -1) {
+	/* Switch back to group utmp */
+	setegid(utmpGid);
+	TRACE(("switched back to group %d (check: %d)\n",
+	       utmpGid, (int) getgid()));
+    }
+}
+#endif /* USE_UTMP_SETGID */
+
+#ifdef HAS_SAVED_IDS_AND_SETEUID
+static void
+setEffectiveGroup(gid_t group)
+{
+    if (setegid(group) == -1) {
+#ifdef __MVS__
+	if (!(errno == EMVSERR))	/* could happen if _BPX_SHAREAS=REUSE */
+#endif
+	{
+	    (void) fprintf(stderr, "setegid(%d): %s\n",
+			   (int) group, strerror(errno));
+	}
+    }
+}
+
+static void
+setEffectiveUser(uid_t user)
+{
+    if (seteuid(user) == -1) {
+#ifdef __MVS__
+	if (!(errno == EMVSERR))
+#endif
+	{
+	    (void) fprintf(stderr, "seteuid(%d): %s\n",
+			   (int) user, strerror(errno));
+	}
+    }
+}
+#endif /* HAS_SAVED_IDS_AND_SETEUID */
+
 int
 main(int argc, char *argv[]ENVP_ARG)
 {
@@ -1589,13 +1669,12 @@
     char *my_class = DEFCLASS;
     Window winToEmbedInto = None;
 
+    ProgramName = argv[0];
+
 #ifdef DISABLE_SETUID
-    seteuid(getuid());
-    setuid(getuid());
+    disableSetUid();
 #endif
 
-    ProgramName = argv[0];
-
     /* extra length in case longer tty name like /dev/ttyq255 */
     ttydev = TypeMallocN(char, sizeof(TTYDEV) + 80);
 #ifdef USE_PTY_DEVICE
@@ -1617,8 +1696,7 @@
 
 #if defined(USE_UTMP_SETGID)
     get_pty(NULL, NULL);
-    seteuid(getuid());
-    setuid(getuid());
+    revoke_utmp_gid();	/* Temporarily */
 #define get_pty(pty, from) really_get_pty(pty, from)
 #endif
 
@@ -1897,21 +1975,8 @@
 	uid_t ruid = getuid();
 	gid_t rgid = getgid();
 
-	if (setegid(rgid) == -1) {
-#ifdef __MVS__
-	    if (!(errno == EMVSERR))	/* could happen if _BPX_SHAREAS=REUSE */
-#endif
-		(void) fprintf(stderr, "setegid(%d): %s\n",
-			       (int) rgid, strerror(errno));
-	}
-
-	if (seteuid(ruid) == -1) {
-#ifdef __MVS__
-	    if (!(errno == EMVSERR))
-#endif
-		(void) fprintf(stderr, "seteuid(%d): %s\n",
-			       (int) ruid, strerror(errno));
-	}
+	setEffectiveGroup(rgid);
+	setEffectiveUser(ruid);
 #endif
 
 	XtSetErrorHandler(xt_error);
@@ -1937,29 +2002,8 @@
 	TRACE_XRES();
 
 #ifdef HAS_SAVED_IDS_AND_SETEUID
-	if (seteuid(euid) == -1) {
-#ifdef __MVS__
-	    if (!(errno == EMVSERR))
-#endif
-		(void) fprintf(stderr, "seteuid(%d): %s\n",
-			       (int) euid, strerror(errno));
-	}
-
-	if (setegid(egid) == -1) {
-#ifdef __MVS__
-	    if (!(errno == EMVSERR))
-#endif
-		(void) fprintf(stderr, "setegid(%d): %s\n",
-			       (int) egid, strerror(errno));
-	}
-#endif
-
-#if defined(USE_UTMP_SETGID)
-	if (resource.utmpInhibit) {
-	    /* Can totally revoke group privs */
-	    setegid(getgid());
-	    setgid(getgid());
-	}
+	setEffectiveUser(euid);
+	setEffectiveGroup(egid);
 #endif
     }
 
@@ -2227,7 +2271,7 @@
 	int i = -1;
 	if (debug) {
 	    timestamp_filename(dbglogfile, "xterm.debug.log.");
-	    if (creat_as(getuid(), getgid(), False, dbglogfile, 0666)) {
+	    if (creat_as(getuid(), getgid(), False, dbglogfile, 0666) > 0) {
 		i = open(dbglogfile, O_WRONLY | O_TRUNC);
 	    }
 	}
@@ -2967,8 +3011,8 @@
 #ifdef USE_PTY_DEVICE
 	set_pty_id(ptydev, passedPty);
 #endif
-	setgid(screen->gid);
-	setuid(screen->uid);
+	if (xtermResetIds(screen) < 0)
+	    exit(1);
     } else {
 	Bool tty_got_hung;
 
@@ -3939,6 +3983,9 @@
 		xtermSetenv("LOGNAME=", login_name);	/* for POSIX */
 	    }
 #ifndef USE_UTEMPTER
+#ifdef USE_UTMP_SETGID
+	    acquire_utmp_gid();
+#endif
 #ifdef USE_SYSV_UTMP
 	    /* Set up our utmp entry now.  We need to do it here
 	     * for the following reasons:
@@ -4097,26 +4144,24 @@
 #ifdef USE_LASTLOG
 	    if (term->misc.login_shell &&
 		(i = open(etc_lastlog, O_WRONLY)) >= 0) {
-		bzero((char *) &lastlog, sizeof(struct lastlog));
+		size_t size = sizeof(struct lastlog);
+		off_t offset = (screen->uid * size);
+
+		bzero((char *) &lastlog, size);
 		(void) strncpy(lastlog.ll_line,
 			       my_pty_name(ttydev),
 			       sizeof(lastlog.ll_line));
 		SetUtmpHost(lastlog.ll_host, screen);
 		lastlog.ll_time = time((time_t *) 0);
-		lseek(i, (long) (screen->uid * sizeof(struct lastlog)), 0);
-		write(i, (char *) &lastlog, sizeof(struct lastlog));
+		if (lseek(i, offset, 0) != (off_t) (-1)) {
+		    write(i, (char *) &lastlog, size);
+		}
 		close(i);
 	    }
 #endif /* USE_LASTLOG */
 
 #if defined(USE_UTMP_SETGID)
-	    /* Switch to real gid after writing utmp entry */
-	    utmpGid = getegid();
-	    if (getgid() != getegid()) {
-		utmpGid = getegid();
-		setegid(getgid());
-		TRACE(("switch to real gid %d after writing utmp\n", getgid()));
-	    }
+	    revoke_utmp_gid();
 #endif
 
 #if OPT_PTY_HANDSHAKE
@@ -4309,6 +4354,9 @@
 #endif /* !TERMIO_STRUCT */
 
 #ifdef USE_LOGIN_DASH_P
+#ifdef __APPLE__
+	    added_utmp_entry = 1;	/* login does this for us */
+#endif
 	    if (term->misc.login_shell && pw && added_utmp_entry)
 		execl(bin_login, "login", "-p", "-f", login_name, (void *) 0);
 #endif
@@ -4486,12 +4534,7 @@
 #endif /* OPT_PTY_HANDSHAKE */
 	) {
 #if defined(USE_UTMP_SETGID)
-	if (utmpGid != -1) {
-	    /* Switch back to group utmp */
-	    setegid(utmpGid);
-	    TRACE(("switched back to group %d (check: %d)\n",
-		   utmpGid, (int) getgid()));
-	}
+	acquire_utmp_gid();
 #endif
 	init_utmp(USER_PROCESS, &utmp);
 	(void) call_setutent();
@@ -4537,31 +4580,43 @@
 	    memset(utptr, 0, sizeof(*utptr));	/* keep searching */
 	}
 	(void) call_endutent();
+#ifdef USE_UTMP_SETGID
+	revoke_utmp_gid();
+#endif
     }
 #else /* not USE_SYSV_UTMP */
     int wfd;
     struct utmp utmp;
 
     if (!resource.utmpInhibit && added_utmp_entry &&
-	(am_slave < 0 && tslot > 0 && (wfd = open(etc_utmp, O_WRONLY)) >= 0)) {
-	bzero((char *) &utmp, sizeof(utmp));
-	lseek(wfd, (long) (tslot * sizeof(utmp)), 0);
-	write(wfd, (char *) &utmp, sizeof(utmp));
-	close(wfd);
-#ifdef WTMP
-	if (term->misc.login_shell &&
-	    (wfd = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) {
-	    (void) strncpy(utmp.ut_line,
-			   my_pty_name(ttydev),
-			   sizeof(utmp.ut_line));
-	    utmp.ut_time = time((time_t *) 0);
+	(am_slave < 0 && tslot > 0)) {
+#if defined(USE_UTMP_SETGID)
+	acquire_utmp_gid();
+#endif
+	if ((wfd = open(etc_utmp, O_WRONLY)) >= 0) {
+	    bzero((char *) &utmp, sizeof(utmp));
+	    lseek(wfd, (long) (tslot * sizeof(utmp)), 0);
 	    write(wfd, (char *) &utmp, sizeof(utmp));
 	    close(wfd);
-	}
+#ifdef WTMP
+	    if (term->misc.login_shell &&
+		(wfd = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) {
+		(void) strncpy(utmp.ut_line,
+			       my_pty_name(ttydev),
+			       sizeof(utmp.ut_line));
+		utmp.ut_time = time((time_t *) 0);
+		write(wfd, (char *) &utmp, sizeof(utmp));
+		close(wfd);
+	    }
 #endif /* WTMP */
+	}
+#ifdef USE_UTMP_SETGID
+	revoke_utmp_gid();
+#endif
     }
 #endif /* USE_SYSV_UTMP */
 #endif /* HAVE_UTMP */
+
     close(screen->respond);	/* close explicitly to avoid race with slave side */
 #ifdef ALLOWLOGGING
     if (screen->logging)
Index: xc/programs/xterm/misc.c
diff -u xc/programs/xterm/misc.c:3.106 xc/programs/xterm/misc.c:3.107
--- xc/programs/xterm/misc.c:3.106	Sun Apr  9 20:34:37 2006
+++ xc/programs/xterm/misc.c	Sun Jun 18 20:36:51 2006
@@ -1,6 +1,6 @@
-/* $XTermId: misc.c,v 1.296 2006/04/02 21:35:06 tom Exp $ */
+/* $XTermId: misc.c,v 1.301 2006/06/16 22:51:39 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/misc.c,v 3.106 2006/04/10 00:34:37 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */
 
 /*
  *
@@ -503,13 +503,13 @@
 static long lastBellTime;	/* in milliseconds */
 
 void
-Bell(int which GCC_UNUSED, int percent)
+Bell(Atom which GCC_UNUSED, int percent)
 {
     TScreen *screen = &term->screen;
     struct timeval curtime;
     long now_msecs;
 
-    TRACE(("BELL %d\n", percent));
+    TRACE(("BELL %ld %d%%\n", (long) which, percent));
     if (!XtIsRealized((Widget) term)) {
 	return;
     }
@@ -535,7 +535,7 @@
     if (screen->visualbell) {
 	VisualBell();
     } else {
-#if defined(HAVE_XKBBELL)
+#if defined(HAVE_XKB_BELL_EXT)
 	XkbBell(screen->display, VShellWindow, percent, which);
 #else
 	XBell(screen->display, percent);
@@ -1022,7 +1022,7 @@
     chown(path, uid, gid);
 #else
     if ((access(path, F_OK) != 0 && (errno != ENOENT))
-	|| (!(creat_as(uid, gid, append, path, 0644)))
+	|| (creat_as(uid, gid, append, path, 0644) <= 0)
 	|| ((fd = open(path, O_WRONLY | O_APPEND)) < 0)) {
 	int the_error = errno;
 	fprintf(stderr, "%s: cannot open %s: %d:%s\n",
@@ -1060,8 +1060,10 @@
  * effective user ids are the same, so this remains as a convenience function
  * for the debug logs.
  *
- * Returns 1 if we can proceed to open the file in relative safety, 0
- * otherwise.
+ * Returns
+ *	 1 if we can proceed to open the file in relative safety,
+ *	-1 on error, e.g., cannot fork
+ *	 0 otherwise.
  */
 int
 creat_as(uid_t uid, gid_t gid, Bool append, char *pathname, int mode)
@@ -1096,16 +1098,22 @@
     pid = fork();
     switch (pid) {
     case 0:			/* child */
-	setgid(gid);
-	setuid(uid);
-	fd = open(pathname,
-		  O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
-		  mode);
-	if (fd >= 0) {
-	    close(fd);
-	    _exit(0);
-	} else
-	    _exit(1);
+	if (setgid(gid) == -1
+	    || setuid(uid) == -1) {
+	    /* we cannot report an error here via stderr, just quit */
+	    retval = 1;
+	} else {
+	    fd = open(pathname,
+		      O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL),
+		      mode);
+	    if (fd >= 0) {
+		close(fd);
+		retval = 0;
+	    } else {
+		retval = 1;
+	    }
+	}
+	_exit(retval);
 	/* NOTREACHED */
     case -1:			/* error */
 	return retval;
@@ -1145,6 +1153,21 @@
 }
 #endif /* !VMS */
 
+int
+xtermResetIds(TScreen * screen)
+{
+    int result = 0;
+    if (setgid(screen->gid) == -1) {
+	fprintf(stderr, "%s: unable to reset group-id\n", ProgramName);
+	result = -1;
+    }
+    if (setuid(screen->uid) == -1) {
+	fprintf(stderr, "%s: unable to reset user-id\n", ProgramName);
+	result = -1;
+    }
+    return result;
+}
+
 #ifdef ALLOWLOGGING
 
 /*
@@ -1264,8 +1287,8 @@
 	    signal(SIGCHLD, SIG_DFL);
 
 	    /* (this is redundant) */
-	    setgid(screen->gid);
-	    setuid(screen->uid);
+	    if (xtermResetIds(screen) < 0)
+		exit(ERROR_SETUID);
 
 	    execl(shell, shell, "-c", &screen->logfile[1], (void *) 0);
 
@@ -2348,7 +2371,7 @@
 		XChangeProperty(dpy, VShellWindow,
 				my_atom, XA_UTF8_STRING(dpy), 8,
 				PropModeReplace,
-				(Char *) original, strlen(original));
+				(Char *) original, (int) strlen(original));
 	    } else {
 		TRACE(("...deleting %s\n", propname));
 		XDeleteProperty(dpy, VShellWindow, my_atom);
Index: xc/programs/xterm/os2main.c
diff -u xc/programs/xterm/os2main.c:3.86 xc/programs/xterm/os2main.c:3.87
--- xc/programs/xterm/os2main.c:3.86	Sun Apr  9 20:34:37 2006
+++ xc/programs/xterm/os2main.c	Sun Jun 18 20:36:51 2006
@@ -1,10 +1,10 @@
-/* $XTermId: os2main.c,v 1.219 2006/04/08 22:08:35 tom Exp $ */
+/* $XTermId: os2main.c,v 1.221 2006/06/14 23:07:31 tom Exp $ */
 
 /* removed all foreign stuff to get the code more clear (hv)
  * and did some rewrite for the obscure OS/2 environment
  */
 
-/* $XFree86: xc/programs/xterm/os2main.c,v 3.86 2006/04/10 00:34:37 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/os2main.c,v 3.87 2006/06/19 00:36:51 dickey Exp $ */
 
 /***********************************************************
 
@@ -1567,8 +1567,7 @@
 	ptydev[strlen(ptydev) - 1] =
 	    ttydev[strlen(ttydev) - 1] = passedPty[1];
 
-	setgid(screen->gid);
-	setuid(screen->uid);
+	(void) xtermResetIds(screen);
     } else {
 	Bool tty_got_hung;
 
@@ -1823,8 +1822,7 @@
 		close_fd(ttyfd);
 
 	    setpgrp(0, pgrp);
-	    setgid(screen->gid);
-	    setuid(screen->uid);
+	    (void) xtermResetIds(screen);
 
 	    if (handshake.rows > 0 && handshake.cols > 0) {
 		set_max_row(screen, handshake.rows);
Index: xc/programs/xterm/print.c
diff -u xc/programs/xterm/print.c:1.23 xc/programs/xterm/print.c:1.24
--- xc/programs/xterm/print.c:1.23	Sun Feb 12 20:14:59 2006
+++ xc/programs/xterm/print.c	Sun Jun 18 20:36:51 2006
@@ -1,7 +1,7 @@
-/* $XTermId: print.c,v 1.66 2006/02/01 01:03:15 tom Exp $ */
+/* $XTermId: print.c,v 1.69 2006/06/16 22:40:13 tom Exp $ */
 
 /*
- * $XFree86: xc/programs/xterm/print.c,v 1.23 2006/02/13 01:14:59 dickey Exp $
+ * $XFree86: xc/programs/xterm/print.c,v 1.24 2006/06/19 00:36:51 dickey Exp $
  */
 
 /************************************************************
@@ -61,8 +61,8 @@
 #define VMS_TEMP_PRINT_FILE "sys$scratch:xterm_print.txt"
 #endif
 
-static void charToPrinter(int chr);
-static void printLine(int row, int chr);
+static void charToPrinter(unsigned chr);
+static void printLine(int row, unsigned chr);
 static void send_CharSet(int row);
 static void send_SGR(unsigned attr, unsigned fg, unsigned bg);
 static void stringToPrinter(char *str);
@@ -119,7 +119,7 @@
  * characters that xterm would allow as a selection (which may include blanks).
  */
 static void
-printLine(int row, int chr)
+printLine(int row, unsigned chr)
 {
     TScreen *screen = &term->screen;
     int inx = ROW2INX(screen, row);
@@ -210,9 +210,9 @@
 		cs = (ch >= ' ' && ch != 0x7f) ? CSET_IN : CSET_OUT;
 	    if (last_cs != cs) {
 		if (screen->print_attributes) {
-		    charToPrinter((cs == CSET_OUT)
+		    charToPrinter((unsigned)((cs == CSET_OUT)
 				  ? SHIFT_OUT
-				  : SHIFT_IN);
+				  : SHIFT_IN));
 		}
 		last_cs = cs;
 	    }
@@ -222,7 +222,7 @@
 	     * corresponding charset information is not encoded
 	     * into the CSETS array.
 	     */
-	    charToPrinter((int) ((cs == CSET_OUT)
+	    charToPrinter(((cs == CSET_OUT)
 				 ? (ch == 0x7f ? 0x5f : (ch + 0x5f))
 				 : ch));
 	    if_OPT_WIDE_CHARS(screen, {
@@ -356,7 +356,7 @@
  * This implementation only knows how to write to a pipe.
  */
 static void
-charToPrinter(int chr)
+charToPrinter(unsigned chr)
 {
     TScreen *screen = &term->screen;
 
@@ -395,8 +395,9 @@
 		close(fileno(stderr));
 	    }
 
-	    setgid(screen->gid);	/* don't want privileges! */
-	    setuid(screen->uid);
+	    /* don't want privileges! */
+	    if (xtermResetIds(screen) < 0)
+		exit(1);
 
 	    Printer = popen(screen->printer_command, "w");
 	    input = fdopen(my_pipe[0], "r");
@@ -420,11 +421,11 @@
 #if OPT_WIDE_CHARS
 	if (chr > 127) {
 	    Char temp[10];
-	    *convertToUTF8(temp, (unsigned) chr) = 0;
+	    *convertToUTF8(temp, chr) = 0;
 	    fputs((char *) temp, Printer);
 	} else
 #endif
-	    fputc(chr, Printer);
+	    fputc((int) chr, Printer);
 	if (isForm(chr))
 	    fflush(Printer);
     }
@@ -434,7 +435,7 @@
 stringToPrinter(char *str)
 {
     while (*str)
-	charToPrinter(*str++);
+	charToPrinter(CharOf(*str++));
 }
 
 /*
@@ -489,7 +490,7 @@
  * or VT) that moved the cursor off the previous line.
  */
 void
-xtermAutoPrint(int chr)
+xtermAutoPrint(unsigned chr)
 {
     TScreen *screen = &term->screen;
 
Index: xc/programs/xterm/ptyx.h
diff -u xc/programs/xterm/ptyx.h:3.133 xc/programs/xterm/ptyx.h:3.134
--- xc/programs/xterm/ptyx.h:3.133	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/ptyx.h	Sun Jun 18 20:36:51 2006
@@ -1,6 +1,6 @@
-/* $XTermId: ptyx.h,v 1.421 2006/04/30 16:55:52 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.423 2006/06/17 13:45:57 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/ptyx.h,v 3.133 2006/04/30 21:55:39 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/ptyx.h,v 3.134 2006/06/19 00:36:51 dickey Exp $ */
 
 /*
  * Copyright 1999-2005,2006 by Thomas E. Dickey
@@ -1712,7 +1712,8 @@
 #if OPT_INITIAL_ERASE
     int	reset_DECBKM;		/* reset should set DECBKM */
 #endif
-    int modify_cursor_keys;	/* how to handle modifiers */
+    int modify_cursor_keys;	/* how to handle cursor-key modifiers */
+    int modify_other_keys;	/* how to handle other key-modifiers */
 } TKeyboard;
 
 typedef struct {
Index: xc/programs/xterm/screen.c
diff -u xc/programs/xterm/screen.c:3.76 xc/programs/xterm/screen.c:3.77
--- xc/programs/xterm/screen.c:3.76	Sun Feb 12 20:14:59 2006
+++ xc/programs/xterm/screen.c	Sun Jun 18 20:36:51 2006
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.190 2006/02/12 22:43:55 tom Exp $ */
+/* $XTermId: screen.c,v 1.192 2006/06/16 21:42:46 tom Exp $ */
 
 /*
  * Copyright 1999-2005,2006 by Thomas E. Dickey
@@ -52,7 +52,7 @@
  * SOFTWARE.
  */
 
-/* $XFree86: xc/programs/xterm/screen.c,v 3.76 2006/02/13 01:14:59 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/screen.c,v 3.77 2006/06/19 00:36:51 dickey Exp $ */
 
 /* screen.c */
 
@@ -563,7 +563,7 @@
 	memset(fbb, (Char) (cur_fg_bg & 0xff), real_width);
     });
     if_OPT_ISO_TRADITIONAL_COLORS(screen, {
-	memset(fb, cur_fg_bg, real_width);
+	memset(fb, (int) cur_fg_bg, real_width);
     });
     if_OPT_DEC_CHRSET({
 	memset(cb, curXtermChrSet(screen->cur_row), real_width);
@@ -621,7 +621,7 @@
 		    memset(screen->save_ptr[i + j], term->cur_background, size);
 #else
 		else if (j == OFF_COLOR)
-		    memset(screen->save_ptr[i + j], xtermColorPair(), size);
+		    memset(screen->save_ptr[i + j], (int) xtermColorPair(), size);
 #endif
 #endif
 		else
@@ -777,7 +777,7 @@
     if_OPT_ISO_TRADITIONAL_COLORS(screen, {
 	ptr = BUF_COLOR(sb, row);
 	memmove(ptr + col + n, ptr + col, nbytes);
-	memset(ptr + col, xtermColorPair(), n);
+	memset(ptr + col, (int) xtermColorPair(), n);
     });
     if_OPT_DEC_CHRSET({
 	ptr = BUF_CSETS(sb, row);
@@ -854,7 +854,7 @@
     if_OPT_ISO_TRADITIONAL_COLORS(screen, {
 	ptr = BUF_COLOR(sb, row);
 	memmove(ptr + col, ptr + col + n, nbytes);
-	memset(ptr + last - n, xtermColorPair(), n);
+	memset(ptr + last - n, (int) xtermColorPair(), n);
     });
     if_OPT_DEC_CHRSET({
 	ptr = BUF_CSETS(sb, row);
@@ -1338,7 +1338,7 @@
 	    memset(BUF_BGRND(buf, row), term->cur_background, len);
 	});
 	if_OPT_ISO_TRADITIONAL_COLORS(screen, {
-	    memset(BUF_COLOR(buf, row), xtermColorPair(), len);
+	    memset(BUF_COLOR(buf, row), (int) xtermColorPair(), len);
 	});
 	if_OPT_DEC_CHRSET({
 	    memset(BUF_CSETS(buf, row), 0, len);
Index: xc/programs/xterm/util.c
diff -u xc/programs/xterm/util.c:3.97 xc/programs/xterm/util.c:3.98
--- xc/programs/xterm/util.c:3.97	Sun Mar 12 20:27:59 2006
+++ xc/programs/xterm/util.c	Sun Jun 18 20:36:52 2006
@@ -1,6 +1,6 @@
-/* $XTermId: util.c,v 1.269 2006/03/12 23:12:07 tom Exp $ */
+/* $XTermId: util.c,v 1.272 2006/06/17 14:40:31 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/util.c,v 3.97 2006/03/13 01:27:59 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/util.c,v 3.98 2006/06/19 00:36:52 dickey Exp $ */
 
 /*
  * Copyright 1999-2005,2006 by Thomas E. Dickey
@@ -994,7 +994,7 @@
 	memset(SCRN_BUF_BGRND(screen, row) + col, term->cur_background, len);
     });
     if_OPT_ISO_TRADITIONAL_COLORS(screen, {
-	memset(SCRN_BUF_COLOR(screen, row) + col, xtermColorPair(), len);
+	memset(SCRN_BUF_COLOR(screen, row) + col, (int) xtermColorPair(), len);
     });
     if_OPT_DEC_CHRSET({
 	memset(SCRN_BUF_CSETS(screen, row) + col,
@@ -2875,25 +2875,40 @@
     };
     Cardinal n;
 
-    if (x_strcasecmp(rp->keyboardType, "unknown")) {
+    TRACE(("decode_keyboard_type(%s)\n", rp->keyboardType));
+    if (!x_strcasecmp(rp->keyboardType, "unknown")) {
+	/*
+	 * Let the individual resources comprise the keyboard-type.
+	 */
+	for (n = 0; n < XtNumber(table); ++n)
+	    init_keyboard_type(table[n].type, FLAG(n));
+    } else if (!x_strcasecmp(rp->keyboardType, "default")) {
+	/*
+	 * Set the keyboard-type to the Sun/PC type, allowing modified
+	 * function keys, etc.
+	 */
+	for (n = 0; n < XtNumber(table); ++n)
+	    init_keyboard_type(table[n].type, False);
+    } else {
 	Bool found = False;
+
+	/*
+	 * Choose an individual keyboard type.
+	 */
 	for (n = 0; n < XtNumber(table); ++n) {
 	    if (!x_strcasecmp(rp->keyboardType, table[n].name + 1)) {
 		FLAG(n) = True;
 		found = True;
-		init_keyboard_type(table[n].type, FLAG(n));
 	    } else {
 		FLAG(n) = False;
 	    }
+	    init_keyboard_type(table[n].type, FLAG(n));
 	}
 	if (!found) {
 	    fprintf(stderr,
 		    "KeyboardType resource \"%s\" not found\n",
 		    rp->keyboardType);
 	}
-    } else {
-	for (n = 0; n < XtNumber(table); ++n)
-	    init_keyboard_type(table[n].type, FLAG(n));
     }
 #undef DATA
 #undef FLAG
Index: xc/programs/xterm/version.h
diff -u xc/programs/xterm/version.h:3.124 xc/programs/xterm/version.h:3.126
--- xc/programs/xterm/version.h:3.124	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/version.h	Mon Jun 19 20:42:38 2006
@@ -1,5 +1,5 @@
-/* $XTermId: version.h,v 1.265 2006/04/26 13:16:01 tom Exp $ */
-/* $XFree86: xc/programs/xterm/version.h,v 3.124 2006/04/30 21:55:39 dickey Exp $ */
+/* $XTermId: version.h,v 1.269 2006/06/19 22:47:00 tom Exp $ */
+/* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey Exp $ */
 
 /*
  * These definitions are used to build the string that's printed in response to
@@ -7,7 +7,7 @@
  * version of X to which this version of xterm has been built.  The number in
  * parentheses is my patch number (T.Dickey).
  */
-#define XTERM_PATCH   213
+#define XTERM_PATCH   215
 
 #ifndef __vendorversion__
 #define __vendorversion__ "XTerm"
Index: xc/programs/xterm/wcwidth.c
diff -u xc/programs/xterm/wcwidth.c:1.8 xc/programs/xterm/wcwidth.c:1.9
--- xc/programs/xterm/wcwidth.c:1.8	Sun Mar 19 19:36:19 2006
+++ xc/programs/xterm/wcwidth.c	Sun Jun 18 20:36:52 2006
@@ -1,6 +1,6 @@
-/* $XTermId: wcwidth.c,v 1.16 2006/03/19 21:20:46 tom Exp $ */
+/* $XTermId: wcwidth.c,v 1.18 2006/06/16 22:29:17 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/wcwidth.c,v 1.8 2006/03/20 00:36:19 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */
 
 /*
  * This is an implementation of wcwidth() and wcswidth() (defined in
@@ -289,7 +289,7 @@
   };
 
   /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, ambiguous,
+  if (bisearch((unsigned long) ucs, ambiguous,
                sizeof(ambiguous) / sizeof(struct interval) - 1))
     return 2;
 
Index: xc/programs/xterm/xterm.h
diff -u xc/programs/xterm/xterm.h:3.116 xc/programs/xterm/xterm.h:3.117
--- xc/programs/xterm/xterm.h:3.116	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/xterm.h	Sun Jun 18 20:36:52 2006
@@ -1,6 +1,6 @@
-/* $XTermId: xterm.h,v 1.380 2006/04/30 16:54:58 tom Exp $ */
+/* $XTermId: xterm.h,v 1.386 2006/06/17 13:46:36 tom Exp $ */
 
-/* $XFree86: xc/programs/xterm/xterm.h,v 3.116 2006/04/30 21:55:39 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/xterm.h,v 3.117 2006/06/19 00:36:52 dickey Exp $ */
 
 /************************************************************
 
@@ -207,7 +207,7 @@
 #endif
 
 #if defined(XKB)
-#define HAVE_XKBBELL 1
+#define HAVE_XKB_BELL_EXT 1
 #endif
 
 #endif /* HAVE_CONFIG_H */
@@ -398,6 +398,7 @@
 #define XtNmetaSendsEscape	"metaSendsEscape"
 #define XtNmkWidth		"mkWidth"
 #define XtNmodifyCursorKeys	"modifyCursorKeys"
+#define XtNmodifyOtherKeys	"modifyOtherKeys"
 #define XtNmultiClickTime	"multiClickTime"
 #define XtNmultiScroll		"multiScroll"
 #define XtNnMarginBell		"nMarginBell"
@@ -523,6 +524,7 @@
 #define XtCMetaSendsEscape	"MetaSendsEscape"
 #define XtCMkWidth 		"MkWidth"
 #define XtCModifyCursorKeys	"ModifyCursorKeys"
+#define XtCModifyOtherKeys	"ModifyOtherKeys"
 #define XtCMultiClickTime	"MultiClickTime"
 #define XtCMultiScroll		"MultiScroll"
 #define XtCNumLock		"NumLock"
@@ -791,7 +793,8 @@
 extern int open_userfile (uid_t uid, gid_t gid, char *path, Bool append);
 extern int xerror (Display *d, XErrorEvent *ev);
 extern int xioerror (Display *dpy);
-extern void Bell (int which, int percent);
+extern int xtermResetIds(TScreen * screen);
+extern void Bell (Atom which, int percent);
 extern void ChangeXprop (char *name);
 extern void Changename (char *name);
 extern void Changetitle (char *name);
@@ -856,7 +859,7 @@
 extern Bool xtermHasPrinter (void);
 extern int xtermPrinterControl (int chr);
 extern void setPrinterControlMode (int mode);
-extern void xtermAutoPrint (int chr);
+extern void xtermAutoPrint (unsigned chr);
 extern void xtermMediaControl (int param, int private_seq);
 extern void xtermPrintScreen (Bool use_DECPEX);
 
Index: xc/programs/xterm/xterm.log.html
diff -u xc/programs/xterm/xterm.log.html:1.149 xc/programs/xterm/xterm.log.html:1.152
--- xc/programs/xterm/xterm.log.html:1.149	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/xterm.log.html	Thu Aug  2 12:43:14 2007
@@ -20,8 +20,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            *
  *****************************************************************************
-  $XTermId: xterm.log.html,v 1.413 2006/04/30 21:30:05 tom Exp $
-  $XFree86: xc/programs/xterm/xterm.log.html,v 1.149 2006/04/30 21:55:39 dickey Exp $
+  $XTermId: xterm.log.html,v 1.428 2006/06/19 23:25:49 tom Exp $
+  $XFree86: xc/programs/xterm/xterm.log.html,v 1.152 2007/08/02 16:43:14 tsi Exp $
   -->
 <HTML>
 <HEAD>
@@ -46,6 +46,8 @@
 is the latest version of this file.
 
 <UL>
+<LI><A HREF="#xterm_215">Patch #215 - 2006/6/19 - XFree86 4.6.99.2</A>
+<LI><A HREF="#xterm_214">Patch #214 - 2006/6/18 - XFree86 4.6.99.2</A>
 <LI><A HREF="#xterm_213">Patch #213 - 2006/4/30 - XFree86 4.5.99.905</A>
 <LI><A HREF="#xterm_212">Patch #212 - 2006/4/9 - XFree86 4.5.99.904</A>
 <LI><A HREF="#xterm_211">Patch #211 - 2006/3/19 - XFree86 4.5.99.902</A>
@@ -262,6 +264,55 @@
 <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
 </UL>
 
+<H1><A NAME="xterm_215">Patch #215 - 2006/6/18 - XFree86 4.6.99.2</A></H1>
+<ul>
+	<li>improve setgid support by exploiting the saved-ids feature on which
+	    it relies (patch by Emanuele Giaquinta).
+
+	<li>make the <code>modifyOtherKeys</code> resource disabled by default
+	    since the intermediate setting altered some common bindings
+	    (report by Emanuele Giaquinta).
+</ul>
+
+<H1><A NAME="xterm_214">Patch #214 - 2006/6/18 - XFree86 4.6.99.2</A></H1>
+<ul>
+	<li>modify makefile rule for ctlseqs.txt to strip backspace/overstrikes,
+	    and add a copy of ctlseqs.txt to the source tarballs (requests by
+	    Bram Moolenaar, Emanuele Giaquinta).
+
+	<li>add <code>modifyOtherKeys</code> resource, analogous to the
+	    <code>modifyCursorKeys</code> resource.  This applies to keys that
+	    normally would transmit nothing when a given modifier is applied
+	    (request by Dan Nicolaescu).
+
+	<li>add <code>default</code> to the acceptable values for the
+	    <code>keyboardType</code> resource, allowing the <code>-kt</code>
+	    command-line option to override app-defaults resource settings of
+	    <code>sunKeyboard</code>, etc.
+
+	<li>correct ifdef's for <code>XkbBell()</code> which used the header
+	    file but not the corresponding function in
+	    <a href="#xterm_175">patch #175</a>
+	    (report by Zach Beane).
+
+	<li>add xterm manpage to the <code>--with-symlink</code> logic.
+
+	<li>regenerated configure script to omit some debugging artifacts of
+	    the SIGWINCH test.
+
+	<li>fix <code>install-man</code> rule in <code>Makefile.in</code> to
+	    avoid including the <code>$(DESTDIR)</code> value in substitutions
+	    made on the manpages (patch by Emanuele Giaquinta).
+
+	<li>improved fix for cursor deallocation
+	    (Redhat #186935, patch by Jason Vas Dias).
+
+	<li>improve checks for setuid/setgid operation to accommodate limited
+	    resource management in some kernels (GenToo #193238).
+
+	<li>update config.guess, config.sub
+</ul>
+
 <H1><A NAME="xterm_213">Patch #213 - 2006/4/30 - XFree86 4.5.99.905</A></H1>
 <ul>
 	<li>minor optimization to cell layout; will use that to simplify some
Index: xc/programs/xterm/xterm.man
diff -u xc/programs/xterm/xterm.man:3.124 xc/programs/xterm/xterm.man:3.126
--- xc/programs/xterm/xterm.man:3.124	Sun Apr 30 17:55:39 2006
+++ xc/programs/xterm/xterm.man	Mon Jun 19 20:42:38 2006
@@ -1,4 +1,4 @@
-.\" $XTermId: xterm.man,v 1.340 2006/04/30 18:00:36 tom Exp $
+.\" $XTermId: xterm.man,v 1.346 2006/06/19 22:45:57 tom Exp $
 .\"
 .\" Copyright 1996-2005,2006 by Thomas E. Dickey
 .\"
@@ -53,7 +53,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xterm/xterm.man,v 3.124 2006/04/30 21:55:39 dickey Exp $
+.\" $XFree86: xc/programs/xterm/xterm.man,v 3.126 2006/06/20 00:42:38 dickey Exp $
 .\"
 .\" updated by Thomas E. Dickey for XFree86, July 1996 - February 2006.
 .
@@ -586,9 +586,25 @@
 .TP 8
 .BI -kt " keyboardtype"
 This option sets the \fBkeyboardType\fP resource.
-Possible values include: ``hp'', ``sco'', ``sun'' and ``vt220''.
-The default value ``unknown'',
+Possible values include:
+``unknown'',
+``default'',
+``hp'',
+``sco'',
+``sun'' and
+``vt220''.
+.IP
+The value ``unknown'',
 causes the corresponding resource to be ignored.
+.IP
+The value ``default'',
+suppresses the associated resources
+.BR hpFunctionKeys ,
+.BR scoFunctionKeys ,
+.BR sunFunctionKeys
+and
+.BR sunKeyboard ,
+using the Sun/PC keyboard layout.
 .TP 8
 .B -l
 Turn logging on.
@@ -2036,11 +2052,30 @@
 Tells how to handle the special case where
 Control-, Shift-, Alt- or Meta-modifiers are used to add a parameter to
 the escape sequence returned by a cursor-key.
+The default is ``2'':
+.IP
 Set it to 0 to use the old/obsolete behavior.
+.br
 Set it to 1 to prefix modified sequences with CSI.
+.br
 Set it to 2 to force the modifier to be the second parameter.
+.br
 Set it to 3 to mark the sequence with a '>' to hint that it is private.
-The default is ``2''.
+.TP 8
+.B "modifyOtherKeys (\fPclass\fB ModifyOtherKeys\fP)"
+Like \fBmodifyCursorKeys\fP, tells \fIxterm\fP to construct an
+escape sequence for other keys (such as "2") when modified by
+Control-, Alt- or Meta-modifiers.
+This feature does not apply to function keys and well-defined
+keys such as ESC or the control keys.
+The default is ``0'':
+.IP
+Set it to 0 to disable this feature.
+.br
+Set it to 1 to enable this feature for keys except Tab and some special
+control character cases, e.g., Control-Space to make a NUL.
+.br
+Set it to 1 to enable this feature for keys including the exceptions listed.
 .TP 8
 .B "multiClickTime (\fPclass\fB MultiClickTime)"
 Specifies the maximum time in milliseconds between multi-click select
Index: xc/programs/xterm/xtermcfg.hin
diff -u xc/programs/xterm/xtermcfg.hin:3.60 xc/programs/xterm/xtermcfg.hin:3.61
--- xc/programs/xterm/xtermcfg.hin:3.60	Sun Mar 12 20:28:00 2006
+++ xc/programs/xterm/xtermcfg.hin	Sun Jun 18 20:36:52 2006
@@ -1,7 +1,7 @@
-/* $XTermId: xtermcfg.hin,v 1.149 2006/03/12 22:36:17 tom Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.151 2006/06/16 22:45:03 tom Exp $ */
 
 /*
- * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.60 2006/03/13 01:28:00 dickey Exp $
+ * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.61 2006/06/19 00:36:52 dickey Exp $
  */
 
 /************************************************************
@@ -145,6 +145,7 @@
 #undef const			/* AC_CONST */
 #undef gid_t			/* AC_TYPE_UID_T */
 #undef mode_t			/* AC_TYPE_MODE_T */
+#undef off_t			/* AC_TYPE_OFF_T */
 #undef pid_t			/* AC_TYPE_PID_T */
 #undef size_t			/* AC_TYPE_SIZE_T */
 #undef time_t			/* AC_CHECK_TYPE(time_t, long) */
Index: xc/programs/xtrap/xtrapin.c
diff -u xc/programs/xtrap/xtrapin.c:1.3 xc/programs/xtrap/xtrapin.c:1.4
--- xc/programs/xtrap/xtrapin.c:1.3	Tue May 27 18:27:13 2003
+++ xc/programs/xtrap/xtrapin.c	Mon Apr  9 11:37:21 2007
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.3 2003/05/27 22:27:13 tsi Exp $ */
+/* $XFree86: xc/programs/xtrap/xtrapin.c,v 1.4 2007/04/09 15:37:21 tsi Exp $ */
 /*
  * @DEC_COPYRIGHT@
  */
@@ -142,6 +142,7 @@
     poptarg = XEgetoptarg();
 #endif
 
+    (void) memset(&rec, 0, sizeof(rec));
     ifp = NULL;
     *popterr = 0; /* don't complain about -d for display */
     grabFlag = False;
Index: xc/programs/xwd/Imakefile
diff -u xc/programs/xwd/Imakefile:1.7 xc/programs/xwd/Imakefile:1.8
--- xc/programs/xwd/Imakefile:1.7	Mon Jan  9 10:01:56 2006
+++ xc/programs/xwd/Imakefile	Mon Sep  4 11:57:55 2006
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/xwd/Imakefile,v 1.7 2006/01/09 15:01:56 dawes Exp $
+XCOMM $XFree86: xc/programs/xwd/Imakefile,v 1.8 2006/09/04 15:57:55 tsi Exp $
 
         DEPLIBS = XkbClientDepLibs $(DEPXMUULIB) $(DEPXONLYLIB)
 LOCAL_LIBRARIES = XkbClientLibs $(XMUULIB) $(XONLYLIB)
@@ -8,5 +8,6 @@
 
 LinkSourceFile(dsimple.c,../xlsfonts)
 LinkSourceFile(dsimple.h,../xlsfonts)
+SpecialObjectRule(xwd.o,dsimple.h dsimple.c,)
 
 ComplexProgramTarget(xwd)
Index: xc/programs/xwd/multiVis.c
diff -u xc/programs/xwd/multiVis.c:1.11 xc/programs/xwd/multiVis.c:1.12
--- xc/programs/xwd/multiVis.c:1.11	Mon Jan  9 10:01:56 2006
+++ xc/programs/xwd/multiVis.c	Mon Apr  9 11:37:21 2007
@@ -33,7 +33,7 @@
 from The Open Group.
 
     ------------------------------------------------------------------------ **/
-/* $XFree86: xc/programs/xwd/multiVis.c,v 1.11 2006/01/09 15:01:56 dawes Exp $ */
+/* $XFree86: xc/programs/xwd/multiVis.c,v 1.12 2007/04/09 15:37:21 tsi Exp $ */
 
 #include <stdlib.h>
 #include <X11/Xlib.h>
@@ -205,6 +205,7 @@
                 colors[i].pad = 0;
                 colors[i].flags = DoRed|DoGreen|DoBlue;
          }
+         *rShift = *gShift = *bShift = 0;
      }
      else /** src is decomposed rgb ***/
      {
Index: xc/programs/xwd/xwd.c
diff -u xc/programs/xwd/xwd.c:3.13 xc/programs/xwd/xwd.c:3.14
--- xc/programs/xwd/xwd.c:3.13	Mon Jan  9 10:01:56 2006
+++ xc/programs/xwd/xwd.c	Mon Sep  4 11:57:55 2006
@@ -23,7 +23,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xwd/xwd.c,v 3.13 2006/01/09 15:01:56 dawes Exp $ */
+/* $XFree86: xc/programs/xwd/xwd.c,v 3.14 2006/09/04 15:57:55 tsi Exp $ */
 
 /*
  * xwd.c MIT Project Athena, X Window system window raster image dumper.
@@ -93,6 +93,7 @@
 int format = ZPixmap;
 Bool nobdrs = False;
 Bool on_root = False;
+Bool rect = False;
 Bool standard_out = True;
 Bool debug = False;
 Bool silent = False;
@@ -102,6 +103,7 @@
 
 extern int main(int, char **);
 extern void Window_Dump(Window, FILE *);
+extern void Rectangle_Dump(XRectangle, FILE *);
 extern int Image_Size(XImage *);
 extern int Get_XColors(XWindowAttributes *, XColor **);
 extern void _swapshort(register char *, register unsigned);
@@ -134,6 +136,7 @@
 {
     register int i;
     Window target_win;
+    XRectangle target_rect;
     FILE *out_file = stdout;
     Bool frame_only = False;
 
@@ -141,9 +144,6 @@
 
     Setup_Display_And_Screen(&argc, argv);
 
-    /* Get window select on command line, if any */
-    target_win = Select_Window_Args(&argc, argv);
-
     for (i = 1; i < argc; i++) {
 	if (!strcmp(argv[i], "-nobdrs")) {
 	    nobdrs = True;
@@ -170,6 +170,10 @@
 	    on_root = True;
 	    continue;
 	}
+	if (!strcmp(argv[i], "-rect")) {
+	    rect = True;
+	    continue;
+	}
 	if (!strcmp(argv[i], "-icmap")) {
 	    use_installed = True;
 	    continue;
@@ -189,60 +193,299 @@
 	}
 	usage();
     }
+
 #ifdef WIN32
     if (standard_out)
 	_setmode(fileno(out_file), _O_BINARY);
 #endif
-    
-    /*
-     * Let the user select the target window.
-     */
-    if (!target_win) {
-	target_win = Select_Window(dpy);
-    }
-    
-    if (target_win != None && !frame_only) {
-        Window root;
-        int dummyi;
-        unsigned int dummy;
 
-        if (XGetGeometry (dpy, target_win, &root, &dummyi, &dummyi,
-			      &dummy, &dummy, &dummy, &dummy) &&
-                              target_win != root) {
-	      target_win = XmuClientWindow (dpy, target_win);
+    if (rect) {
+	/*
+	 * Let the user select the target rect.
+	 */
+	target_rect = Select_Rect(dpy);
+	Rectangle_Dump(target_rect, out_file);
+    } else {
+	/* Get window select on command line, if any */
+	target_win = Select_Window_Args(&argc, argv);
+	if (!target_win) {
+	    /*
+	     * Let the user select the target window.
+	     */
+	    target_win = Select_Window(dpy);
+	    if (target_win != None && !frame_only) {
+		Window root;
+		int dummyi;
+		unsigned int dummy;
+
+		if (XGetGeometry (dpy, target_win, &root, &dummyi, &dummyi,
+				  &dummy, &dummy, &dummy, &dummy) &&
+		    target_win != root) {
+		    target_win = XmuClientWindow (dpy, target_win);
+		}
+	    }
 	}
+	Window_Dump(target_win, out_file);
     }
 
-
-    /*
-     * Dump it!
-     */
-    Window_Dump(target_win, out_file);
-
     XCloseDisplay(dpy);
     if (fclose(out_file)) {
 	perror("xwd");
 	exit(1);
     }
+
     exit(0);
 }
 
 static int
 Get24bitDirectColors(colors)
-XColor **colors ;
+    XColor **colors;
 {
-    int i , ncolors = 256 ;
-    XColor *tcol ;
+    int i, ncolors = 256;
+    XColor *tcol;
+
+    *colors = tcol = (XColor*) malloc(sizeof(XColor) * ncolors);
+
+    for (i = 0; i < ncolors; i++) {
+	tcol[i].pixel = i << 16 | i << 8 | i;
+	tcol[i].red = tcol[i].green = tcol[i].blue = i << 8 | i;
+    }
+
+    return ncolors;
+}
 
-    *colors = tcol = (XColor *)malloc(sizeof(XColor) * ncolors) ;
 
-    for(i=0 ; i < ncolors ; i++)
+/*
+ * Rectangle_Dump: dump a rectangle region of a screen to a file which
+ *              must already be open for writting.
+ */
+
+void
+Rectangle_Dump(rect, out)
+     XRectangle rect;
+     FILE *out;
+{
+    unsigned long swaptest = 1;
+    XColor *colors;
+    unsigned buffer_size;
+    int win_name_size;
+    int header_size;
+    int ncolors, i;
+    char *win_name;
+    XWindowAttributes win_info;
+    XImage *image;
+    int x, y;
+    unsigned width, height;
+    XWDFileHeader header;
+    XWDColor xwdcolor;
+    
+    int                 transparentOverlays , multiVis;
+    int                 numVisuals;
+    XVisualInfo         *pVisuals;
+    int                 numOverlayVisuals;
+    OverlayInfo         *pOverlayVisuals;
+    int                 numImageVisuals;
+    XVisualInfo         **pImageVisuals;
+    list_ptr            vis_regions;    /* list of regions to read from */
+    list_ptr            vis_image_regions ;
+    Visual		vis_h,*vis ;
+    int			allImage = 0 ;
+
+    /*
+     * Inform the user not to alter the screen.
+     */
+    if (!silent) {
+#ifdef XKB
+	XkbStdBell(dpy,None,50,XkbBI_Wait);
+#else
+	XBell(dpy,FEEP_VOLUME);
+#endif
+	XFlush(dpy);
+    }
+
+    if (!XGetWindowAttributes(dpy, RootWindow(dpy, screen), &win_info)) 
+      Fatal_Error("Can't get target window attributes.");
+
+    /*
+     * Get the parameters of the window being dumped.
+     */
+    x = rect.x;
+    y = rect.y;
+    width = rect.width;
+    height = rect.height;
+
+    win_name = "xwdump";
+
+    /* sizeof(char) is included for the null string terminator. */
+    win_name_size = strlen(win_name) + sizeof(char);
+
+    /*
+     * Snarf the pixmap with XGetImage.
+     */
+
+    multiVis = GetMultiVisualRegions(dpy,RootWindow(dpy, screen),x,y, 
+	       width,height,&transparentOverlays,&numVisuals,&pVisuals,
+               &numOverlayVisuals,&pOverlayVisuals,&numImageVisuals,
+               &pImageVisuals,&vis_regions,&vis_image_regions,&allImage) ;
+    if (on_root || multiVis)
     {
-	tcol[i].pixel = i << 16 | i << 8 | i ;
-	tcol[i].red = tcol[i].green = tcol[i].blue = i << 8   | i ;
+	if (!multiVis)
+	    image = XGetImage (dpy, RootWindow(dpy, screen), x, y, 
+                    width, height, AllPlanes, format);
+	else
+	    image = ReadAreaToImage(dpy, RootWindow(dpy, screen), x, y, 
+                width, height,
+    		numVisuals,pVisuals,numOverlayVisuals,pOverlayVisuals,
+                numImageVisuals, pImageVisuals,vis_regions,
+                vis_image_regions,format,allImage);
+    }
+    else
+	image = XGetImage (dpy, RootWindow(dpy, screen), x, y, 
+			   width, height, AllPlanes, format);
+    if (!image) {
+	fprintf (stderr, "%s:  unable to get image at %dx%d+%d+%d\n",
+		 program_name, width, height, x, y);
+	exit (1);
     }
 
-    return ncolors ;
+    if (add_pixel_value != 0) XAddPixel (image, add_pixel_value);
+
+    /*
+     * Determine the pixmap size.
+     */
+    buffer_size = Image_Size(image);
+
+    if (debug) outl("xwd: Getting Colors.\n");
+
+    if (!multiVis)
+    {
+       ncolors = Get_XColors(&win_info, &colors);
+       vis = win_info.visual ;
+    }
+    else
+    {
+       ncolors = Get24bitDirectColors(&colors) ;
+       initFakeVisual(&vis_h) ;
+       vis = &vis_h ;
+    }
+
+    /*
+     * Inform the user that the image has been retrieved.
+     */
+    if (!silent) {
+#ifdef XKB
+	XkbStdBell(dpy,window,FEEP_VOLUME,XkbBI_Proceed);
+	XkbStdBell(dpy,window,FEEP_VOLUME,XkbBI_RepeatingLastBell);
+#else
+	XBell(dpy, FEEP_VOLUME);
+	XBell(dpy, FEEP_VOLUME);
+#endif
+	XFlush(dpy);
+    }
+
+    /*
+     * Calculate header size.
+     */
+    if (debug) outl("xwd: Calculating header size.\n");
+    header_size = SIZEOF(XWDheader) + win_name_size;
+
+    /*
+     * Write out header information.
+     */
+    if (debug) outl("xwd: Constructing and dumping file header.\n");
+    header.header_size = (CARD32) header_size;
+    header.file_version = (CARD32) XWD_FILE_VERSION;
+    header.pixmap_format = (CARD32) format;
+    header.pixmap_depth = (CARD32) image->depth;
+    header.pixmap_width = (CARD32) image->width;
+    header.pixmap_height = (CARD32) image->height;
+    header.xoffset = (CARD32) image->xoffset;
+    header.byte_order = (CARD32) image->byte_order;
+    header.bitmap_unit = (CARD32) image->bitmap_unit;
+    header.bitmap_bit_order = (CARD32) image->bitmap_bit_order;
+    header.bitmap_pad = (CARD32) image->bitmap_pad;
+    header.bits_per_pixel = (CARD32) image->bits_per_pixel;
+    header.bytes_per_line = (CARD32) image->bytes_per_line;
+    /****
+    header.visual_class = (CARD32) win_info.visual->class;
+    header.red_mask = (CARD32) win_info.visual->red_mask;
+    header.green_mask = (CARD32) win_info.visual->green_mask;
+    header.blue_mask = (CARD32) win_info.visual->blue_mask;
+    header.bits_per_rgb = (CARD32) win_info.visual->bits_per_rgb;
+    header.colormap_entries = (CARD32) win_info.visual->map_entries;
+    *****/
+    header.visual_class = (CARD32) vis->class;
+    header.red_mask = (CARD32) vis->red_mask;
+    header.green_mask = (CARD32) vis->green_mask;
+    header.blue_mask = (CARD32) vis->blue_mask;
+    header.bits_per_rgb = (CARD32) vis->bits_per_rgb;
+    header.colormap_entries = (CARD32) vis->map_entries;
+
+    header.ncolors = ncolors;
+    header.window_width = (CARD32) width;
+    header.window_height = (CARD32) height;
+    header.window_x = x;
+    header.window_y = y;
+    header.window_bdrwidth = (CARD32) win_info.border_width;
+
+    if (*(char *) &swaptest) {
+	_swaplong((char *) &header, sizeof(header));
+	for (i = 0; i < ncolors; i++) {
+	    _swaplong((char *) &colors[i].pixel, sizeof(CARD32));
+	    _swapshort((char *) &colors[i].red, 3 * sizeof(short));
+	}
+    }
+
+    if (fwrite((char *)&header, SIZEOF(XWDheader), 1, out) != 1 ||
+	fwrite(win_name, win_name_size, 1, out) != 1) {
+	perror("xwd");
+	exit(1);
+    }
+
+    /*
+     * Write out the color maps, if any
+     */
+
+    if (debug) outl("xwd: Dumping %d colors.\n", ncolors);
+    for (i = 0; i < ncolors; i++) {
+	xwdcolor.pixel = colors[i].pixel;
+	xwdcolor.red = colors[i].red;
+	xwdcolor.green = colors[i].green;
+	xwdcolor.blue = colors[i].blue;
+	xwdcolor.flags = colors[i].flags;
+	if (fwrite((char *) &xwdcolor, SIZEOF(XWDColor), 1, out) != 1) {
+	    perror("xwd");
+	    exit(1);
+	}
+    }
+
+    /*
+     * Write out the buffer.
+     */
+    if (debug) outl("xwd: Dumping pixmap.  bufsize=%d\n",buffer_size);
+
+    /*
+     *    This copying of the bit stream (data) to a file is to be replaced
+     *  by an Xlib call which hasn't been written yet.  It is not clear
+     *  what other functions of xwd will be taken over by this (as yet)
+     *  non-existant X function.
+     */
+    if (fwrite(image->data, (int) buffer_size, 1, out) != 1) {
+	perror("xwd");
+	exit(1);
+    }
+
+    /*
+     * free the color buffer.
+     */
+
+    if (debug && ncolors > 0) outl("xwd: Freeing colors.\n");
+    if (ncolors > 0) free(colors);
+
+    /*
+     * Free image
+     */
+    XDestroyImage(image);
 }
 
 
@@ -302,15 +545,14 @@
      * Get the parameters of the window being dumped.
      */
     if (debug) outl("xwd: Getting target window information.\n");
-    if(!XGetWindowAttributes(dpy, window, &win_info)) 
+    if (!XGetWindowAttributes(dpy, window, &win_info)) 
       Fatal_Error("Can't get target window attributes.");
 
     /* handle any frame window */
     if (!XTranslateCoordinates (dpy, window, RootWindow (dpy, screen), 0, 0,
 				&absx, &absy, &dummywin)) {
-	fprintf (stderr, 
-		 "%s:  unable to translate window coordinates (%d,%d)\n",
-		 program_name, absx, absy);
+	fprintf (stderr, "%s:  unable to translate window "
+		 "coordinates (%d,%d)\n", program_name, absx, absy);
 	exit (1);
     }
     win_info.x = absx;
@@ -354,14 +596,13 @@
     x = absx - win_info.x;
     y = absy - win_info.y;
 
-    multiVis = GetMultiVisualRegions(dpy,RootWindow(dpy, screen), 
-               absx, absy, 
-	       width, height,&transparentOverlays,&numVisuals, &pVisuals,
+    multiVis = GetMultiVisualRegions(dpy,RootWindow(dpy, screen),absx,absy, 
+	       width,height,&transparentOverlays,&numVisuals,&pVisuals,
                &numOverlayVisuals,&pOverlayVisuals,&numImageVisuals,
                &pImageVisuals,&vis_regions,&vis_image_regions,&allImage) ;
     if (on_root || multiVis)
     {
-	if(!multiVis)
+	if (!multiVis)
 	    image = XGetImage (dpy, RootWindow(dpy, screen), absx, absy, 
                     width, height, AllPlanes, format);
 	else
@@ -372,7 +613,8 @@
                 vis_image_regions,format,allImage);
     }
     else
-	image = XGetImage (dpy, window, x, y, width, height, AllPlanes, format);
+	image = XGetImage (dpy, window, x, y, width, height,
+			   AllPlanes, format);
     if (!image) {
 	fprintf (stderr, "%s:  unable to get image at %dx%d+%d+%d\n",
 		 program_name, width, height, x, y);
@@ -388,7 +630,7 @@
 
     if (debug) outl("xwd: Getting Colors.\n");
 
-    if( !multiVis)
+    if (!multiVis)
     {
        ncolors = Get_XColors(&win_info, &colors);
        vis = win_info.visual ;
@@ -399,6 +641,7 @@
        initFakeVisual(&vis_h) ;
        vis = &vis_h ;
     }
+
     /*
      * Inform the user that the image has been retrieved.
      */
@@ -509,8 +752,8 @@
      * free the color buffer.
      */
 
-    if(debug && ncolors > 0) outl("xwd: Freeing colors.\n");
-    if(ncolors > 0) free(colors);
+    if (debug && ncolors > 0) outl("xwd: Freeing colors.\n");
+    if (ncolors > 0) free(colors);
 
     /*
      * Free window name string.
@@ -524,16 +767,18 @@
     XDestroyImage(image);
 }
 
+
 /*
  * Report the syntax for calling xwd.
  */
+
 void
 usage()
 {
-    fprintf (stderr,
-"usage: %s [-display host:dpy] [-debug] [-help] %s [-nobdrs] [-out <file>]",
-	   program_name, "[{-root|-id <id>|-name <name>}]");
-    fprintf (stderr, " [-xy] [-add value] [-frame]\n");
+    fprintf (stderr, "usage: %s [-display host:dpy] [-debug] "
+	     "[-help] [-root | -id <id> | -name <name> | -rect] "
+	     "[-nobdrs] [-out <file>] [-xy] [-add value] [-frame] "
+	     "[-screen]\n", program_name);
     exit(1);
 }
 
Index: xc/programs/xwd/xwd.man
diff -u xc/programs/xwd/xwd.man:1.11 xc/programs/xwd/xwd.man:1.12
--- xc/programs/xwd/xwd.man:1.11	Mon Jan  9 10:01:56 2006
+++ xc/programs/xwd/xwd.man	Mon Sep  4 11:57:55 2006
@@ -22,7 +22,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xwd/xwd.man,v 1.11 2006/01/09 15:01:56 dawes Exp $
+.\" $XFree86: xc/programs/xwd/xwd.man,v 1.12 2006/09/04 15:57:55 tsi Exp $
 .\"
 .TH XWD 1 __vendorversion__
 .SH NAME
@@ -30,7 +30,7 @@
 .SH SYNOPSIS
 .B "xwd"
 [-debug] [-help] [-nobdrs] [-out \fIfile\fP] [-xy] [-frame] [-add \fIvalue\fP]
-[-root | -id \fIid\fP | -name \fIname\fP ] [-icmap] [-screen]
+[-root | -id \fIid\fP | -name \fIname\fP | -rect] [-icmap] [-screen]
 [-display \fIdisplay\fP]
 .SH DESCRIPTION
 .PP
@@ -97,6 +97,12 @@
 select a window with the pointer.
 .PP
 .TP 8
+.B "-rect"
+This option indicates that the rectangle region of a screen should be
+selected with the pointer. Window-related parameters like \fBnobdrs\fP
+and \fBframe\fP are ignored.
+.PP
+.TP 8
 .B "-icmap"
 Normally the colormap of the chosen window is used to obtain RGB values.
 This option forces the first installed colormap of the screen to be used