diff --git a/generic/shape.c b/generic/shape.c
index 908cd31..0437033 100644
--- a/generic/shape.c
+++ b/generic/shape.c
@@ -28,60 +28,56 @@
 #define max(x,y)	((x)<(y) ? (y) : (x))
 #define encodeKind(idx,flag)	((idx) | (flag ? SHAPE_KIND_TOPLEVEL : 0))
 
+typedef enum Operations {
+    boundsCmd,		// The [shape bounds] command.
+    getCmd,		// The [shape get] command.
+    offsetCmd,		// The [shape offset] command.
+    setCmd,		// The [shape set] command.
+    updateCmd,		// The [shape update] command.
+    versionCmd		// The [shape version] command.
+} Operations;
+
 typedef int (*shapeCommandHandler) (Tk_Window tkwin, Tcl_Interp *interp,
-			int opnum, int objc, Tcl_Obj *const objv[]);
+			Operations opnum, int objc, Tcl_Obj *const objv[]);
 typedef int (*shapeApplicator) (Tk_Window tkwin, Tcl_Interp *interp,
-			int x, int y, int op, int kind, int objc,
+			int x, int y, ShapeOps op, ShapeKind kind, int objc,
 			Tcl_Obj *const objv[]);
 
 static int		shapeBoundClipOps(Tk_Window tkwin, Tcl_Interp *interp,
-			    int opnum, int objc, Tcl_Obj *const objv[]);
+			    Operations opnum, int objc, Tcl_Obj *const objv[]);
 static int		shapeOffsetOp(Tk_Window tkwin, Tcl_Interp *interp,
-			    int opnum, int objc, Tcl_Obj *const objv[]);
+			    Operations opnum, int objc, Tcl_Obj *const objv[]);
 static int		shapeSetUpdateOps(Tk_Window tkwin, Tcl_Interp *interp,
-			    int opnum, int objc, Tcl_Obj *const objv[]);
+			    Operations opnum, int objc, Tcl_Obj *const objv[]);
 static int		shapeBitmap(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 static int		shapeRects(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 static int		shapeReset(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 static int		shapeText(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 static int		shapeWindow(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
-#ifdef SUPPORTS_PHOTO_REGION
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 static int		shapePhoto(Tk_Window tkwin, Tcl_Interp *interp,
-			    int x, int y, int op, int kind, int objc,
-			    Tcl_Obj *const objv[]);
-#endif
+			    int x, int y, ShapeOps op, ShapeKind kind,
+			    int objc, Tcl_Obj *const objv[]);
 
 static int		shapeCmd(ClientData clientData, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-
-enum {
-    boundsCmd, getCmd, offsetCmd, setCmd, updateCmd, versionCmd
-};
-static char *subcommands[] = {
-    "bounds", "get", "offset", "set", "update", "version", NULL
-};
-static shapeCommandHandler shapeCommandHandlers[] = {
-    shapeBoundClipOps, shapeBoundClipOps,
-    shapeOffsetOp, shapeSetUpdateOps, shapeSetUpdateOps,
-    NULL
-};
 
+// Get the tkwin for a particular window.
 static Tk_Window
 getWindow(
-    Tk_Window apptkwin,
-    Tcl_Interp *interp,
-    Tcl_Obj *pathName,
-    int *isToplevel)
+    Tk_Window apptkwin,		// Main window handle.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
+    Tcl_Obj *pathName,		// Name of window.
+    int *isToplevel)		// Is this a toplevel?
 {
     char *winName   = Tcl_GetStringFromObj(pathName, NULL);
     Tk_Window tkwin = Tk_NameToWindow(interp, winName, apptkwin);
@@ -90,16 +86,20 @@ getWindow(
 	return NULL;
     }
     if (Tk_Display(tkwin) != Tk_Display(apptkwin)) {
-	Tcl_AppendResult(interp, "can only apply shape operations to windows"
-			 " on the same display as the main window of the"
-			 " application", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can only apply shape operations to windows"
+		" on the same display as the main window of the"
+		" application"));
+	Tcl_SetErrorCode(interp, "SHAPE", "DISPLAY", NULL);
 	return NULL;
     }
     if (Tk_WindowId(tkwin) == None) {
 	Tk_MakeWindowExist(tkwin);
 	if (Tk_WindowId(tkwin) == None) {
-	    Tcl_AppendResult(interp, "failed to create window ",
-			     Tk_PathName(tkwin), NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "failed to create window %s",
+		     Tk_PathName(tkwin)));
+	    Tcl_SetErrorCode(interp, "SHAPE", "CREATE", NULL);
 	    return NULL;
 	}
     }
@@ -109,9 +109,9 @@ getWindow(
 
 static int
 shapeBoundClipOps(
-    Tk_Window tkwin0,
-    Tcl_Interp *interp,
-    int opnum,
+    Tk_Window apptkwin,		// Main window handle.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
+    Operations opnum,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -128,7 +128,7 @@ shapeBoundClipOps(
 	    "option", 0, &idx) != TCL_OK) {
 	return TCL_ERROR;
     }
-    tkwin = getWindow(tkwin0, interp, objv[2], &toplevel);
+    tkwin = getWindow(apptkwin, interp, objv[2], &toplevel);
     if (tkwin == NULL) {
 	return TCL_ERROR;
     }
@@ -166,9 +166,9 @@ shapeBoundClipOps(
 
 static int
 shapeOffsetOp(
-    Tk_Window tkwin0,
-    Tcl_Interp *interp,
-    int opnum,
+    Tk_Window apptkwin,		// Main window handle.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
+    Operations opnum,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -190,7 +190,7 @@ shapeOffsetOp(
 	    return TCL_ERROR;
 	}
     case 5:
-	tkwin = getWindow(tkwin0, interp, objv[2], &toplevel);
+	tkwin = getWindow(apptkwin, interp, objv[2], &toplevel);
 	if (tkwin == NULL ||
 		Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK ||
 		Tcl_GetIntFromObj(interp, objv[objc-1], &y) != TCL_OK) {
@@ -202,12 +202,12 @@ shapeOffsetOp(
 
 static int
 shapeBitmap(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -216,8 +216,9 @@ shapeBitmap(
     int result;
 
     if (objc != 1) {
-	Tcl_AppendResult(interp, "bitmap requires one argument; a bitmap "
-		"name", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"bitmap requires one argument; a bitmap name"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
 
@@ -236,12 +237,12 @@ shapeBitmap(
 
 static int
 shapeRects(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -250,15 +251,18 @@ shapeRects(
     int count, i, result;
 
     if (objc != 1) {
-	Tcl_AppendResult(interp, "rectangles requires one argument; "
-		"a list of rectangles", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"rectangles requires one argument; a list of rectangles"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
 
     if (Tcl_ListObjGetElements(interp, objv[0], &count, &ovec) != TCL_OK) {
 	return TCL_ERROR;
-    } else if (count<1) {
-	Tcl_AppendResult(interp, "need at least one rectangle", NULL);
+    } else if (count < 1) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"need at least one rectangle"));
+	Tcl_SetErrorCode(interp, "SHAPE", "ARGS", NULL);
 	return TCL_ERROR;
     }
 
@@ -272,8 +276,10 @@ shapeRects(
 	    Tcl_Free((char *)rects);
 	    return TCL_ERROR;
 	} else if (rlen != 4) {
-	    Tcl_AppendResult(interp, "rectangles are described by four "
-		    "numbers; x1, y1, x2, and y2", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "rectangles are described by four numbers; "
+		    "x1, y1, x2, and y2"));
+	    Tcl_SetErrorCode(interp, "SHAPE", "ARGS", NULL);
 	    Tcl_Free((char *) rects);
 	    return TCL_ERROR;
 	} else if (Tcl_GetIntFromObj(interp, rvec[0], &x1) != TCL_OK ||
@@ -297,17 +303,19 @@ shapeRects(
 
 static int
 shapeReset(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
     if (objc != 0) {
-	Tcl_AppendResult(interp, "reset takes no arguments", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"reset takes no arguments"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
 
@@ -316,12 +324,12 @@ shapeReset(
 
 static int
 shapeText(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -329,8 +337,10 @@ shapeText(
     int count, result;
 
     if (objc != 2) {
-	Tcl_AppendResult(interp, "text requires two arguments; the string "
-		"to display and the font to use to display it", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"text requires two arguments; the string "
+		"to display and the font to use to display it"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
 
@@ -353,12 +363,12 @@ shapeText(
 
 static int
 shapeWindow(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
@@ -367,8 +377,9 @@ shapeWindow(
     Display *dpy;
 
     if (objc != 1) {
-	Tcl_AppendResult(interp, "window requires one argument; a window "
-		"pathName", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window requires one argument; a window pathName"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
     srcwin = getWindow(tkwin, interp, objv[0], &ignore);
@@ -379,90 +390,106 @@ shapeWindow(
     return Shape_CombineWindow(interp, tkwin, kind, op, x, y, srcwin);
 }
 
-#ifdef SUPPORTS_PHOTO_REGION
 static int
 shapePhoto(
-    Tk_Window tkwin,
-    Tcl_Interp *interp,
+    Tk_Window tkwin,		// Window to apply to.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int x,
     int y,
-    int op,
-    int kind,
+    ShapeOps op,
+    ShapeKind kind,
     int objc,
     Tcl_Obj *const objv[])
 {
     char *imageName;
     Tk_PhotoHandle handle;
-    Region region;
+    Region region = None;
 
     if (objc != 1) {
-	Tcl_AppendResult(interp, "photo requires one argument; "
-		"a photo image name", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"photo requires one argument; a photo image name"));
+	Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	return TCL_ERROR;
     }
 
-    imageName = Tcl_GetStringFromObj(objv[0], &NULL);
+    imageName = Tcl_GetString(objv[0]);
     handle = Tk_FindPhoto(interp, imageName);
     if (handle == NULL) {
 	return TCL_ERROR;
     }
 
+#ifdef SUPPORTS_PHOTO_REGION
     /*
      * Deep implementation magic!  Relies on knowing a TkRegion is
      * implemented as a Region under X...
      */
 
     region = (Region) TkPhotoGetValidRegion(handle);
+#endif
 
     if (region == None) {
-	Tcl_AppendResult(interp, "bad transparency info in photo image ",
-		imageName, NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"bad transparency info in photo image %s",
+		imageName));
+	Tcl_SetErrorCode(interp, "SHAPE", "BAD", NULL);
 	return TCL_ERROR;
     }
 
     return Shape_CombineRegion(interp, tkwin, kind, op, x, y, region);
 }
-#endif
 
 static int
 shapeSetUpdateOps(
-    Tk_Window tkwin0,
-    Tcl_Interp *interp,
-    int opnum,
+    Tk_Window apptkwin,		// Main window handle.
+    Tcl_Interp *interp,		// Interpreter for error reporting.
+    Operations opnum,
     int objc,
     Tcl_Obj *const objv[])
 {
     enum optkind {
 	shapekind, offsetargs, sourceargs
     };
-    static char *options[] = {
-	"-offset",
-	"-bounding", "-clip", "-both",
-	"bitmap", "rectangles", "reset", "text", "window",
-#ifdef SUPPORTS_PHOTO_REGION
-	"photo",
-#endif
-	NULL
+    typedef struct opDefn {
+	const char *name;
+	enum optkind kind;
+	shapeApplicator app;
+    } opDefn;
+    typedef struct updDefn {
+	const char *name;
+	ShapeOps opcode;
+    } updDefn;
+    static const opDefn options[] = {
+	{"-offset",	offsetargs, NULL},
+	{"-bounding",	shapekind,  NULL},
+	{"-clip",	shapekind,  NULL},
+	{"-both",	shapekind,  NULL},
+	{"bitmap",	sourceargs, shapeBitmap},
+	{"photo",	sourceargs, shapePhoto},
+	{"rectangles",	sourceargs, shapeRects},
+	{"reset",	sourceargs, shapeReset},
+	{"text",	sourceargs, shapeText},
+	{"window",	sourceargs, shapeWindow},
+	{NULL,		offsetargs, NULL}
     };
-    static enum optkind optk[] = {
-	offsetargs,
-	shapekind, shapekind, shapekind,
-	sourceargs, sourceargs, sourceargs, sourceargs, sourceargs
-#ifdef SUPPORTS_PHOTO_REGION
-	, sourceargs
-#endif
-    };
-    static shapeApplicator applicators[] = {
-	NULL, NULL, NULL, NULL,
-	shapeBitmap, shapeRects, shapeReset, shapeText, shapeWindow,
-#ifdef SUPPORTS_PHOTO_REGION
-	shapePhoto,
-#endif
-	NULL
+    static const updDefn operations[] = {
+	{"set",		SHAPE_OP_SET},
+	{"union",	SHAPE_OP_UNION},
+	{"intersect",	SHAPE_OP_INTERSECT},
+	{"subtract",	SHAPE_OP_SUBTRACT},
+	{"invert",	SHAPE_OP_INVERT},
+	{":=",	SHAPE_OP_SET},
+	{"+=",	SHAPE_OP_UNION},
+	{"*=",	SHAPE_OP_INTERSECT},
+	{"-=",	SHAPE_OP_SUBTRACT},
+	{"=",	SHAPE_OP_SET},
+	{"||",	SHAPE_OP_UNION},
+	{"&&",	SHAPE_OP_INTERSECT},
+	{NULL}
     };
 
-    int operation = ShapeSet;
-    int idx, kind, x = 0, y = 0, toplevel, opidx;
+    ShapeOps operation = SHAPE_OP_SET;
+    int idx, x = 0, y = 0, toplevel, opidx;
+    ShapeKind kind;
     Tk_Window tkwin;
 
     switch (opnum) {
@@ -473,55 +500,44 @@ shapeSetUpdateOps(
 	}
 	idx = 3;
 	break;
-    case updateCmd: {
-	static char *operations[] = {
-	    "set", "union", "intersect", "subtract", "invert",
-	    ":=", "+=", "*=", "-=", "=", "||", "&&", NULL
-	};
-	static int opmap[] = {
-	    SHAPE_OP_SET,       SHAPE_OP_UNION,     SHAPE_OP_INTERSECT,
-	    SHAPE_OP_SUBTRACT,  SHAPE_OP_INVERT,    SHAPE_OP_SET,
-	    SHAPE_OP_UNION,     SHAPE_OP_INTERSECT, SHAPE_OP_SUBTRACT,
-	    SHAPE_OP_SET,       SHAPE_OP_UNION,     SHAPE_OP_INTERSECT
-	};
-
+    case updateCmd:
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 1, objv,
 		    "update pathName operation ?options?");
 	    return TCL_ERROR;
 	}
 
-	if (Tcl_GetIndexFromObj(interp, objv[3], operations, "operation", 0,
-		&opidx) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], operations,
+		sizeof(operations[0]), "operation", 0, &opidx) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	operation = opmap[opidx];
+	operation = operations[opidx].opcode;
 	idx = 4;
 	break;
-    }
     default: /* should be impossible to get here! */
 	Tcl_Panic("bad operation: %d", opnum);
     }
 
-    tkwin = getWindow(tkwin0, interp, objv[2], &toplevel);
+    tkwin = getWindow(apptkwin, interp, objv[2], &toplevel);
     if (tkwin == NULL) {
 	return TCL_ERROR;
     }
     kind = encodeKind(SHAPE_KIND_BOTH, toplevel);
 
     for (; idx<objc ; idx++) {
-	if (Tcl_GetIndexFromObj(interp, objv[idx], options, "option", 0,
-		&opidx) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[idx], options,
+		sizeof(options[0]), "option", 0, &opidx) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	switch (optk[opidx]) {
+	switch (options[opidx].kind) {
 	case shapekind:
 	    kind = encodeKind(opidx, toplevel);
 	    break;
 	case offsetargs:
 	    if (idx + 2 >= objc) {
-		Tcl_AppendResult(interp, "-offset reqires two args; x and y",
-			NULL);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"-offset reqires two args; x and y"));
+		Tcl_SetErrorCode(interp, "SHAPE", "ARGS", NULL);
 		return TCL_ERROR;
 	    } else if (Tcl_GetIntFromObj(interp, objv[idx+1], &x) != TCL_OK ||
 		    Tcl_GetIntFromObj(interp, objv[idx+2], &y) != TCL_OK) {
@@ -530,41 +546,55 @@ shapeSetUpdateOps(
 	    idx += 2;
 	    break;
 	case sourceargs: {
-	    shapeApplicator app = applicators[opidx];
-	    if (app != NULL) {
-		objc -= idx + 1;
-		objv += idx + 1;
-		return app(tkwin, interp, x, y, operation, kind, objc, objv);
+	    shapeApplicator app = options[opidx].app;
+	    if (!app != NULL) {
+		Tcl_Panic("bad source operation definition");
 	    }
-	    Tcl_AppendResult(interp, "not supported", NULL);
-	    return TCL_ERROR;
+	    objc -= idx + 1;
+	    objv += idx + 1;
+	    return app(tkwin, interp, x, y, operation, kind, objc, objv);
 	}
 	}
     }
-    Tcl_AppendResult(interp, "no source to take shape from", NULL);
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	    "no source to take shape from"));
+    Tcl_SetErrorCode(interp, "SHAPE", "NO_SRC", NULL);
     return TCL_ERROR;
 }
 
 static int
 shapeCmd(
     ClientData clientData,
-    Tcl_Interp *interp,
+    Tcl_Interp *interp,		// Interpreter for error reporting.
     int objc,
     Tcl_Obj *const objv[])
 {
+    typedef struct cmdDefn {
+	const char *name;
+	shapeCommandHandler handler;
+    } cmdDefn;
+    static const cmdDefn subcommands[] = {
+	{"bounds",	shapeBoundClipOps},
+	{"get",		shapeBoundClipOps},
+	{"offset",	shapeOffsetOp},
+	{"set",		shapeSetUpdateOps},
+	{"update",	shapeSetUpdateOps},
+	{"version",	NULL},	/* direct handling */
+	{NULL}
+    };
     int subcmdidx;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?window arg ...?");
 	return TCL_ERROR;
-    } else if (Tcl_GetIndexFromObj(interp, objv[1], subcommands, "subcommand",
-	    0, &subcmdidx) != TCL_OK) {
+    } else if (Tcl_GetIndexFromObjStruct(interp, objv[1], subcommands,
+	    sizeof(subcommands[0]), "subcommand", 0, &subcmdidx) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    if (shapeCommandHandlers[subcmdidx]) {
+    if (subcommands[subcmdidx].handler) {
 	/* Farm out the more complex operations */
-	return shapeCommandHandlers[subcmdidx](clientData, interp, subcmdidx,
+	return subcommands[subcmdidx].handler(clientData, interp, subcmdidx,
 		objc, objv);
     } else switch (subcmdidx) {  
     case versionCmd:
@@ -590,7 +620,7 @@ shapeCmd(
 
 int
 Shape_Init(
-    Tcl_Interp *interp)
+    Tcl_Interp *interp)		// Interpreter to install into.
 {
     Tk_Window tkwin = Tk_MainWindow(interp);
 
@@ -598,8 +628,9 @@ Shape_Init(
 	return TCL_ERROR;
     }
     if (!Shape_ExtensionPresent(tkwin)) {
-	Tcl_AppendResult(interp, "shaped window extension not supported on "
-		"this X server", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"shaped window extension not supported on this X server"));
+	Tcl_SetErrorCode(interp, "SHAPE", "UNSUPPORTED", NULL);
 	return TCL_ERROR;
     }
 
@@ -607,5 +638,5 @@ Shape_Init(
     /* See the head of the shape.h file for the definitions of these macros */
     Tcl_SetVar(interp, "shape_version", SHAPE_VERSION, TCL_GLOBAL_ONLY);
     Tcl_SetVar(interp, "shape_patchLevel", SHAPE_PATCHLEVEL, TCL_GLOBAL_ONLY);
-    return Tcl_PkgProvide(interp, "shape", SHAPE_VERSION);
+    return Tcl_PkgProvide(interp, "shape", SHAPE_PATCHLEVEL);
 }
diff --git a/generic/shapeInt.h b/generic/shapeInt.h
index 725cd55..7caa428 100644
--- a/generic/shapeInt.h
+++ b/generic/shapeInt.h
@@ -17,13 +17,12 @@
 
 #include <shape.h>
 
-#define ShapeApplyToBounding(kind) ((kind) & SHAPE_KIND_BOUNDING)
-#define ShapeApplyToClip(kind)     ((kind) & SHAPE_KIND_CLIP)
-#define ShapeApplyToParent(kind)   ((kind) & SHAPE_KIND_TOPLEVEL)
+#define ShapeApplyToBounding(kind)	((kind) & SHAPE_KIND_BOUNDING)
+#define ShapeApplyToClip(kind)		((kind) & SHAPE_KIND_CLIP)
+#define ShapeApplyToParent(kind)	((kind) & SHAPE_KIND_TOPLEVEL)
 
-EXTERN XRectangle *
-ShapeRenderTextAsRectangles(Tk_Window tkwin, Tcl_Interp *interp,
-				   Tcl_Obj *string, Tcl_Obj *font,
-				   int *numRects);
+EXTERN XRectangle *	ShapeRenderTextAsRectangles(Tk_Window tkwin,
+			    Tcl_Interp *interp, Tcl_Obj *string, Tcl_Obj *font,
+			    int *numRects);
 
 #endif
diff --git a/include/shape.h b/include/shape.h
index 202fd27..a8f7be8 100644
--- a/include/shape.h
+++ b/include/shape.h
@@ -23,28 +23,34 @@
 #define SHAPE_VERSION		STRINGIFY(SHAPE_VERSION_MAJOR) "." STRINGIFY(SHAPE_VERSION_MINOR)
 #define SHAPE_PATCHLEVEL	SHAPE_VERSION "." STRINGIFY(SHAPE_VERSION_PATCH)
 
-#define SHAPE_KIND_BOUNDING	(1 << 0)
-#define SHAPE_KIND_CLIP		(1 << 1)
-#define SHAPE_KIND_BOTH		(SHAPE_KIND_BOUNDING | SHAPE_KIND_CLIP)
-#define SHAPE_KIND_TOPLEVEL	(1 << 8)
-#define SHAPE_KIND_ALL		(SHAPE_KIND_BOTH | SHAPE_KIND_TOPLEVEL)
-#define SHAPE_BOUND_MASK	(SHAPE_KIND_BOUNDING | SHAPE_KIND_TOPLEVEL)
-#define SHAPE_CLIP_MASK		(SHAPE_KIND_CLIP | SHAPE_KIND_TOPLEVEL)
+typedef enum ShapeKind {
+    SHAPE_KIND_BOUNDING = (1 << 0),
+    SHAPE_KIND_CLIP = (1 << 1),
+    SHAPE_KIND_BOTH = (SHAPE_KIND_BOUNDING | SHAPE_KIND_CLIP),
+    SHAPE_KIND_TOPLEVEL = (1 << 8),
+    SHAPE_KIND_ALL = (SHAPE_KIND_BOTH | SHAPE_KIND_TOPLEVEL),
+    SHAPE_BOUND_MASK = (SHAPE_KIND_BOUNDING | SHAPE_KIND_TOPLEVEL),
+    SHAPE_CLIP_MASK = (SHAPE_KIND_CLIP | SHAPE_KIND_TOPLEVEL)
+} ShapeKind;
 
 #ifndef ShapeSet
 /* Taken from /usr/include/X11/extensions/shape.h */
-#define ShapeSet		0
-#define ShapeUnion		1
-#define ShapeIntersect		2
-#define ShapeSubtract		3
-#define ShapeInvert		4
+enum {
+    ShapeSet = 0,
+    ShapeUnion = 1,
+    ShapeIntersect = 2,
+    ShapeSubtract = 3,
+    ShapeInvert = 4
+};
 #endif /* ShapeSet */
 
-#define SHAPE_OP_SET		ShapeSet
-#define SHAPE_OP_UNION		ShapeUnion
-#define SHAPE_OP_INTERSECT	ShapeIntersect
-#define SHAPE_OP_SUBTRACT	ShapeSubtract
-#define SHAPE_OP_INVERT		ShapeInvert
+typedef enum ShapeOps {
+    SHAPE_OP_SET = ShapeSet,
+    SHAPE_OP_UNION = ShapeUnion,
+    SHAPE_OP_INTERSECT = ShapeIntersect,
+    SHAPE_OP_SUBTRACT = ShapeSubtract,
+    SHAPE_OP_INVERT = ShapeInvert
+} ShapeOps;
 
 EXTERN int		Shape_GetBbox(Tcl_Interp *interp, Tk_Window tkwin,
 			    int getClip, int *valid, int *x1, int *y1, int *x2,
@@ -52,21 +58,24 @@ EXTERN int		Shape_GetBbox(Tcl_Interp *interp, Tk_Window tkwin,
 EXTERN int		Shape_GetShapeRectanglesObj(Tcl_Interp *interp,
 			    Tk_Window tkwin, int getClip);
 EXTERN int		Shape_MoveShape(Tcl_Interp *interp, Tk_Window tkwin,
-			    int kind, int x, int y);
+			    ShapeKind kind, int x, int y);
 EXTERN int		Shape_CombineBitmap(Tcl_Interp *interp, Tk_Window tkwin,
-			    int kind, int op, int x, int y, Pixmap bitmap);
+			    ShapeKind kind, ShapeOps op, int x, int y,
+			    Pixmap bitmap);
 EXTERN int		Shape_CombineRectangles(Tcl_Interp *interp,
-			    Tk_Window tkwin, int kind, int op,
+			    Tk_Window tkwin, ShapeKind kind, ShapeOps op,
 			    int rectc, XRectangle *rectv);
 EXTERN int		Shape_CombineRectanglesOrdered(Tcl_Interp *interp,
-			    Tk_Window tkwin, int kind, int op,
+			    Tk_Window tkwin, ShapeKind kind, ShapeOps op,
 			    int rectc, XRectangle *rectv);
 EXTERN int		Shape_CombineWindow(Tcl_Interp *interp, Tk_Window tkwin,
-			    int kind, int op, int x, int y, Tk_Window srcwin);
+			    ShapeKind kind, ShapeOps op, int x, int y,
+			    Tk_Window srcwin);
 EXTERN int		Shape_CombineRegion(Tcl_Interp *interp, Tk_Window tkwin,
-			    int kind, int op, int x, int y, Region region);
+			    ShapeKind kind, ShapeOps op, int x, int y,
+			    Region region);
 EXTERN int		Shape_Reset(Tcl_Interp *interp, Tk_Window tkwin,
-			    int kind);
+			    ShapeKind kind);
 EXTERN int		Shape_QueryVersion(Tk_Window tkwin, int *majorPtr,
 			    int *minorPtr);
 EXTERN int		Shape_ExtensionPresent(Tk_Window tkwin);
diff --git a/unix/pkgIndex.tcl b/unix/pkgIndex.tcl
index 94e274a..176ea41 100644
--- a/unix/pkgIndex.tcl
+++ b/unix/pkgIndex.tcl
@@ -4,5 +4,8 @@
 # it needs to be mangled like this to get the names working happily on
 # broken OSes like SunOS4.  If you have a problem with this, tough!
 
-package ifneeded Shape 0.4 "package require Tk 8\n\
-	[list tclPkgSetup $dir Shape 0.4 {{libshape04.so.1.0 load shape}}]"
+package ifneeded Shape 0.4.4 [apply {{dir} {
+    package require Tk 8.6-
+    package provide Shape 0.4.4
+    load [file join $dir libshape04.so.1.0]
+}}]
diff --git a/unix/shapeUnixImpl.c b/unix/shapeUnixImpl.c
index 5f86839..839dfb4 100644
--- a/unix/shapeUnixImpl.c
+++ b/unix/shapeUnixImpl.c
@@ -98,8 +98,10 @@ Shape_GetBbox(
     unsigned int wbs, hbs, wcs, hcs;
 
     if (win == None) {
-	Tcl_AppendResult(interp, "window ", Tk_PathName(tkwin),
-		" doesn't fully exist", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window %s doesn't fully exist",
+		Tk_PathName(tkwin)));
+	Tcl_SetErrorCode(interp, "SHAPE", "X11", "EXIST", NULL);
 	return TCL_ERROR;
     }
 
@@ -108,7 +110,9 @@ Shape_GetBbox(
 	    &cShaped, &xcs, &ycs, &wcs, &hcs);
 
     if (!s) {
-	Tcl_AppendResult(interp, "extents query failed", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"extents query failed"));
+	Tcl_SetErrorCode(interp, "SHAPE", "X11", "EXTENTS", NULL);
 	return TCL_ERROR;
     } else if (bShaped && !getClip) {
 	/* Bounding box of window. */
@@ -158,12 +162,14 @@ Shape_GetShapeRectanglesObj(
     Window win = Tk_WindowId(tkwin);
     XRectangle *rects = NULL;
     int count = 0;
-    int order,i;
+    int order, i;
     Tcl_Obj *rect[4], **retvals;
 
     if (win == None) {
-	Tcl_AppendResult(interp, "window ", Tk_PathName(tkwin),
-		" doesn't fully exist", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window %s doesn't fully exist",
+		Tk_PathName(tkwin)));
+	Tcl_SetErrorCode(interp, "SHAPE", "X11", "EXIST", NULL);
 	return TCL_ERROR;
     }
 
@@ -192,7 +198,7 @@ int
 Shape_MoveShape(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
+    ShapeKind kind,
     int x,
     int y)
 {
@@ -231,8 +237,8 @@ int
 Shape_CombineBitmap(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int x,
     int y,
     Pixmap bitmap)
@@ -271,8 +277,8 @@ int
 Shape_CombineRectangles(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int rectc,
     XRectangle *rectv)
 {
@@ -321,8 +327,8 @@ int
 Shape_CombineRectanglesOrdered(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int rectc,
     XRectangle *rectv)
 {
@@ -364,8 +370,8 @@ int
 Shape_CombineWindow(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int x,
     int y,
     Tk_Window srcwin)
@@ -473,8 +479,8 @@ int
 Shape_CombineRegion(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int x,
     int y,
     Region region)
@@ -514,30 +520,27 @@ int
 Shape_Reset(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind)
+    ShapeKind kind)
 {
     /* Maps to this on X... */
     return Shape_CombineBitmap(interp, tkwin, kind, SHAPE_OP_SET, 0, 0, None);
 }
 
 int
-Shape_QueryVersion(tkwin, majorPtr, minorPtr)
-     Tk_Window tkwin;
-     int *majorPtr, *minorPtr;
+Shape_QueryVersion(
+    Tk_Window tkwin,
+    int *majorPtr,
+    int *minorPtr)
 {
-    Status result;
-
-    result = XShapeQueryVersion(Tk_Display(tkwin), majorPtr, minorPtr);
+    Status result = XShapeQueryVersion(Tk_Display(tkwin), majorPtr, minorPtr);
     return (result == True);
 }
 
 int
-Shape_ExtensionPresent(tkwin)
-     Tk_Window tkwin;
+Shape_ExtensionPresent(
+    Tk_Window tkwin)
 {
     int eventBase, errorBase; /* These are ignored by us! */
-    Status result;
-
-    result = XShapeQueryExtension(Tk_Display(tkwin), &eventBase, &errorBase);
+    Status result = XShapeQueryExtension(Tk_Display(tkwin), &eventBase, &errorBase);
     return (result == True);
 }
diff --git a/win/Makefile.in b/win/Makefile.in
new file mode 100644
index 0000000..f911677
--- /dev/null
+++ b/win/Makefile.in
@@ -0,0 +1,82 @@
+# This Makefile is used to create the example loadable module.
+# It also illustrates how to take advantage of configuration
+# exported by Tcl to set up Makefiles for shared libraries.
+#
+# SCCS: @(#) Makefile.in 1.5 97/08/14 19:01:21
+
+DLLFILE		= shape04.dll
+EXEFILE		= shapewish
+WIN_OBJS	= shapeWinImpl.o
+GENERIC_OBJS	= shape.o
+
+GENERIC_SRCS	= $(GENERIC_DIR)/shape.c
+WIN_SRCS	= $(WIN_DIR)/shapeWinImpl.c
+
+OBJS	= $(GENERIC_OBJS) $(WIN_OBJS)
+SRCS	= $(GENERIC_SRCS) $(WIN_SRCS)
+
+# The directory containing the Tcl library archive file appropriate
+# for this version of Tk:
+TCL_BIN_DIR = @TCL_BIN_DIR@
+
+# Libraries to use when linking:
+LIBS = @TCL_LIB_SPEC@ @TCL_LIBS@ -lc
+
+#----------------------------------------------------------------
+# The information below is modified by the configure script when
+# Makefile is generated from Makefile.in.  You shouldn't normally
+# modify any of this stuff by hand.
+#----------------------------------------------------------------
+
+CC =			@CC@
+SHLIB_CFLAGS =		@SHLIB_CFLAGS@
+SHLIB_LD =		@SHLIB_LD@
+SHLIB_SUFFIX =		@SHLIB_SUFFIX@
+TCL_INCLUDE_DIR =	@TCL_INCLUDE@
+TK_INCLUDE_DIR =	@TK_INCLUDE@
+TK_XINCLUDES =		@TK_XINCLUDES@
+VPATH =			@srcdir@
+TK_LIB_SPEC =		@TK_LIB_SPEC@
+TCL_LIB_SPEC = 		@TCL_LIB_SPEC@
+TK_LIBS =		@TK_LIBS@
+TCL_SRC_DIR =		@TCL_SRC_DIR@
+TK_SRC_DIR =		@TK_SRC_DIR@
+
+SRC_DIR			= @srcdir@
+TOP_DIR			= @srcdir@/..
+GENERIC_DIR		= $(TOP_DIR)/generic
+WIN_DIR			= $(TOP_DIR)/win
+INCLUDE_DIR		= $(TOP_DIR)/include
+# ----------------------------------------------------------------------
+CFLAGS = -g -DSHAPE_PHOTO=@SHAPE_PHOTO@
+CC_SWITCHES = $(CFLAGS) ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+	-I${INCLUDE_DIR} -I${GENERIC_DIR} -I${WIN_DIR} \
+	-I${TK_INCLUDE_DIR} ${TK_XINCLUDES} -I${TCL_INCLUDE_DIR} \
+	-I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix \
+	-I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/unix
+# ----------------------------------------------------------------------
+all: @PRIMARY_TARGET@
+
+$(OBJS): $(INCLUDE_DIR)/shape.h $(GENERIC_DIR)/shapeInt.h
+
+shape.o: $(GENERIC_DIR)/shape.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/shape.c
+tkAppInit.o: $(GENERIC_DIR)/tkAppInit.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkAppInit.c
+shapeWinImpl.o: $(WIN_DIR)/shapeWinImpl.c
+	$(CC) -c $(CC_SWITCHES) $(WIN_DIR)/shapeWinImpl.c
+# ----------------------------------------------------------------------
+$(DLLFILE): $(OBJS)
+	${SHLIB_LD} -o $@ $^ @SHLIB_LD_LIBS@
+$(EXEFILE): $(OBJS) tkAppInit.o
+	$(CC) -o $@ $^ @SHLIB_LD_LIBS@ ${TK_LIB_SPEC} ${TCL_LIB_SPEC} ${TK_LIBS}
+# ----------------------------------------------------------------------
+clean:
+	rm -f *.o *.a $(DLLFILE) $(EXEFILE) core
+distclean: clean
+	rm -f Makefile config.cache config.log config.status
+# ----------------------------------------------------------------------
+Makefile: Makefile.in config.status
+	./config.status
+depend:
+	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
diff --git a/win/configure b/win/configure
new file mode 100644
index 0000000..362a1b8
--- /dev/null
+++ b/win/configure
@@ -0,0 +1,2975 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.72.
+#
+#
+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed 'exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else case e in #(
+  e) case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
+
+else case e in #(
+  e) exitcode=1; echo positional parameters were not saved. ;;
+esac
+fi
+test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
+  as_have_required=yes
+else case e in #(
+  e) as_have_required=no ;;
+esac
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
+
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else case e in #(
+  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi ;;
+esac
+fi
+
+
+      if test "x$CONFIG_SHELL" != x
+then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed 'exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi ;;
+esac
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else case e in #(
+  e) as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  } ;;
+esac
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else case e in #(
+  e) as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  } ;;
+esac
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf "%s\n" "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      t clear
+      :clear
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+
+# Sed expression to map a string onto a valid variable name.
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PACKAGE_STRING=''
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="shapeUnixImpl.c"
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+TK_SRC_DIR
+TK_LIBS
+TK_LIB_SPEC
+TK_XINCLUDES
+TK_INCLUDE
+TCL_SRC_DIR
+TCL_INCLUDE
+TCL_BIN_DIR
+TCL_VERSION
+TCL_LIBS
+TCL_LIB_SPEC
+SHLIB_VERSION
+SHLIB_SUFFIX
+SHLIB_LD_LIBS
+SHLIB_LD
+SHLIB_CFLAGS
+PRIMARY_TARGET
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+runstatedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_tclconf
+with_tkconf
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: '$ac_useropt'"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir runstatedir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: '$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+'configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print 'checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for '--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or '..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\_ACEOF
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-tclconf=DIR          use Tcl 8.6+ configuration file from DIR
+  --with-tkconf=DIR           use Tk 8.6+ configuration file from DIR
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.72
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.72.  Invocation command line was
+
+  $ $0$ac_configure_args_raw
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    printf "%s\n" "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    printf "%s\n" "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      printf "%s\n" "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      printf "%s\n" "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+printf "%s\n" "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+if test -n "$CONFIG_SITE"; then
+  ac_site_files="$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+else
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+fi
+
+for ac_site_file in $ac_site_files
+do
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See 'config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+# SCCS: @(#) configure.in 1.9 96/04/15 09:50:20
+
+VERSION=0.4
+
+#--------------------------------------------------------------------
+#	See if there was a command-line option for where Tcl is;  if
+#	not, assume that its top-level directory is a sibling of ours.
+#--------------------------------------------------------------------
+
+
+# Check whether --with-tclconf was given.
+if test ${with_tclconf+y}
+then :
+  withval=$with_tclconf; TCL_CONF_DIR=$withval
+else case e in #(
+  e) TCL_CONF_DIR=/usr/local/lib ;;
+esac
+fi
+
+if test ! -r $TCL_CONF_DIR/tclConfig.sh; then
+    as_fn_error $? "Tcl configuration file $TCL_CONF_DIR/tclConfig.sh does not exist" "$LINENO" 5
+fi
+
+# Check whether --with-tkconf was given.
+if test ${with_tkconf+y}
+then :
+  withval=$with_tkconf; TK_CONF_DIR=$withval
+else case e in #(
+  e) TK_CONF_DIR=$TCL_CONF_DIR ;;
+esac
+fi
+
+if test ! -r $TK_CONF_DIR/tkConfig.sh; then
+    as_fn_error $? "Tcl configuration file $TK_CONF_DIR/tkConfig.sh does not exist" "$LINENO" 5
+fi
+
+#--------------------------------------------------------------------
+#	Read in configuration information generated by Tcl for shared
+#	libraries, and arrange for it to be substituted into our
+#	Makefile.
+#--------------------------------------------------------------------
+
+file=$TCL_CONF_DIR/tclConfig.sh
+. $file
+file=$TK_CONF_DIR/tkConfig.sh
+. $file
+
+CC=$TCL_CC
+SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+SHLIB_LD=$TCL_SHLIB_LD
+SHLIB_LD_LIBS="$TCL_SHLIB_LD_LIBS"
+SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+SHLIB_VERSION=$TCL_SHLIB_VERSION
+TCL_LIBS=$TCL_LIBS
+TCL_VERSION=$TCL_VERSION
+TCL_INCLUDE=$TCL_PREFIX/include
+TK_INCLUDE=$TK_PREFIX/include
+TCL_BIN_DIR=$TK_EXEC_PREFIX/bin
+
+if test $TCL_SHARED_BUILD -eq 1; then
+    PRIMARY_TARGET='$(DLLFILE)'
+else
+    PRIMARY_TARGET='$(EXEFILE)'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # 'set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[][	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac ;;
+esac
+fi
+
+
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
+as_nl='
+'
+export as_nl
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+
+# The user is always right.
+if ${PATH_SEPARATOR+false} :; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  printf "%s\n" "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else case e in #(
+  e) as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  } ;;
+esac
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else case e in #(
+  e) as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  } ;;
+esac
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+
+# Sed expression to map a string onto a valid variable name.
+as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.72.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+'$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to the package provider."
+
+_ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config='$ac_cs_config_escaped'
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.72,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2023 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    printf "%s\n" "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    printf "%s\n" "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    printf "%s\n" "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  printf "%s\n" "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to '$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with './config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain ':'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is 'configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when '$srcdir' = '.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
diff --git a/win/configure.in b/win/configure.in
new file mode 100644
index 0000000..1a05f48
--- /dev/null
+++ b/win/configure.in
@@ -0,0 +1,94 @@
+dnl	This is really a -*- shell-script -*- with bells on.
+dnl	------------------------------------------------------------
+dnl	
+dnl	configure.in --
+dnl	
+dnl		Autoconf input script for producing the configure script
+dnl		to build the non-rectangular window extension on Unix.
+dnl	
+dnl	Copyright (c) 1997-2000 by Donal K. Fellows
+dnl	
+dnl	See "license.txt" for details of the license this file is made
+dnl	available under.
+dnl	
+dnl	$Id$
+dnl	
+dnl	------------------------------------------------------------
+dnl	This file is an input file used by the GNU "autoconf" program to
+dnl	generate the file "configure", which is run to configure the
+dnl	Makefile in this directory.
+AC_INIT
+AC_CONFIG_SRCDIR([shapeUnixImpl.c])
+# SCCS: @(#) configure.in 1.9 96/04/15 09:50:20
+
+VERSION=0.4
+
+#--------------------------------------------------------------------
+#	See if there was a command-line option for where Tcl is;  if
+#	not, assume that its top-level directory is a sibling of ours.
+#--------------------------------------------------------------------
+
+AC_ARG_WITH(tclconf,
+	[  --with-tclconf=DIR          use Tcl 8.6+ configuration file from DIR],
+	TCL_CONF_DIR=$withval, TCL_CONF_DIR=/usr/local/lib)
+if test ! -r $TCL_CONF_DIR/tclConfig.sh; then
+    AC_MSG_ERROR(Tcl configuration file $TCL_CONF_DIR/tclConfig.sh does not exist)
+fi
+AC_ARG_WITH(tkconf,
+	[  --with-tkconf=DIR           use Tk 8.6+ configuration file from DIR],
+	TK_CONF_DIR=$withval, TK_CONF_DIR=$TCL_CONF_DIR)
+if test ! -r $TK_CONF_DIR/tkConfig.sh; then
+    AC_MSG_ERROR(Tcl configuration file $TK_CONF_DIR/tkConfig.sh does not exist)
+fi
+
+#--------------------------------------------------------------------
+#	Read in configuration information generated by Tcl for shared
+#	libraries, and arrange for it to be substituted into our
+#	Makefile.
+#--------------------------------------------------------------------
+
+file=$TCL_CONF_DIR/tclConfig.sh
+. $file
+file=$TK_CONF_DIR/tkConfig.sh
+. $file
+
+CC=$TCL_CC
+SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+SHLIB_LD=$TCL_SHLIB_LD
+SHLIB_LD_LIBS="$TCL_SHLIB_LD_LIBS"
+SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
+SHLIB_VERSION=$TCL_SHLIB_VERSION
+TCL_LIBS=$TCL_LIBS
+TCL_VERSION=$TCL_VERSION
+TCL_INCLUDE=$TCL_PREFIX/include
+TK_INCLUDE=$TK_PREFIX/include
+TCL_BIN_DIR=$TK_EXEC_PREFIX/bin
+
+if test $TCL_SHARED_BUILD -eq 1; then
+    PRIMARY_TARGET='$(DLLFILE)'
+else
+    PRIMARY_TARGET='$(EXEFILE)'
+fi
+
+AC_SUBST(CC)
+AC_SUBST(PRIMARY_TARGET)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_LD_LIBS)
+AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(SHLIB_VERSION)
+AC_SUBST(TCL_LIB_SPEC)
+AC_SUBST(TCL_LIBS)
+AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_BIN_DIR)
+AC_SUBST(TCL_INCLUDE)
+AC_SUBST(TCL_SRC_DIR)
+AC_SUBST(TK_INCLUDE)
+AC_SUBST(TK_XINCLUDES)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_LIBS)
+AC_SUBST(TK_SRC_DIR)
+AC_SUBST(TCL_LIB_SPEC)
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/win/pkgIndex.tcl b/win/pkgIndex.tcl
new file mode 100644
index 0000000..5c0fefc
--- /dev/null
+++ b/win/pkgIndex.tcl
@@ -0,0 +1,11 @@
+# Tcl package index file, version 1.0
+
+# This is hand-rolled code.  The name of the shared library is odd, but
+# it needs to be mangled like this to get the names working happily on
+# broken OSes like SunOS4.  If you have a problem with this, tough!
+
+package ifneeded Shape 0.4.4 [apply {{dir} {
+    package require Tk 8.6-
+    package provide Shape 0.4.4
+    load [file join $dir shape04.dll]
+}}]
diff --git a/win/shapeWinImpl.c b/win/shapeWinImpl.c
index 4ee04fd..1dca50f 100644
--- a/win/shapeWinImpl.c
+++ b/win/shapeWinImpl.c
@@ -26,15 +26,175 @@ applyOperationToToplevelParent = 1;
 #define RECTCOUNT 64
 
 static int getHWNDs(Tcl_Interp*, Tk_Window, int, HWND*, HWND*);
-static int setHRGN(Tcl_Interp*, char*, HWND, HWND, int, int, HRGN);
-static int invertHRGN(Tcl_Interp*, char*, HWND, HWND, int, int, int, int);
-static int mixHRGN(Tcl_Interp*, char*, HWND, HWND, int, int, int, HRGN);
+static int setHRGN(Tcl_Interp*, Tk_Window, HWND, HWND, const POINT*, HRGN);
+static int invertHRGN(Tcl_Interp*, Tk_Window, HWND, HWND, const SIZE*, const POINT*);
+static int mixHRGN(Tcl_Interp*, Tk_Window, HWND, HWND, int, const POINT*, HRGN);
+static int ShapeCombineHRGN(Tcl_Interp*, Tk_Window, int, ShapeOps, const POINT*, HRGN);
+
+static const char *
+formError(
+    Tcl_DString *bufPtr)
+{
+    LPVOID lpMsgBuf;
+    DWORD dw = GetLastError();
+    const char *result;
+    FormatMessageW(
+	    FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+	    FORMAT_MESSAGE_FROM_SYSTEM |
+	    FORMAT_MESSAGE_IGNORE_INSERTS,
+	    NULL,
+	    dw,
+	    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
+	    (LPWSTR) &lpMsgBuf,
+	    0, NULL);
+    result = Tcl_WCharToUtfDString((const WCHAR *)lpMsgBuf, TCL_AUTO_LENGTH,
+	    bufPtr);
+    LocalFree(lpMsgBuf);
+    return result;
+}
+
+static inline HRGN
+createRegion(void)
+{
+    return CreateRectRgn(0, 0, 0, 0);
+}
+
+static inline HRGN
+createRectRegion(
+    const SIZE *dimensions)
+{
+    return CreateRectRgn(0, 0, dimensions->cx - 1, dimensions->cy - 1);
+}
+
+static inline int
+translateRegion(
+    Tcl_Interp *interp,
+    HRGN region,
+    const POINT *offset)
+{
+    if (!offset || (offset->x == 0 && offset->y == 0)) {
+	/* Nothing to do. */
+	return TCL_OK;
+    }
+    if (OffsetRgn(region, offset->x, offset->y) == ERROR) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not apply offset to region: %s",
+		formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "OFFSET", NULL);
+	Tcl_DStringFree(&buf);
+	return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static inline int
+setBaseRegion(
+    Tcl_Interp *interp,
+    Tk_Window tkwin,
+    HWND window,
+    HRGN region)
+{
+    if (SetWindowRgn(window, region, TRUE) == 0) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not set region of \"%s\": %s",
+		Tk_PathName(tkwin), formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "SET", NULL);
+	Tcl_DStringFree(&buf);
+	return TCL_ERROR;
+    }
+    return TCL_OK;
+}
 
+static inline int
+setShellRegion(
+    Tcl_Interp *interp,
+    Tk_Window tkwin,
+    HWND parent,
+    HRGN region)
+{
+    if (parent != NULL && SetWindowRgn(parent, region, TRUE) == 0) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"set region failed for outer shell of \"%s\": %s",
+		Tk_PathName(tkwin), formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "SET", NULL);
+	Tcl_DStringFree(&buf);
+	return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static inline int
+getBaseRegion(
+    Tcl_Interp *interp,
+    Tk_Window tkwin,
+    HWND window,
+    HRGN *regionPtr)
+{
+    HRGN region = createRegion();
+    if (GetWindowRgn(window, region) == ERROR) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not read existing window region for \"%s\": %s",
+		Tk_PathName(tkwin), formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "GET", NULL);
+	Tcl_DStringFree(&buf);
+	DeleteObject(region);
+	return TCL_ERROR;
+    }
+    *regionPtr = region;
+    return TCL_OK;
+}
+
+static inline int
+getShellRegion(
+    Tcl_Interp *interp,
+    Tk_Window tkwin,
+    HWND parent,
+    HRGN *regionPtr)
+{
+    HRGN region = createRegion();
+    if (parent != NULL && GetWindowRgn(parent, region) == ERROR) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not read existing region of outer shell for \"%s\": %s",
+		Tk_PathName(tkwin), formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "GET", NULL);
+	Tcl_DStringFree(&buf);
+	DeleteObject(region);
+	return TCL_ERROR;
+    }
+    *regionPtr = region;
+    return TCL_OK;
+}
+
+static inline int
+combineRegions(
+    Tcl_Interp *interp,
+    HRGN regionDst,
+    HRGN regionSrc1,
+    HRGN regionSrc2,
+    int op,
+    const char *opDesc)
+{
+    if (CombineRgn(regionDst, regionSrc1, regionSrc2, op) == ERROR) {
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not %s region: %s", opDesc, formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "COMBINE", NULL);
+	Tcl_DStringFree(&buf);
+	return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
 static int
 getHWNDs(
     Tcl_Interp *interp,
-    Tk_Window tkwin;
-    int kind;
+    Tk_Window tkwin,
+    int kind,
     HWND *window,
     HWND *parent)
 {
@@ -42,8 +202,10 @@ getHWNDs(
     HWND hwnd;
 
     if (w == None) {
-	Tcl_AppendResult(interp, "window \"", Tk_PathName(tkwin),
-		"\" does not properly exist", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window \"%s\" does not properly exist",
+		Tk_PathName(tkwin)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "NONE", NULL);
 	return TCL_ERROR;
     }
     *window = hwnd = Tk_GetHWND(w);
@@ -52,27 +214,36 @@ getHWNDs(
 	return TCL_OK;
     }
     if (ShapeApplyToParent(kind) && applyOperationToToplevelParent) {
-	int returnval;
-	TCHAR myname[CLASSSIZE+1];
+	WCHAR myname[CLASSSIZE + 1];
+
+	while (1) {
+	    int returnval = GetClassNameW(hwnd, myname, CLASSSIZE);
+	    if (returnval == 0) {
+		Tcl_DString buf;
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"parental classname determinisation for window \"%s\" failed: %s",
+			Tk_PathName(tkwin), formError(&buf)));
+		Tcl_SetErrorCode(interp, "SHAPE", "WIN", "CLASSNAME", NULL);
+		Tcl_DStringFree(&buf);
+		return TCL_ERROR;
+	    }
+
+	    if (wcscmp(myname, L"TkTopLevel") == 0) {
+		break;
+	    }
 
-	while ((returnval = GetClassName(hwnd, myname, CLASSSIZE)) != 0 &&
-		strcmp(myname, "TkTopLevel") != 0) {
 	    hwnd = GetParent(hwnd);
 	    if (hwnd == NULL) {
-	        TclWinConvertError(GetLastError());
-		Tcl_AppendResult(interp, "parental window search for "
-			"window \"", Tk_PathName(tkwin), "\" failed", NULL);
+		Tcl_DString buf;
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"parental window search for window \"%s\" failed: %s",
+			Tk_PathName(tkwin), formError(&buf)));
+		Tcl_SetErrorCode(interp, "SHAPE", "WIN", "SEARCH", NULL);
+		Tcl_DStringFree(&buf);
 		return TCL_ERROR;
 	    }
 	}
 
-	if (returnval == 0) {
-	    TclWinConvertError(GetLastError());
-	    Tcl_AppendResult(interp, "parental classname determinisation ",
-		    "for window \"", Tk_PathName(tkwin), "\" failed", NULL);
-	    return TCL_ERROR;
-	}
-
 	*parent = hwnd;
     } else {
 	*parent = NULL;
@@ -88,42 +259,33 @@ getHWNDs(
 int
 setHRGN(
     Tcl_Interp *interp,
-    char *pathname,
+    Tk_Window tkwin,
     HWND window,
     HWND parent,
-    int x,
-    int y,
+    const POINT *offset,
     HRGN region)
 {
     HRGN tmp;
 
-    if ((x != 0 || y != 0) && OffsetRgn(region, x, y) == ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, region, offset) != TCL_OK) {
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(window, region, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
+    if (setBaseRegion(interp, tkwin, window, region) != TCL_OK) {
         DeleteObject(region);
-        Tcl_AppendResult(interp, "set region failed for \"", pathname, "\"",
-		NULL);
 	return TCL_ERROR;
     }
     if (parent == NULL) {
         return TCL_OK;
     }
-    tmp = (HRGN) TkCreateRegion();
-    if (CombineRgn(tmp, region, tmp, RGN_COPY) == ERROR) {
-        TclWinConvertError(GetLastError());
+
+    tmp = createRegion();
+    if (combineRegions(interp, tmp, region, tmp, RGN_COPY, "duplicate") != TCL_OK) {
         DeleteObject(tmp);
-	Tcl_AppendResult(interp, "could not duplicate region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(parent, tmp, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
-        Tcl_AppendResult(interp, "set region failed for outer shell of \"",
-		pathname, "\"", NULL);
+    if (setShellRegion(interp, tkwin, parent, tmp) != TCL_OK) {
+	DeleteObject(tmp);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -132,76 +294,52 @@ setHRGN(
 static int
 invertHRGN(
     Tcl_Interp *interp,
-    char *pathname,
+    Tk_Window tkwin,
     HWND window,
     HWND parent,
-    int w,
-    int h,
-    int x,
-    int y)
+    const SIZE *dimensions,
+    const POINT *offset)
 {
-    HRGN region = (HRGN)TkCreateRegion();
+    HRGN region;
     HRGN tmp;
 
-    if (GetWindowRgn(window, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-        DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing region of \"",
-		pathname, "\"", NULL);
+    if (getBaseRegion(interp, tkwin, window, &region) != TCL_OK) {
 	return TCL_ERROR;
-    }        
-    tmp = CreateRectRgn(0, 0, w-1, h-1); /* assume *this* works... */
-    if (CombineRgn(tmp, region, tmp, RGN_XOR) == ERROR) {
-        TclWinConvertError(GetLastError());
+    }
+    tmp = createRectRegion(dimensions); /* assume *this* works... */
+    if (combineRegions(interp, tmp, region, tmp, RGN_XOR, "invert") != TCL_OK) {
         DeleteObject(tmp);
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not invert region", NULL);
 	return TCL_ERROR;
     }
     DeleteObject(region);
-    if ((x != 0 || y != 0) && OffsetRgn(tmp, x, y)==ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, tmp, offset) != TCL_OK) {
 	DeleteObject(tmp);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(window, tmp, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
-        Tcl_AppendResult(interp, "set region failed for \"", pathname, "\"",
-		NULL);
+    if (setBaseRegion(interp, tkwin, window, tmp) != TCL_OK) {
+	DeleteObject(tmp);
 	return TCL_ERROR;
     }
     if (parent == NULL) {
         return TCL_OK;
     }
 
-    region = (HRGN) TkCreateRegion();
-    if (GetWindowRgn(parent, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-        DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing region of "
-		"outer shell of \"", pathname, "\"", NULL);
+    if (getShellRegion(interp, tkwin, parent, &region) != TCL_OK) {
 	return TCL_ERROR;
     }        
-    tmp = CreateRectRgn(0, 0, w-1, h-1); /* assume *this* works... */
-    if (CombineRgn(tmp, region, tmp, RGN_XOR) == ERROR) {
-        TclWinConvertError(GetLastError());
+    tmp = createRectRegion(dimensions); /* assume *this* works... */
+    if (combineRegions(interp, tmp, region, tmp, RGN_XOR, "invert") != TCL_OK) {
         DeleteObject(tmp);
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not invert region", NULL);
 	return TCL_ERROR;
     }
     DeleteObject(region);
-    if ((x != 0 || y != 0) && OffsetRgn(tmp, x, y)==ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, tmp, offset) != TCL_OK) {
 	DeleteObject(tmp);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(w, tmp, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
-        Tcl_AppendResult(interp, "set region failed for outer shell of \"",
-		pathname, "\"", NULL);
+    if (setShellRegion(interp, tkwin, parent, tmp) != TCL_OK) {
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -210,44 +348,31 @@ invertHRGN(
 static int
 mixHRGN(
     Tcl_Interp *interp,
-    char *pathname,
+    Tk_Window tkwin,
     HWND window,
     HWND parent,
     int op,
-    int x,
-    int y,
+    const POINT *offset,
     HRGN region)
 {
     HRGN tmp;
-    if ((x != 0 || y != 0) && OffsetRgn(region, x, y)==ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, region, offset) != TCL_OK) {
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
 
-    tmp = (HRGN) TkCreateRegion();
-    if (GetWindowRgn(window, tmp) == ERROR) {
-        TclWinConvertError(GetLastError());
-        DeleteObject(tmp);
+    if (getBaseRegion(interp, tkwin, window, &tmp) != TCL_OK) {
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing region of "
-		"outer shell of \"", pathname, "\"", NULL);
         return TCL_ERROR;
     }
-    if (CombineRgn(tmp, region, tmp, op) == ERROR) {
-        TclWinConvertError(GetLastError());
+    if (combineRegions(interp, tmp, region, tmp, op, "apply operation to") != TCL_OK) {
         DeleteObject(tmp);
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply operation to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(window, tmp, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
+    if (setBaseRegion(interp, tkwin, window, tmp) != TCL_OK) {
         DeleteObject(tmp);
         DeleteObject(region);
-        Tcl_AppendResult(interp, "set region failed for \"", pathname, "\"",
-		NULL);
 	return TCL_ERROR;
     }
 
@@ -256,28 +381,18 @@ mixHRGN(
         return TCL_OK;
     }
 
-    tmp = (HRGN) TkCreateRegion();
-    if (GetWindowRgn(parent, tmp) == ERROR) {
-        TclWinConvertError(GetLastError());
-        DeleteObject(tmp);
+    if (getShellRegion(interp, tkwin, parent, &tmp) != TCL_OK) {
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing region of "
-		"outer shell of \"", pathname, "\"", NULL);
         return TCL_ERROR;
     }
-    if (CombineRgn(tmp, region, tmp, op) == ERROR) {
-        TclWinConvertError(GetLastError());
+    if (combineRegions(interp, tmp, region, tmp, op, "apply operation to") != TCL_OK) {
         DeleteObject(tmp);
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply operation to region", NULL);
 	return TCL_ERROR;
     }
     DeleteObject(region);
-    if (SetWindowRgn(parent, tmp, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
+    if (setShellRegion(interp, tkwin, parent, tmp) != TCL_OK) {
         DeleteObject(tmp);
-        Tcl_AppendResult(interp, "set region failed for outer shell of \"",
-		pathname, "\"", NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -291,12 +406,13 @@ int
 ShapeCombineHRGN(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
-    int x, int y,	/* Ignored, for now... */
+    ShapeKind kind,
+    ShapeOps op,
+    const POINT *offset, 
     HRGN region)
 {
     HWND w, parent;
+    SIZE dimensions;
 
     if (getHWNDs(interp, tkwin, kind, &w, &parent) != TCL_OK) {
 	return TCL_ERROR;
@@ -306,79 +422,121 @@ ShapeCombineHRGN(
     case ShapeInvert:
         /* region ignored, so delete! */
         DeleteObject(region);
-        return invertHRGN(interp, Tk_PathName(tkwin), w, parent,
-		Tk_Width(tkwin), Tk_Height(tkwin), x, y);
-
+	dimensions = (SIZE){Tk_Width(tkwin), Tk_Height(tkwin)};
+        return invertHRGN(interp, tkwin, w, parent, &dimensions, offset);
     case ShapeSet:
-        return setHRGN(interp, Tk_PathName(tkwin), w, parent, x, y, region);
-
+        return setHRGN(interp, tkwin, w, parent, offset, region);
     case ShapeUnion:
-        return mixHRGN(interp, Tk_PathName(tkwin), w, parent, RGN_OR, x, y,
-		region);
+        return mixHRGN(interp, tkwin, w, parent, RGN_OR, offset, region);
     case ShapeIntersect:
-        return mixHRGN(interp, Tk_PathName(tkwin), w, parent, RGN_AND, x, y,
-		region);
+        return mixHRGN(interp, tkwin, w, parent, RGN_AND, offset, region);
     case ShapeSubtract:
-        return mixHRGN(interp, Tk_PathName(tkwin), w, parent, RGN_DIFF, x, y,
-		region);
+        return mixHRGN(interp, tkwin, w, parent, RGN_DIFF, offset, region);
+
     default:
-	Tcl_AppendResult(interp, "unknown operation code", NULL);
+	/* Should be unreachable. */
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"unknown operation code: %d", op));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "UNSUPPORTED", NULL);
         /* region ignored, so delete! */
         DeleteObject(region);
 	return TCL_ERROR;
     }
 }
-
-HRGN
-ShapeAddDataToRegion(
+
+static HRGN
+addDataToRegion(
     Tcl_Interp *interp,
     HRGN region,
-    LPRGNDATA data,
-    int size)
+    RGNDATA *data,
+    int count)
 {
     HRGN tmp;
 
-    data->rdh.nCount = size;
-    tmp = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER)+size*sizeof(RECT), data);
-    if (region == NULL) return tmp;
-    if (CombineRgn(tmp, tmp, region, RGN_OR) == ERROR) {
-        TclWinConvertError(GetLastError());
+    data->rdh.nCount = count;
+    tmp = ExtCreateRegion(NULL, offsetof(RGNDATA, Buffer[count * sizeof(RECT)]),
+	    data);
+    if (region == NULL) {
+	return tmp;
+    }
+    if (combineRegions(interp, region, tmp, region, RGN_OR, "merge") != TCL_OK) {
 	DeleteObject(tmp);
-	DeleteObject(region);
-	Tcl_AppendResult(interp, "combination operation failed", NULL);
 	return NULL;
     }
-    DeleteObject(region);
-    return tmp;
+    DeleteObject(tmp);
+    return region;
 }
-
+
 int
 Shape_CombineRectangles(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
+    int rectc,
+    XRectangle *rectv)
+{
+    int i;
+    HRGN region = NULL;
+    RGNDATA *regionData = (RGNDATA *) Tcl_Alloc(
+	    sizeof(RGNDATAHEADER) + sizeof(RECT));
+    RECT *rect = (RECT *) regionData->Buffer;
+
+    regionData->rdh.dwSize = sizeof(regionData->rdh);
+    regionData->rdh.iType = RDH_RECTANGLES;
+    regionData->rdh.nRgnSize = sizeof(RGNDATAHEADER) + sizeof(RECT);
+    regionData->rdh.rcBound.left   = 0;
+    regionData->rdh.rcBound.top    = 0;
+    regionData->rdh.rcBound.right  = Tk_Width(tkwin)-1;
+    regionData->rdh.rcBound.bottom = Tk_Height(tkwin)-1;
+
+    /* Rectangle data is assumed unsorted, so we add one at a time. */
+    for (i=0 ; i<rectc ; i++) {
+	rect->left   = rectv[i].x;
+	rect->top    = rectv[i].y;
+	rect->right  = rectv[i].x + rectv[i].width - 1;
+	rect->bottom = rectv[i].y + rectv[i].height - 1;
+	region = addDataToRegion(interp, region, regionData, 1);
+	if (region == NULL) {
+	    break;
+	}
+    }
+    Tcl_Free((char *) regionData);
+    if (region == NULL) {
+	return TCL_ERROR;
+    }
+
+    return ShapeCombineHRGN(interp, tkwin, kind, op, NULL, region);
+}
+
+int
+Shape_CombineRectanglesOrdered(
+    Tcl_Interp *interp,
+    Tk_Window tkwin,
+    ShapeKind kind,
+    ShapeOps op,
     int rectc,
     XRectangle *rectv)
 {
     int i, j;
-    HRGN region = NULL, tmprgn;
-    int size = sizeof(RGNDATAHEADER) + RECTCOUNT*sizeof(RECT);
-    LPRGNDATA data = (LPRGNDATA) Tcl_Alloc(size);
-    LPRECT rects = (RECT *) data->Buffer;
-
-    data->rdh.dwSize = sizeof(data->rdh);
-    data->rdh.nRgnSize = 0;
-    data->rdh.rcBound.left   = 0;
-    data->rdh.rcBound.top    = 0;
-    data->rdh.rcBound.right  = Tk_Width(tkwin)-1;
-    data->rdh.rcBound.bottom = Tk_Height(tkwin)-1;
+    HRGN region = NULL;
+    RGNDATA *regionData = (RGNDATA *) Tcl_Alloc(
+	    sizeof(RGNDATAHEADER) + RECTCOUNT * sizeof(RECT));
+    RECT *rects = (RECT *) regionData->Buffer;
+
+    regionData->rdh.dwSize = sizeof(regionData->rdh);
+    regionData->rdh.iType = RDH_RECTANGLES;
+    regionData->rdh.nRgnSize = sizeof(RGNDATAHEADER) + RECTCOUNT * sizeof(RECT);
+    regionData->rdh.rcBound.left   = 0;
+    regionData->rdh.rcBound.top    = 0;
+    regionData->rdh.rcBound.right  = Tk_Width(tkwin)-1;
+    regionData->rdh.rcBound.bottom = Tk_Height(tkwin)-1;
 
     for (i=j=0 ; i<rectc ; i++,j++) {
 	if (j == RECTCOUNT) {
-	    region = ShapeAddDataToRegion(interp, region, data, size);
+	    region = addDataToRegion(interp, region, regionData, j);
 	    if (region == NULL) {
-		Tcl_Free((char *) data);
+		Tcl_Free((char *) regionData);
 		return TCL_ERROR;
 	    }
 	    j = 0;
@@ -388,31 +546,18 @@ Shape_CombineRectangles(
 	rects[j].right  = rectv[i].x + rectv[i].width - 1;
 	rects[j].bottom = rectv[i].y + rectv[i].height - 1;
     }
+    /* Incorporate any rectangles not yet processed. */
+    if (j > 0) {
+	region = addDataToRegion(interp, region, regionData, j);
+    }
+    Tcl_Free((char *) regionData);
     if (region == NULL) {
-	region = ShapeAddDataToRegion(interp, region, data, size);
-	if (region == NULL) {
-	    Tcl_Free((char *)data);
-	    return TCL_ERROR;
-	}
+	return TCL_ERROR;
     }
 
-    Tcl_Free((char *)data);
-    return ShapeCombineHRGN(interp, tkwin, kind, op, 0, 0, region);
+    return ShapeCombineHRGN(interp, tkwin, kind, op, NULL, region);
 }
-
-/* No efficiency gain here for windows AFAICT... */
-int
-Shape_CombineRectanglesOrdered(
-    Tcl_Interp *interp,
-    Tk_Window tkwin,
-    int kind,
-    int op,
-    int rectc,
-    XRectangle *rectv)
-{
-    return Shape_CombineRectangles(interp, tkwin, kind, op, rectc, rectv);
-}
-
+
 /*
  * Must copy the region to prevent problems from unsynchronised use of
  * modifiable regions...
@@ -421,20 +566,19 @@ int
 Shape_CombineRegion(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int x,
     int y,
     Region region)
 {
-    HRGN tmp = (HRGN) TkCreateRegion();
-    if (CombineRgn(tmp, region, tmp, RGN_COPY) == ERROR) {
-        TclWinConvertError(GetLastError());
+    HRGN tmp = createRegion();
+    POINT offset = {x, y};
+    if (combineRegions(interp, tmp, region, tmp, RGN_COPY, "duplicate") != TCL_OK) {
 	DeleteObject(tmp);
-	Tcl_AppendResult(interp, "could not duplicate region", NULL);
 	return TCL_ERROR;
     }
-    return ShapeCombineHRGN(interp, tkwin, kind, op, x, y, tmp);
+    return ShapeCombineHRGN(interp, tkwin, kind, op, &offset, tmp);
 }
 
 int
@@ -442,26 +586,22 @@ Shape_CombineWindow(
     Tcl_Interp *interp,
     Tk_Window tkwin,
     Tk_Window srcwin,
-    int kind,
-    int op,
+    ShapeKind kind,
+    ShapeOps op,
     int x,
     int y)
 {
     HWND src;
     HRGN region;
+    POINT offset = {x, y};
 
     if (getHWNDs(interp, srcwin, kind, &src, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
-    region = (HRGN)TkCreateRegion();
-    if (GetWindowRgn(src, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing window "
-		"region for ", Tk_PathName(srcwin), "\"", NULL);
+    if (getBaseRegion(interp,srcwin, src, &region) != TCL_OK) {
 	return TCL_ERROR;
     }
-    return ShapeCombineHRGN(interp, tkwin, kind, op, x, y, region);
+    return ShapeCombineHRGN(interp, tkwin, kind, op, &offset, region);
 }
 
 /*
@@ -470,24 +610,18 @@ Shape_CombineWindow(
 int
 Shape_Reset(
     Tcl_Interp *interp,
-    Tk_Window window,
-    int kind)
+    Tk_Window tkwin,
+    ShapeKind kind)
 {
     HWND window, parent;
 
-    if (getHWNDs(interp, tkwin, kind, &src, NULL) != TCL_OK) {
+    if (getHWNDs(interp, tkwin, kind, &window, &parent) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(window, NULL, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
-        Tcl_AppendResult(interp, "reset region failed for \"",
-		Tk_PathName(tkwin), "\"", NULL);
+    if (setBaseRegion(interp, tkwin, window, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (parent != NULL && SetWindowRgn(parent, NULL, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
-        Tcl_AppendResult(interp, "set region failed for outer shell of \"",
-		Tk_PathName(tkwin), "\"", NULL);
+    if (setShellRegion(interp, tkwin, parent, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -496,36 +630,28 @@ Shape_Reset(
 int
 Shape_MoveShape(
     Tcl_Interp *interp,
-    Tk_Window window,
-    int kind,
+    Tk_Window tkwin,
+    ShapeKind kind,
     int x,
     int y)
 {
     HWND window, parent;
+    HRGN region;
+    POINT point = {x, y};
 
     if (getHWNDs(interp, tkwin, kind, &window, &parent) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    region = (HRGN)TkCreateRegion();
-    if (GetWindowRgn(window, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing window "
-		"region for ", Tk_PathName(tkwin), "\"", NULL);
+    if (getBaseRegion(interp, tkwin, window, &region) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (OffsetRegion(region, x, y) == ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, region, &point) != TCL_OK) {
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(window, region, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
+    if (setBaseRegion(interp, tkwin, window, region) != TCL_OK) {
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not set region of \"",
-		Tk_PathName(tkwin), "\"", NULL);
 	return TCL_ERROR;
     }
 
@@ -533,25 +659,15 @@ Shape_MoveShape(
         return TCL_OK;
     }
 
-    region = (HRGN)TkCreateRegion();
-    if (GetWindowRgn(parent, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-        DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing window region "
-		"for outer shell of ", Tk_PathName(srcwin), "\"", NULL);
+    if (getShellRegion(interp, tkwin, parent, &region) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (OffsetRegion(region, x, y) == ERROR) {
-        TclWinConvertError(GetLastError());
+    if (translateRegion(interp, region, &point) != TCL_OK) {
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not apply offset to region", NULL);
 	return TCL_ERROR;
     }
-    if (SetWindowRgn(parent, region, TRUE) == 0) {
-        TclWinConvertError(GetLastError());
+    if (setShellRegion(interp, tkwin, parent, region) != TCL_OK) {
         DeleteObject(region);
-	Tcl_AppendResult(interp, "could not set region of outer shell of\"",
-		Tk_PathName(tkwin), "\"", NULL);
 	return TCL_ERROR;
     }
 
@@ -562,7 +678,7 @@ int
 Shape_GetBbox(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int getClip,	/* ignored */
+    ShapeKind kind,
     int *valid,
     int *x1,
     int *y1,
@@ -576,12 +692,7 @@ Shape_GetBbox(
     if (getHWNDs(interp, tkwin, kind, &window, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
-    region = (HRGN)TkCreateRegion();
-    if (GetWindowRgn(window, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing window "
-		"region for ", Tk_PathName(srcwin), "\"", NULL);
+    if (getBaseRegion(interp, tkwin, window, &region) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (GetRgnBox(region, &rect) == 0) {
@@ -601,13 +712,13 @@ int
 Shape_GetShapeRectanglesObj(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int getClip)
+    ShapeKind kind)
 {
     HWND window;
     HRGN region;
-    LPRGNDATA buffer;
+    RGNDATA *buffer;
     int size, i;
-    RECT *rects;
+    const RECT *rects;
     Tcl_Obj *result;
     Tcl_Obj *vec[4];
 
@@ -615,36 +726,37 @@ Shape_GetShapeRectanglesObj(
     if (getHWNDs(interp, tkwin, kind, &window, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
-    region = (HRGN)TkCreateRegion();
-    if (GetWindowRgn(window, region) == ERROR) {
-        TclWinConvertError(GetLastError());
-	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not read existing window "
-		"region for ", Tk_PathName(srcwin), "\"", NULL);
+    if (getBaseRegion(interp, tkwin, window, &region) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     /*** GET THE RECTANGLES FOR THE REGION ***/
     size = GetRegionData(region, 0, NULL);
     if (size == 0) {
-        TclWinConvertError(GetLastError());
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not calculate buffer size: %s", formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "BUF_SIZE", NULL);
+	Tcl_DStringFree(&buf);
 	DeleteObject(region);
-	Tcl_AppendResult(interp, "could not calculate buffer size", NULL);
 	return TCL_ERROR;
     }
-    buffer = (LPRGNDATA)Tcl_Alloc(size);
+    buffer = (RGNDATA *) Tcl_Alloc(size);
     if (GetRegionData(region, size, buffer) == 0) {
-        TclWinConvertError(GetLastError());
+	Tcl_DString buf;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"could not populate buffer: %s", formError(&buf)));
+	Tcl_SetErrorCode(interp, "SHAPE", "WIN", "GET_DATA", NULL);
+	Tcl_DStringFree(&buf);
 	DeleteObject(region);
 	Tcl_Free((char *)buffer);
-	Tcl_AppendResult(interp, "could not populate buffer", NULL);
 	return TCL_ERROR;
     }
-    rects = (RECT*)&(buffer->Buffer);
-    CloseRegion(region);
+    rects = (RECT *) &buffer->Buffer;
+    DeleteObject(region);
 
     /*** GET THE TCL_OBJ FOR THE RECTANGLES ***/
-    result = Tcl_NewObj();
+    result = Tcl_NewListObj(buffer->rdh.nCount, NULL);
     for (i=0 ; i<buffer->rdh.nCount ; i++) {
 	/* reusing these objects between rectangles is impractical */
 	vec[0] = Tcl_NewIntObj(rects[i].left);
@@ -652,7 +764,7 @@ Shape_GetShapeRectanglesObj(
 	vec[2] = Tcl_NewIntObj(rects[i].right);
 	vec[3] = Tcl_NewIntObj(rects[i].bottom);
 	/* assume this op will not fail, since object is under our control */
-	Tcl_ListObjAppendElement(interp, result, Tcl_NewListObj(4, vec));
+	Tcl_ListObjAppendElement(NULL, result, Tcl_NewListObj(4, vec));
     }
     Tcl_Free((char *)buffer);
     Tcl_SetObjResult(interp, result);
@@ -686,13 +798,15 @@ int
 Shape_CombineBitmap(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    int kind,
+    ShapeKind kind,
     int op,
     int x,
     int y,
     Pixmap bitmap)
 {
-    Tcl_AppendResult(interp, "operation not supported yet", NULL);
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+    	    "operation not supported yet"));
+    Tcl_SetErrorCode(interp, "SHAPE", "WIN", "UNSUPPORTED", NULL);
     return TCL_ERROR;
 }
 
@@ -704,6 +818,8 @@ ShapeRenderTextAsRectangles(
     Tcl_Obj *font,
     int *numRects)
 {
-    Tcl_AppendResult(interp, "operation not supported yet", NULL);
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+    	    "operation not supported yet"));
+    Tcl_SetErrorCode(interp, "SHAPE", "WIN", "UNSUPPORTED", NULL);
     return NULL;
 }