Importing from X.Org 7.2RC2

author: Matthieu Herrb <matthieu@cvs.openbsd.org> 2006-11-25 20:24:16 +0000
committer: Matthieu Herrb <matthieu@cvs.openbsd.org> 2006-11-25 20:24:16 +0000
commit: dc4a2107be04f29ad06d6e60e102370bf68739cd (patch)
tree: 57b3b37d49dada5a081f5ee365979a730b13acf4 /app/x11perf
parent: 78d9ac52db47a21e2260ec82b6666ca014fc4c68 (diff)
45 files changed, 21601 insertions, 0 deletions
diff --git a/app/x11perf/AUTHORS b/app/x11perf/AUTHORS
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/x11perf/AUTHORS
diff --git a/app/x11perf/COPYING b/app/x11perf/COPYING
new file mode 100644
index 000000000..7f33cbfd2
--- /dev/null
+++ b/app/x11perf/COPYING
@@ -0,0 +1,12 @@
+This is a stub file.  This package has not yet had its complete licensing
+information compiled.  Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
diff --git a/app/x11perf/ChangeLog b/app/x11perf/ChangeLog
new file mode 100644
index 000000000..85e5facbe
--- /dev/null
+++ b/app/x11perf/ChangeLog
@@ -0,0 +1,52 @@
+2006-03-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	Bump to 1.4.1 (was 1.0.1 because we screwed up during modularising).
+
+2006-02-14  Keith Packard  <keithp@keithp.com>
+
+	* Makefile.am:
+	* configure.ac:
+	* x11perf.h:
+	Split detection of Xrender and Xft.
+	Add detection of MIT-SHM.
+	Clean up CFLAGS in Makefile.am
+
+2006-02-13  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	* x11perf.c:
+	* x11perf.h:
+	Detect when Render is available and turn those tests on.
+
+2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version for X11R7 release.
+
+2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for final X11R7 release candidate.
+
+2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* Makefile.am:
+	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for X11R7 RC3 release.
+
+2005-11-20  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac:
+	Change dependency from xmu to xmuu since the full xmu
+	(with all its baggage like Xt) is not needed here.
+
+2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for RC1 release.
+
diff --git a/app/x11perf/INSTALL b/app/x11perf/INSTALL
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/x11perf/INSTALL
diff --git a/app/x11perf/Makefile.am b/app/x11perf/Makefile.am
new file mode 100644
index 000000000..d6359099e
--- /dev/null
+++ b/app/x11perf/Makefile.am
@@ -0,0 +1,98 @@
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+bin_PROGRAMS = x11perf
+
+bin_SCRIPTS = x11perfcomp
+
+LIBPATH = $(libdir)/X11/x11perfcomp
+
+x11perfcompdir = $(LIBPATH)
+dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark
+
+AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
+x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm
+
+x11perf_SOURCES =	\
+        bitmaps.c \
+        bitmaps.h \
+        do_arcs.c \
+        do_blt.c \
+        do_complex.c \
+        do_dots.c \
+        do_lines.c \
+        do_movewin.c \
+        do_rects.c \
+        do_segs.c \
+        do_simple.c \
+        do_tests.c \
+        do_text.c \
+        do_traps.c \
+        do_tris.c \
+        do_valgc.c \
+        do_windows.c \
+        x11perf.c \
+        x11perf.h
+
+appman_PRE = \
+        x11perfcomp.man \
+        x11perf.man \
+        Xmark.man
+
+x11perfcomp: x11pcomp.cpp
+	$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
+		$(SED) s/XCOMM/\#/ > $@
+
+
+CLEANFILES = $(bin_SCRIPTS) x11perfcomp
+
+EXTRA_DIST = x11pcomp.cpp
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST += $(appman_PRE)
+CLEANFILES += $(appman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__apploaddir__|$(appdefaultdir)|' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
diff --git a/app/x11perf/Makefile.in b/app/x11perf/Makefile.in
new file mode 100644
index 000000000..96b39928c
--- /dev/null
+++ b/app/x11perf/Makefile.in
@@ -0,0 +1,722 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+
+SED = sed
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+X11PERF_CFLAGS = @X11PERF_CFLAGS@
+X11PERF_LIBS = @X11PERF_LIBS@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
+XRENDER_CFLAGS = @XRENDER_CFLAGS@
+XRENDER_LIBS = @XRENDER_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+bin_PROGRAMS = x11perf
+
+bin_SCRIPTS = x11perfcomp
+
+LIBPATH = $(libdir)/X11/x11perfcomp
+
+x11perfcompdir = $(LIBPATH)
+dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark
+
+AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
+x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm
+
+x11perf_SOURCES = \
+        bitmaps.c \
+        bitmaps.h \
+        do_arcs.c \
+        do_blt.c \
+        do_complex.c \
+        do_dots.c \
+        do_lines.c \
+        do_movewin.c \
+        do_rects.c \
+        do_segs.c \
+        do_simple.c \
+        do_tests.c \
+        do_text.c \
+        do_traps.c \
+        do_tris.c \
+        do_valgc.c \
+        do_windows.c \
+        x11perf.c \
+        x11perf.h
+
+
+appman_PRE = \
+        x11perfcomp.man \
+        x11perf.man \
+        Xmark.man
+
+
+CLEANFILES = $(bin_SCRIPTS) x11perfcomp $(appman_DATA)
+
+EXTRA_DIST = x11pcomp.cpp $(appman_PRE)
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+	-e 's|__xservername__|Xorg|g' \
+	-e 's|__xconfigfile__|xorg.conf|g' \
+	-e 's|__projectroot__|$(prefix)|g' \
+	-e 's|__apploaddir__|$(appdefaultdir)|' \
+	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = x11perf$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_x11perf_OBJECTS = bitmaps.$(OBJEXT) do_arcs.$(OBJEXT) \
+	do_blt.$(OBJEXT) do_complex.$(OBJEXT) do_dots.$(OBJEXT) \
+	do_lines.$(OBJEXT) do_movewin.$(OBJEXT) do_rects.$(OBJEXT) \
+	do_segs.$(OBJEXT) do_simple.$(OBJEXT) do_tests.$(OBJEXT) \
+	do_text.$(OBJEXT) do_traps.$(OBJEXT) do_tris.$(OBJEXT) \
+	do_valgc.$(OBJEXT) do_windows.$(OBJEXT) x11perf.$(OBJEXT)
+x11perf_OBJECTS = $(am_x11perf_OBJECTS)
+x11perf_DEPENDENCIES =
+x11perf_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS) $(dist_x11perfcomp_SCRIPTS)
+
+
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bitmaps.Po ./$(DEPDIR)/do_arcs.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_blt.Po ./$(DEPDIR)/do_complex.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_dots.Po ./$(DEPDIR)/do_lines.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_movewin.Po ./$(DEPDIR)/do_rects.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_segs.Po ./$(DEPDIR)/do_simple.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_tests.Po ./$(DEPDIR)/do_text.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_traps.Po ./$(DEPDIR)/do_tris.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/do_valgc.Po ./$(DEPDIR)/do_windows.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/x11perf.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(x11perf_SOURCES)
+DATA = $(appman_DATA)
+
+DIST_COMMON = README $(dist_x11perfcomp_SCRIPTS) $(srcdir)/Makefile.in \
+	$(srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
+	Makefile.am NEWS aclocal.m4 config.guess config.h.in config.sub \
+	configure configure.ac depcomp install-sh missing mkinstalldirs
+SOURCES = $(x11perf_SOURCES)
+
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+x11perf$(EXEEXT): $(x11perf_OBJECTS) $(x11perf_DEPENDENCIES) 
+	@rm -f x11perf$(EXEEXT)
+	$(LINK) $(x11perf_LDFLAGS) $(x11perf_OBJECTS) $(x11perf_LDADD) $(LIBS)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	done
+dist_x11perfcompSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+install-dist_x11perfcompSCRIPTS: $(dist_x11perfcomp_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(x11perfcompdir)
+	@list='$(dist_x11perfcomp_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(dist_x11perfcompSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(x11perfcompdir)/$$f"; \
+	    $(dist_x11perfcompSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(x11perfcompdir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-dist_x11perfcompSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_x11perfcomp_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f $(DESTDIR)$(x11perfcompdir)/$$f"; \
+	  rm -f $(DESTDIR)$(x11perfcompdir)/$$f; \
+	done
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitmaps.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_arcs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_blt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_complex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_dots.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_lines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_movewin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_rects.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_segs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_simple.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_tests.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_text.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_traps.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_tris.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_valgc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_windows.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11perf.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+uninstall-info-am:
+appmanDATA_INSTALL = $(INSTALL_DATA)
+install-appmanDATA: $(appman_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(appmandir)
+	@list='$(appman_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f"; \
+	  $(appmanDATA_INSTALL) $$d$$p $(DESTDIR)$(appmandir)/$$f; \
+	done
+
+uninstall-appmanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(appman_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(appmandir)/$$f"; \
+	  rm -f $(DESTDIR)$(appmandir)/$$f; \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(x11perfcompdir) $(DESTDIR)$(appmandir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-appmanDATA install-dist_x11perfcompSCRIPTS
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-dist_x11perfcompSCRIPTS \
+	uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am info info-am install install-am \
+	install-appmanDATA install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dist_x11perfcompSCRIPTS \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-appmanDATA \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-dist_x11perfcompSCRIPTS uninstall-info-am
+
+
+x11perfcomp: x11pcomp.cpp
+	$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
+		$(SED) s/XCOMM/\#/ > $@
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/app/x11perf/NEWS b/app/x11perf/NEWS
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/x11perf/NEWS
diff --git a/app/x11perf/README b/app/x11perf/README
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/x11perf/README
diff --git a/app/x11perf/Xmark b/app/x11perf/Xmark
new file mode 100644
index 000000000..dbe59e983
--- /dev/null
+++ b/app/x11perf/Xmark
@@ -0,0 +1,638 @@
+#! /bin/sh
+#$Xorg: Xmark.sh,v 1.3 2000/08/17 19:54:08 cpqbld Exp $
+#XPC Header: Xmark,v 1.15 93/04/12 10:10:07 hmgr Exp
+#
+############################################################
+# Xmark version XPC Revision: 1.15
+#
+# Usage: Xmark datafile
+#
+############################################################
+# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.2 1997/01/04 12:20:20 dawes Exp $
+#
+#
+# CHANGE HISTORY:
+#
+# X11perfcompDR  --  Creates a Digital Review compatible breakdown of 
+# x11perf v1.2 results as described in "Take Your Pick Of Graphics"
+# by John Montgomery, Digital Review, May 7th, 1990, Page 44. 
+# 8/30/90  v1.0 program created by Lonnie Mandigo 
+# 1/18/91  Modification by  Lonnie Mandigo
+#	   Fixed a bug to include UCIRC in data.
+# 2/5/91   Modification by  Lonnie Mandigo
+#          Now removes sum.tmp file when finished.
+# 3/18/91  v1.01 Increased resolution to handle zero ratios.
+#          Minor aesethic cleanups and better error handling.
+#          Lonnie Mandigo and Jason Levitt (jason@cs.utexas.edu)
+# 3/4/93   Converted to Xmark by Bob Kuseski
+#          to produce a single number representing the ratio between 
+#	   the xpc weighted averages of the output from x11perf Rev 1.3
+#	   for the server under test and a SparcStation 1
+# 3/10/93  Changed to produce THREE output numbers and added bounds
+#	   checking of input data.
+# 3/15/93  Removed usage of '-F' in grep for compatibility reasons
+# 3/16/93  Corrected usage of substr() and used two greps versus fgrep
+# 4/12/93  Eliminated use of functions and \n in echo
+#
+############################################################
+# Copyright (c) 1993 by Hewlett-Packard Company
+#
+# Permission to use, copy, modify, and  distribute  this  software and its
+# documentation  for  any  purpose  and  without  fee is  hereby  granted,
+# provided that the above  copyright  notice appear in all copies and that
+# both  the  copyright  notice  and  this  permission   notice  appear  in
+# supporting  documentation, and that the name of  Hewlett-Packard  not be
+# used in  advertising  or publicity  pertaining  to  distribution  of the
+# software without specific, written prior permission.
+#
+############################################################
+# Instructions:
+# 
+# Usage: Xmark datafile
+#
+# where: 'datafile' is created by running x11perf Rev 1.3
+# with the flags below:
+#
+#      x11perf -display mysystem:0.0 -v1.3 -rop GXcopy GXxor -all > datafile
+#   or
+#      x11perf -display mysystem:0.0 -v1.3 -rop GXcopy -all > datafile
+#      x11perf -display mysystem:0.0 -v1.3 -rop GXxor -all >> datafile
+#   or
+#      x11perf -display mysystem:0.0 -v1.3 -rop GXxor -all > datafile
+#      x11perf -display mysystem:0.0 -v1.3 -rop GXcopy -all >> datafile
+#
+# Xmark summarizes the results relative to the data contained in
+# the datafile.  Xmark writes to standard out, so if you want to
+# capture the output in a file, use:
+# 
+#   Xmark datafile > output.comp
+#
+# The 'output.comp' contains THREE numbers:
+#	    - Weighted x11perf number of the server under test
+#	    - Weighted x11perf number of the SparcStation 1
+#	    - Xmark = the ratio of the above two numbers
+#
+# Note the SparcStation 1 number comes from a:
+#   X11R5 Xsun
+#   Standard with SunOS 4.1.2
+#   SunOs 4.1.2
+#   CG3 dumb Color Frame Buffer
+#
+############################################################
+############################################################
+
+# Cleanup on interrupt
+trap \
+"echo Interrupt: removing temporary files. >& 2 ;rm -f temp.$$ rates.$$ awkfile.$$; exit 1" 1 2 3 9 15
+
+# Must have only one file specified
+if [ "$#" -ne 1 ]
+then
+    echo "Usage: $0 datafile" >& 2
+    exit 1
+fi
+
+# Must be an ordinary file
+if [ ! -f "$1" ]
+then
+    echo "Error: data file does not exist or is not ordinary." >& 2
+    exit 1
+fi
+
+# See if the date file has the correct number of results.
+LC1=`grep trep "$1" | wc -l`
+LC2=441		# Number of test without Shared Memory Transport
+LC3=447		# Number of test with Shared Memory Transport
+
+if [ "$LC1" -ne "$LC2" ] && [ "$LC1" -ne "$LC3" ]
+then
+    echo "WARNING: datafile contains $LC1, not "$LC2" or "$LC3" 'trep' results;" >& 2
+    if [ "$LC1" -gt "$LC2" ]
+    then
+	echo "extra results are probably OK." >& 2
+	echo ""
+    fi
+fi
+ 
+DATA=$1
+
+grep trep $DATA		> temp.$$
+grep server $DATA	>> temp.$$
+
+# convert the averages to standard form.
+
+cat > awkfile.$$ <<'EOS'
+    BEGIN {
+	weight["10x10 rectangle"] = 37;
+	weight["Scroll 500x500 pixels"] = 33;
+	weight["100x100 rectangle"] = 32;
+	weight["10-pixel line segment"] = 31;
+	weight["10-pixel line"] = 30;
+	weight["PutImage 100x100 square"] = 30;
+	weight["Scroll 100x100 pixels"] = 29;
+	weight["PutImage 500x500 square"] = 29;
+	weight["500x500 rectangle"] = 29;
+	weight["100-pixel line"] = 28;
+	weight["Char in 60-char line (9x15)"] = 28;
+	weight["Char in 80-char image line (6x13)"] = 28;
+	weight["Char in 80-char line (6x13)"] = 27;
+	weight["Char in 80-char image line (TR 10)"] = 27;
+	weight["100-pixel line segment"] = 27;
+	weight["Char in 80-char line (TR 10)"] = 27;
+	weight["Char in 60-char image line (9x15)"] = 26;
+	weight["Copy 100x100 from pixmap to window"] = 26;
+	weight["Copy 500x500 from pixmap to window"] = 26;
+	weight["Char in 70-char line (8x13)"] = 24;
+	weight["500-pixel line"] = 24;
+	weight["Char in 20/40/20 line (6x13, TR 10)"] = 23;
+	weight["Char in 70-char image line (8x13)"] = 23;
+	weight["Change graphics context"] = 23;
+	weight["Copy 100x100 from window to window"] = 23;
+	weight["10-pixel horizontal line segment"] = 23;
+	weight["10-pixel vertical line segment"] = 23;
+	weight["Copy 500x500 from window to window"] = 22;
+	weight["Char in 30-char line (TR 24)"] = 22;
+	weight["Char16 in 40-char line (k14)"] = 22;
+	weight["500-pixel line segment"] = 22;
+	weight["Char in 30-char image line (TR 24)"] = 22;
+	weight["100-pixel horizontal line segment"] = 22;
+	weight["100-pixel vertical line segment"] = 22;
+	weight["Scroll 10x10 pixels"] = 21;
+	weight["Char16 in 40-char image line (k14)"] = 21;
+	weight["GetImage 500x500 square"] = 21;
+	weight["PutImage 10x10 square"] = 20;
+	weight["GetImage 100x100 square"] = 20;
+	weight["Move window (4 kids)"] = 20;
+	weight["Copy 10x10 from pixmap to window"] = 20;
+	weight["100x100 4x4 tiled rectangle"] = 20;
+	weight["Copy 100x100 from window to pixmap"] = 19;
+	weight["Hide/expose window via popup (4 kids)"] = 19;
+	weight["Copy 500x500 from window to pixmap"] = 19;
+	weight["500-pixel horizontal line segment"] = 19;
+	weight["500-pixel vertical line segment"] = 19;
+	weight["Fill 10x10 equivalent triangle"] = 19;
+	weight["Char16 in 23-char line (k24)"] = 19;
+	weight["1x1 rectangle"] = 19;
+	weight["Char16 in 7/14/7 line (k14, k24)"] = 18;
+	weight["10x10 4x4 tiled rectangle"] = 18;
+	weight["100-pixel line segment (1 kid)"] = 18;
+	weight["100x100 rectangle outline"] = 18;
+	weight["Move window via parent (4 kids)"] = 18;
+	weight["GetAtomName"] = 18;
+	weight["GetProperty"] = 18;
+	weight["Char16 in 23-char image line (k24)"] = 18;
+	weight["100-pixel line segment (3 kids)"] = 17;
+	weight["Resize window (4 kids)"] = 17;
+	weight["Map window via parent (4 kids)"] = 17;
+	weight["Copy 100x100 from pixmap to pixmap"] = 17;
+	weight["Unmap window via parent (4 kids)"] = 17;
+	weight["100-pixel line segment (2 kids)"] = 17;
+	weight["10-pixel solid circle"] = 17;
+	weight["1-pixel line"] = 17;
+	weight["Move window (16 kids)"] = 16;
+	weight["Fill 100x100 equivalent triangle"] = 16;
+	weight["Hide/expose window via popup (16 kids)"] = 16;
+	weight["Move window via parent (16 kids)"] = 16;
+	weight["10x10 rectangle outline"] = 16;
+	weight["Destroy window via parent (4 kids)"] = 16;
+	weight["Create unmapped window (4 kids)"] = 16;
+	weight["Copy 10x10 from window to window"] = 16;
+	weight["Copy 100x100 1-bit deep plane"] = 16;
+	weight["10-pixel circle"] = 16;
+	weight["100x100 opaque stippled rectangle"] = 16;
+	weight["500x500 4x4 tiled rectangle"] = 16;
+	weight["100x100 stippled rectangle"] = 16;
+	weight["Copy 500x500 from pixmap to pixmap"] = 16;
+	weight["Create and map subwindows (16 kids)"] = 16;
+	weight["10x10 stippled rectangle"] = 16;
+	weight["Resize window (16 kids)"] = 16;
+	weight["Map window via parent (16 kids)"] = 15;
+	weight["100-pixel solid circle"] = 15;
+	weight["Copy 500x500 1-bit deep plane"] = 15;
+	weight["500x500 rectangle outline"] = 15;
+	weight["Create and map subwindows (4 kids)"] = 15;
+	weight["Destroy window via parent (16 kids)"] = 15;
+	weight["10x1 wide horizontal line segment"] = 15;
+	weight["10x1 wide vertical line segment"] = 15;
+	weight["100x100 161x145 tiled rectangle"] = 15;
+	weight["1-pixel line segment"] = 15;
+	weight["Unmap window via parent (16 kids)"] = 15;
+	weight["Fill 100x100 trapezoid"] = 14;
+	weight["100-pixel circle"] = 14;
+	weight["10x10 opaque stippled rectangle"] = 14;
+	weight["100-pixel dashed line"] = 14;
+	weight["500x500 161x145 tiled rectangle"] = 14;
+	weight["Copy 10x10 from window to pixmap"] = 14;
+	weight["100x10 wide horizontal line segment"] = 14;
+	weight["100x10 wide vertical line segment"] = 14;
+	weight["100x100 wide rectangle outline"] = 14;
+	weight["100x100 216x208 tiled rectangle"] = 14;
+	weight["Dot"] = 14;
+	weight["10x10 161x145 tiled rectangle"] = 14;
+	weight["Fill 100x100 equivalent complex polygons"] = 14;
+	weight["Move window (50 kids)"] = 13;
+	weight["Move window via parent (50 kids)"] = 13;
+	weight["Circulate window (16 kids)"] = 13;
+	weight["100-pixel dashed segment"] = 13;
+	weight["Create and map subwindows (50 kids)"] = 13;
+	weight["Create and map subwindows (25 kids)"] = 13;
+	weight["10x10 wide rectangle outline"] = 13;
+	weight["500x500 216x208 tiled rectangle"] = 13;
+	weight["Hide/expose window via popup (25 kids)"] = 13;
+	weight["Create and map subwindows (100 kids)"] = 13;
+	weight["Map window via parent (50 kids)"] = 13;
+	weight["Fill 10x10 trapezoid"] = 13;
+	weight["100x10 wide line"] = 13;
+	weight["10x10 216x208 tiled rectangle"] = 13;
+	weight["10-pixel dashed line"] = 13;
+	weight["Map window via parent (100 kids)"] = 13;
+	weight["Copy 10x10 from pixmap to pixmap"] = 13;
+	weight["Map window via parent (25 kids)"] = 13;
+	weight["Create unmapped window (25 kids)"] = 13;
+	weight["Move window (25 kids)"] = 13;
+	weight["Circulate window (4 kids)"] = 12;
+	weight["Move window via parent (25 kids)"] = 12;
+	weight["Create unmapped window (16 kids)"] = 12;
+	weight["Create and map subwindows (75 kids)"] = 12;
+	weight["500x500 opaque stippled rectangle"] = 12;
+	weight["Hide/expose window via popup (100 kids)"] = 12;
+	weight["Create and map subwindows (200 kids)"] = 12;
+	weight["Hide/expose window via popup (50 kids)"] = 12;
+	weight["500x50 wide horizontal line segment"] = 12;
+	weight["500x50 wide vertical line segment"] = 12;
+	weight["100x100 161x145 opaque stippled rectangle"] = 12;
+	weight["Resize window (25 kids)"] = 12;
+	weight["Map window via parent (200 kids)"] = 12;
+	weight["10x10 161x145 opaque stippled rectangle"] = 12;
+	weight["X protocol NoOperation"] = 12;
+	weight["10-pixel dashed segment"] = 12;
+	weight["Resize unmapped window (16 kids)"] = 12;
+	weight["Create unmapped window (100 kids)"] = 12;
+	weight["Fill 10x10 equivalent complex polygon"] = 12;
+	weight["Map window via parent (75 kids)"] = 12;
+	weight["100x100 161x145 stippled rectangle"] = 12;
+	weight["Moved unmapped window (16 kids)"] = 12;
+	weight["Copy 10x10 1-bit deep plane"] = 12;
+	weight["Unmap window via parent (50 kids)"] = 12;
+	weight["GetImage 10x10 square"] = 12;
+	weight["Fill 100x100 tiled trapezoid"] = 12;
+	weight["500x500 wide rectangle outline"] = 12;
+	weight["Fill 100x100 stippled trapezoid"] = 12;
+	weight["500x500 stippled rectangle"] = 12;
+	weight["Moved unmapped window (4 kids)"] = 12;
+	weight["10x10 161x145 stippled rectangle"] = 12;
+	weight["Unmap window via parent (25 kids)"] = 12;
+	weight["500-pixel solid circle"] = 12;
+	weight["Create unmapped window (50 kids)"] = 12;
+	weight["Destroy window via parent (25 kids)"] = 11;
+	weight["Resize window (200 kids)"] = 11;
+	weight["100-pixel filled ellipse"] = 11;
+	weight["Hide/expose window via popup (200 kids)"] = 11;
+	weight["Unmap window via parent (100 kids)"] = 11;
+	weight["Circulate window (25 kids)"] = 11;
+	weight["Resize window (50 kids)"] = 11;
+	weight["Hide/expose window via popup (75 kids)"] = 11;
+	weight["Destroy window via parent (100 kids)"] = 11;
+	weight["Destroy window via parent (50 kids)"] = 11;
+	weight["Create unmapped window (200 kids)"] = 11;
+	weight["Fill 100x100 opaque stippled trapezoid"] = 11;
+	weight["Move window via parent (75 kids)"] = 11;
+	weight["500-pixel filled ellipse"] = 11;
+	weight["Resize unmapped window (4 kids)"] = 11;
+	weight["Move window via parent (200 kids)"] = 11;
+	weight["Move window (75 kids)"] = 11;
+	weight["Fill 10x10 tiled trapezoid"] = 11;
+	weight["Fill 100x100 161x145 stippled trapezoid"] = 11;
+	weight["Move window (200 kids)"] = 11;
+	weight["Fill 10x10 stippled trapezoid"] = 11;
+	weight["Create unmapped window (75 kids)"] = 11;
+	weight["100-pixel fill chord partial circle"] = 10;
+	weight["Circulate Unmapped window (16 kids)"] = 10;
+	weight["Circulate window (50 kids)"] = 10;
+	weight["Move window (100 kids)"] = 10;
+	weight["Circulate window (100 kids)"] = 10;
+	weight["Move window via parent (100 kids)"] = 10;
+	weight["500x50 wide line"] = 10;
+	weight["500-pixel circle"] = 10;
+	weight["100-pixel double-dashed line"] = 10;
+	weight["Unmap window via parent (200 kids)"] = 10;
+	weight["Moved unmapped window (50 kids)"] = 10;
+	weight["10-pixel filled ellipse"] = 10;
+	weight["Resize window (75 kids)"] = 10;
+	weight["Fill 100x100 161x145 tiled trapezoid"] = 10;
+	weight["500x500 161x145 opaque stippled rectangle"] = 10;
+	weight["Fill 100x100 161x145 opaque stippled trapezoid"] = 10;
+	weight["Unmap window via parent (75 kids)"] = 10;
+	weight["Resize unmapped window (25 kids)"] = 10;
+	weight["100-pixel ellipse"] = 10;
+	weight["Destroy window via parent (75 kids)"] = 10;
+	weight["Fill 1x1 equivalent triangle"] = 10;
+	weight["500-pixel ellipse"] = 10;
+	weight["Fill 10x10 opaque stippled trapezoid"] = 10;
+	weight["Resize window (100 kids)"] = 10;
+	weight["500x500 161x145 stippled rectangle"] = 10;
+	weight["Destroy window via parent (200 kids)"] = 10;
+	weight["100-pixel fill slice partial circle"] = 10;
+	weight["Fill 100x100 216x208 tiled trapezoid"] = 9;
+	weight["100-pixel wide circle"] = 9;
+	weight["Moved unmapped window (25 kids)"] = 9;
+	weight["10x1 wide line"] = 9;
+	weight["Resize unmapped window (100 kids)"] = 9;
+	weight["100-pixel double-dashed segment"] = 9;
+	weight["10-pixel fill chord partial circle"] = 9;
+	weight["Circulate window (75 kids)"] = 9;
+	weight["100-pixel partial circle"] = 9;
+	weight["Circulate window (200 kids)"] = 9;
+	weight["Fill 10x10 161x145 stippled trapezoid"] = 9;
+	weight["Circulate Unmapped window (4 kids)"] = 9;
+	weight["100-pixel dashed circle"] = 9;
+	weight["Circulate Unmapped window (25 kids)"] = 9;
+	weight["10-pixel ellipse"] = 9;
+	weight["Resize unmapped window (50 kids)"] = 9;
+	weight["100-pixel partial ellipse"] = 9;
+	weight["Fill 10x10 161x145 tiled trapezoid"] = 8;
+	weight["100x10 wide dashed line"] = 8;
+	weight["10-pixel partial circle"] = 8;
+	weight["100-pixel wide ellipse"] = 8;
+	weight["Fill 10x10 161x145 opaque stippled trapezoid"] = 8;
+	weight["100-pixel wide partial circle"] = 8;
+	weight["Moved unmapped window (75 kids)"] = 8;
+	weight["Resize unmapped window (75 kids)"] = 8;
+	weight["Circulate Unmapped window (100 kids)"] = 8;
+	weight["100-pixel fill slice partial ellipse"] = 8;
+	weight["100x10 wide double-dashed line"] = 8;
+	weight["10-pixel fill slice partial circle"] = 8;
+	weight["100-pixel dashed ellipse"] = 8;
+	weight["100-pixel fill chord partial ellipse"] = 8;
+	weight["100-pixel wide dashed circle"] = 8;
+	weight["100-pixel double-dashed circle"] = 8;
+	weight["Fill 10x10 216x208 tiled trapezoid"] = 7;
+	weight["Moved unmapped window (100 kids)"] = 7;
+	weight["10-pixel wide circle"] = 7;
+	weight["Moved unmapped window (200 kids)"] = 7;
+	weight["Resize unmapped window (200 kids)"] = 7;
+	weight["Circulate Unmapped window (50 kids)"] = 7;
+	weight["1-pixel circle"] = 7;
+	weight["10-pixel partial ellipse"] = 7;
+	weight["500-pixel wide circle"] = 7;
+	weight["500-pixel wide ellipse"] = 7;
+	weight["100-pixel wide partial ellipse"] = 7;
+	weight["Circulate Unmapped window (75 kids)"] = 7;
+	weight["100-pixel wide dashed ellipse"] = 7;
+	weight["100-pixel double-dashed ellipse"] = 7;
+	weight["10-pixel wide ellipse"] = 6;
+	weight["10-pixel wide partial circle"] = 6;
+	weight["1-pixel solid circle"] = 6;
+	weight["100-pixel wide double-dashed circle"] = 6;
+	weight["Circulate Unmapped window (200 kids)"] = 6;
+	weight["1x1 4x4 tiled rectangle"] = 6;
+	weight["10-pixel wide partial ellipse"] = 6;
+	weight["10-pixel fill chord partial ellipse"] = 6;
+	weight["10-pixel fill slice partial ellipse"] = 6;
+	weight["100-pixel wide double-dashed ellipse"] = 5;
+	weight["1x1 161x145 tiled rectangle"] = 5;
+	weight["1x1 216x208 tiled rectangle"] = 5;
+	weight["1x1 stippled rectangle"] = 5;
+	weight["1x1 opaque stippled rectangle"] = 4;
+	weight["1x1 161x145 opaque stippled rectangle"] = 4;
+	weight["1x1 161x145 stippled rectangle"] = 4;
+	weight["ShmPutImage 10x10 square"] = 0;
+	weight["ShmPutImage 100x100 square"] = 0;
+	weight["ShmPutImage 500x500 square"] = 0;
+	weight["(xor) 100-pixel line"] = 16;
+	weight["(xor) 10-pixel line segment"] = 14;
+	weight["(xor) 10-pixel line"] = 13;
+	weight["(xor) 100-pixel line segment"] = 13;
+	weight["(xor) 500-pixel line segment"] = 13;
+	weight["(xor) 500-pixel line"] = 12;
+	weight["(xor) 10x10 rectangle"] = 12;
+	weight["(xor) 100x100 rectangle"] = 12;
+	weight["(xor) 100-pixel vertical line segment"] = 10;
+	weight["(xor) 100x100 rectangle outline"] = 10;
+	weight["(xor) 100-pixel horizontal line segment"] = 10;
+	weight["(xor) 10-pixel vertical line segment"] = 10;
+	weight["(xor) 100-pixel line segment (2 kids)"] = 10;
+	weight["(xor) 10-pixel horizontal line segment"] = 10;
+	weight["(xor) 100-pixel line segment (1 kid)"] = 9;
+	weight["(xor) Char in 80-char line (6x13)"] = 9;
+	weight["(xor) 500-pixel vertical line segment"] = 9;
+	weight["(xor) Copy 100x100 from pixmap to window"] = 9;
+	weight["(xor) 10x10 rectangle outline"] = 9;
+	weight["(xor) 500-pixel horizontal line segment"] = 9;
+	weight["(xor) 100-pixel line segment (3 kids)"] = 9;
+	weight["(xor) PutImage 100x100 square"] = 9;
+	weight["(xor) 500x500 rectangle outline"] = 9;
+	weight["(xor) Char in 80-char line (TR 10)"] = 9;
+	weight["(xor) 500x500 rectangle"] = 9;
+	weight["(xor) Copy 500x500 from pixmap to window"] = 8;
+	weight["(xor) Char in 20/40/20 line (6x13, TR 10)"] = 8;
+	weight["(xor) 100-pixel dashed line"] = 8;
+	weight["(xor) Copy 100x100 1-bit deep plane"] = 8;
+	weight["(xor) Char in 60-char line (9x15)"] = 8;
+	weight["(xor) Char16 in 40-char line (k14)"] = 7;
+	weight["(xor) Fill 10x10 equivalent triangle"] = 7;
+	weight["(xor) PutImage 500x500 square"] = 7;
+	weight["(xor) Copy 100x100 from window to window"] = 7;
+	weight["(xor) 100-pixel dashed segment"] = 7;
+	weight["(xor) 100x100 wide rectangle outline"] = 6;
+	weight["(xor) Char16 in 7/14/7 line (k14, k24)"] = 6;
+	weight["(xor) Fill 100x100 trapezoid"] = 6;
+	weight["(xor) 100-pixel solid circle"] = 6;
+	weight["(xor) 10-pixel solid circle"] = 6;
+	weight["(xor) 1-pixel line segment"] = 6;
+	weight["(xor) 1-pixel line"] = 6;
+	weight["(xor) 10x1 wide horizontal line segment"] = 6;
+	weight["(xor) 10x1 wide vertical line segment"] = 6;
+	weight["(xor) Copy 100x100 from pixmap to pixmap"] = 6;
+	weight["(xor) 10-pixel dashed line"] = 6;
+	weight["(xor) Char in 30-char line (TR 24)"] = 6;
+	weight["(xor) Fill 100x100 equivalent triangle"] = 6;
+	weight["(xor) Copy 10x10 from pixmap to window"] = 6;
+	weight["(xor) Fill 10x10 trapezoid"] = 6;
+	weight["(xor) Char in 70-char line (8x13)"] = 6;
+	weight["(xor) 100-pixel circle"] = 6;
+	weight["(xor) Copy 100x100 from window to pixmap"] = 6;
+	weight["(xor) 10-pixel dashed segment"] = 5;
+	weight["(xor) 10-pixel circle"] = 5;
+	weight["(xor) 10x10 wide rectangle outline"] = 5;
+	weight["(xor) 100x100 stippled rectangle"] = 5;
+	weight["(xor) 100-pixel filled ellipse"] = 5;
+	weight["(xor) 10x10 4x4 tiled rectangle"] = 5;
+	weight["(xor) PutImage 10x10 square"] = 5;
+	weight["(xor) Copy 500x500 from window to window"] = 5;
+	weight["(xor) 500x500 wide rectangle outline"] = 5;
+	weight["(xor) 10x10 stippled rectangle"] = 5;
+	weight["(xor) 100x10 wide line"] = 5;
+	weight["(xor) 100x10 wide horizontal line segment"] = 5;
+	weight["(xor) 100x10 wide vertical line segment"] = 5;
+	weight["(xor) Scroll 100x100 pixels"] = 5;
+	weight["(xor) Char16 in 23-char line (k24)"] = 5;
+	weight["(xor) Dot"] = 5;
+	weight["(xor) Copy 500x500 1-bit deep plane"] = 5;
+	weight["(xor) 100-pixel ellipse"] = 5;
+	weight["(xor) 100x100 4x4 tiled rectangle"] = 5;
+	weight["(xor) Copy 10x10 1-bit deep plane"] = 5;
+	weight["(xor) 1x1 rectangle"] = 5;
+	weight["(xor) 500-pixel solid circle"] = 4;
+	weight["(xor) 500-pixel filled ellipse"] = 4;
+	weight["(xor) 10-pixel filled ellipse"] = 4;
+	weight["(xor) Fill 100x100 stippled trapezoid"] = 4;
+	weight["(xor) 500x50 wide line"] = 4;
+	weight["(xor) 500-pixel circle"] = 4;
+	weight["(xor) 100-pixel double-dashed line"] = 4;
+	weight["(xor) 500x50 wide horizontal line segment"] = 4;
+	weight["(xor) 500x50 wide vertical line segment"] = 4;
+	weight["(xor) 100-pixel dashed circle"] = 4;
+	weight["(xor) 10x10 opaque stippled rectangle"] = 4;
+	weight["(xor) 10-pixel ellipse"] = 4;
+	weight["(xor) Copy 500x500 from pixmap to pixmap"] = 4;
+	weight["(xor) 100x100 161x145 stippled rectangle"] = 4;
+	weight["(xor) 10x10 161x145 tiled rectangle"] = 4;
+	weight["(xor) Copy 10x10 from window to window"] = 4;
+	weight["(xor) Copy 10x10 from pixmap to pixmap"] = 4;
+	weight["(xor) 10x10 161x145 stippled rectangle"] = 4;
+	weight["(xor) 100-pixel wide circle"] = 4;
+	weight["(xor) 500x500 stippled rectangle"] = 4;
+	weight["(xor) 500-pixel ellipse"] = 4;
+	weight["(xor) 10x10 216x208 tiled rectangle"] = 4;
+	weight["(xor) Fill 100x100 equivalent complex polygons"] = 4;
+	weight["(xor) 100-pixel double-dashed segment"] = 3;
+	weight["(xor) 10x10 161x145 opaque stippled rectangle"] = 3;
+	weight["(xor) Fill 10x10 opaque stippled trapezoid"] = 3;
+	weight["(xor) 100-pixel partial circle"] = 3;
+	weight["(xor) Fill 10x10 161x145 stippled trapezoid"] = 3;
+	weight["(xor) Fill 10x10 161x145 opaque stippled trapezoid"] = 3;
+	weight["(xor) Scroll 500x500 pixels"] = 3;
+	weight["(xor) 100x100 opaque stippled rectangle"] = 3;
+	weight["(xor) Fill 10x10 stippled trapezoid"] = 3;
+	weight["(xor) 100x10 wide dashed line"] = 3;
+	weight["(xor) Copy 10x10 from window to pixmap"] = 3;
+	weight["(xor) Copy 500x500 from window to pixmap"] = 3;
+	weight["(xor) 500x500 opaque stippled rectangle"] = 3;
+	weight["(xor) Fill 10x10 tiled trapezoid"] = 3;
+	weight["(xor) 100x100 161x145 tiled rectangle"] = 3;
+	weight["(xor) 100-pixel partial ellipse"] = 3;
+	weight["(xor) 100-pixel fill slice partial circle"] = 3;
+	weight["(xor) Fill 1x1 equivalent triangle"] = 3;
+	weight["(xor) 100-pixel double-dashed circle"] = 3;
+	weight["(xor) 500x500 4x4 tiled rectangle"] = 3;
+	weight["(xor) 100-pixel wide ellipse"] = 3;
+	weight["(xor) 100-pixel fill chord partial circle"] = 3;
+	weight["(xor) 100x100 216x208 tiled rectangle"] = 3;
+	weight["(xor) Fill 10x10 161x145 tiled trapezoid"] = 3;
+	weight["(xor) Fill 100x100 216x208 tiled trapezoid"] = 3;
+	weight["(xor) 500x500 161x145 stippled rectangle"] = 3;
+	weight["(xor) 500x500 161x145 tiled rectangle"] = 3;
+	weight["(xor) 100x100 161x145 opaque stippled rectangle"] = 3;
+	weight["(xor) 500x500 161x145 opaque stippled rectangle"] = 3;
+	weight["(xor) 10x1 wide line"] = 3;
+	weight["(xor) 500x500 216x208 tiled rectangle"] = 3;
+	weight["(xor) 100-pixel dashed ellipse"] = 3;
+	weight["(xor) Fill 100x100 opaque stippled trapezoid"] = 3;
+	weight["(xor) 10-pixel partial circle"] = 3;
+	weight["(xor) 100x10 wide double-dashed line"] = 3;
+	weight["(xor) Fill 100x100 161x145 stippled trapezoid"] = 3;
+	weight["(xor) Fill 100x100 161x145 opaque stippled trapezoid"] = 3;
+	weight["(xor) 100-pixel fill slice partial ellipse"] = 3;
+	weight["(xor) 1-pixel circle"] = 3;
+	weight["(xor) Fill 10x10 equivalent complex polygon"] = 3;
+	weight["(xor) 100-pixel wide dashed circle"] = 2;
+	weight["(xor) 100-pixel wide double-dashed circle"] = 2;
+	weight["(xor) Scroll 10x10 pixels"] = 2;
+	weight["(xor) 10-pixel wide circle"] = 2;
+	weight["(xor) 100-pixel fill chord partial ellipse"] = 2;
+	weight["(xor) Fill 100x100 tiled trapezoid"] = 2;
+	weight["(xor) 100-pixel double-dashed ellipse"] = 2;
+	weight["(xor) 100-pixel wide dashed ellipse"] = 2;
+	weight["(xor) 100-pixel wide double-dashed ellipse"] = 2;
+	weight["(xor) 10-pixel partial ellipse"] = 2;
+	weight["(xor) 100-pixel wide partial circle"] = 2;
+	weight["(xor) 100-pixel wide partial ellipse"] = 2;
+	weight["(xor) 10-pixel fill slice partial circle"] = 2;
+	weight["(xor) 10-pixel wide ellipse"] = 2;
+	weight["(xor) Fill 100x100 161x145 tiled trapezoid"] = 2;
+	weight["(xor) Fill 10x10 216x208 tiled trapezoid"] = 2;
+	weight["(xor) 10-pixel fill chord partial circle"] = 2;
+	weight["(xor) 500-pixel wide circle"] = 2;
+	weight["(xor) 500-pixel wide ellipse"] = 2;
+	weight["(xor) 1-pixel solid circle"] = 2;
+	weight["(xor) 10-pixel fill chord partial ellipse"] = 2;
+	weight["(xor) 10-pixel fill slice partial ellipse"] = 2;
+	weight["(xor) 10-pixel wide partial circle"] = 1;
+	weight["(xor) 10-pixel wide partial ellipse"] = 1;
+	weight["(xor) 1x1 stippled rectangle"] = 1;
+	weight["(xor) 1x1 161x145 stippled rectangle"] = 1;
+	weight["(xor) 1x1 opaque stippled rectangle"] = 1;
+	weight["(xor) 1x1 161x145 opaque stippled rectangle"] = 1;
+	weight["(xor) 1x1 4x4 tiled rectangle"] = 1;
+	weight["(xor) 1x1 161x145 tiled rectangle"] = 1;
+	weight["(xor) 1x1 216x208 tiled rectangle"] = 1;
+	weight["(xor) ShmPutImage 10x10 square"] = 0;
+	weight["(xor) ShmPutImage 100x100 square"] = 0;
+	weight["(xor) ShmPutImage 500x500 square"] = 0;
+	sumofweights = 0;
+    }
+    $0 ~ /server/ {
+	printf("name:%s\n",substr($0,1,index($0,"server")-2));
+    }
+    {
+	split($0,parts,":");			# get rate and name
+	start = index(parts[1],"(") + 1;	# find left parentheses
+	end = index(parts[1],"/");		# find terminating '/'
+	rate = substr(parts[1],start,end-start);# get ops/sec
+
+	name = parts[2];
+	while (substr(name,1,1) == " ") {	# remove leading spaces
+	    name = substr(name,2,length(name));
+	}
+
+	thisweight = weight[name];
+	weight[name] = 0;			# clear to avoid double counting
+	sumofweights += thisweight;
+	printf("%d:",thisweight);		# output in new format
+	printf("%.1f\n",rate);
+    }
+    END{
+	printf("sumof:%.1f\n",sumofweights);
+    }
+EOS
+
+awk -f awkfile.$$ temp.$$ > rates.$$
+rm -f awkfile.$$				# cleanup
+
+# calculate the weighted average 
+
+sumofweights=`grep sumof rates.$$ | awk -F: ' { print($2) }' - `
+if [ "$sumofweights" != "4566.0" ]
+then
+    echo "ERROR: sum of weights =$sumofweights, not equal to 4566.0;"
+    echo "ABORTING!"
+    rm -f rates.$$ temp.$$
+    exit 1
+fi
+
+awk -F: '
+    BEGIN {
+	logsum = 0;
+	name = "tested"
+    }
+    $1 == "name" { name = $2;next }
+    {
+	weight = $1;
+	rate = $2;
+	if (rate > 0.0) {
+	    # generate weighted log sum
+	    logsum += ( log( rate ) * weight );
+	}
+    }
+    END {
+	SparcStation1 = 2118.51;
+	WeightedAverage = exp(logsum/4566.0);
+	printf("Weighted x11perf of %s server =%6.0f\n", name,WeightedAverage);
+	printf("Weighted x11perf of SparcStation 1 server =%5.0f\n", SparcStation1);
+	printf("Xmark =%8.4f\n", WeightedAverage/SparcStation1);
+    }' rates.$$	
+
+rm -f temp.$$ rates.$$ awkfile.$$			# cleanup
+
+exit 0
diff --git a/app/x11perf/Xmark.man b/app/x11perf/Xmark.man
new file mode 100644
index 000000000..6e110211b
--- /dev/null
+++ b/app/x11perf/Xmark.man
@@ -0,0 +1,69 @@
+.\" This manpage was written by Richard Braakman and is licensed under the
+.\" XFree86 license.
+.\" $XFree86: xc/programs/x11perf/Xmark.man,v 1.2 2001/01/24 00:06:42 dawes Exp $
+.TH Xmark 1 __xorgversion__
+.SH NAME
+Xmark \- summarize x11perf results
+.SH SYNTAX
+.B Xmark
+datafile
+.SH DESCRIPTION
+.B Xmark
+is a shell script that reads the indicated datafile and compiles a
+benchmark which it writes to standard output.  It writes three
+numbers:
+.PP
+.RS
+A weighted performance number for the
+.I x11perf
+results.
+.PP
+A weighted performance number for a standard SparcStation 1, with
+SunOS 4.1.2, X11R5 Xsun, and a CG3 dumb Color Frame Buffer.
+.\" I assume the latter is a graphics card.
+.PP
+The Xmark, which is the ratio of the two numbers above.
+.RE
+.PP
+The datafile must be an ordinary file, produced by x11perf in the
+following way:
+.PP
+.BI "x11perf -display " display " -v1.3 -rop GXcopy GXxor -all > " datafile
+.PP
+It is possible to run the GXcopy and GXxor tests separately, as long as they
+are concatenated to the same output file:
+.PP
+.BI "x11perf -display " display " -v1.3 -rop GXcopy -all > " datafile 
+.br
+.BI "x11perf -display " display " -v1.3 -rop GXxor -all >> " datafile 
+.PP
+or
+.PP
+.BI "x11perf -display " display " -v1.3 -rop GXxor -all > " datafile 
+.br
+.BI "x11perf -display " display " -v1.3 -rop GXcopy -all >> " datafile 
+.PP
+.SH FILES
+.TP
+.B temp.$$
+Temporary file created in the current directory, deleted after use.
+.SH DIAGNOSTICS
+.TP
+.B Usage: Xmark datafile
+.I Xmark
+was invoked without arguments or with more than one argument, or 
+with options.  Xmark takes no options.
+.TP
+.B "Error: data file does not exist or is not ordinary."
+.I Xmark
+cannot find the datafile named on its command line, or the datafile
+is a special file such as a directory.
+.TP
+.BR "WARNING: datafile contains " nnn ", not 441 or 447 'trep' results;"
+The file named on the command line does not seem to be a file generated
+by x11perf in the expected way.
+.TP
+.BR "Diagnostic: ERROR: sum of weights =" nnn ", not equal to 4566.0;"
+There is an internal error in Xmark.
+.SH "SEE ALSO"
+X(__miscmansuffix__), x11perf(1), x11perfcomp(1)
diff --git a/app/x11perf/aclocal.m4 b/app/x11perf/aclocal.m4
new file mode 100644
index 000000000..7e7dc9fd2
--- /dev/null
+++ b/app/x11perf/aclocal.m4
@@ -0,0 +1,1349 @@
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Do all the work for Automake.                            -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 10
+
+AC_PREREQ([2.54])
+
+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+	 [AM_AUTOMAKE_VERSION([1.7.9])])
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+
+# Copyright 2001, 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+#  -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# AM_AUX_DIR_EXPAND
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5						-*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking.   -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Check to see how 'make' treats includes.	-*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# AM_CONDITIONAL                                              -*- Autoconf -*-
+
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 5
+
+AC_PREREQ(2.52)
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright 1996, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ([2.52])
+
+# serial 6
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+if test $pkg_failed = yes; then
+	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met.
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details.])],
+		[$4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+dnl $Id: aclocal.m4,v 1.1 2006/11/25 20:23:33 matthieu Exp $
+dnl
+dnl Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+dnl 
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XORG_PROG_RAWCPP()
+# ------------------
+# Find cpp program and necessary flags for use in pre-processing text files
+# such as man pages and config files
+AC_DEFUN([XORG_PROG_RAWCPP],[
+AC_REQUIRE([AC_PROG_CPP])
+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], 
+   [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
+
+# Check for flag to avoid builtin definitions - assumes unix is predefined,
+# which is not the best choice for supporting other OS'es, but covers most
+# of the ones we need for now.
+AC_MSG_CHECKING([if $RAWCPP requires -undef])
+AC_LANG_CONFTEST([Does cpp redefine unix ?])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+	AC_MSG_RESULT([no])
+else
+	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+		RAWCPPFLAGS=-undef
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef.  I don't know what to do.])
+	fi
+fi
+rm -f conftest.$ac_ext
+
+AC_MSG_CHECKING([if $RAWCPP requires -traditional])
+AC_LANG_CONFTEST([Does cpp preserve   "whitespace"?])
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+	AC_MSG_RESULT([no])
+else
+	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional.  I don't know what to do.])
+	fi
+fi
+rm -f conftest.$ac_ext
+AC_SUBST(RAWCPPFLAGS)
+]) # XORG_PROG_RAWCPP
+
+# XORG_MANPAGE_SECTIONS()
+# -----------------------
+# Determine which sections man pages go in for the different man page types
+# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
+# Not sure if there's any better way than just hardcoding by OS name.
+# Override default settings by setting environment variables
+
+AC_DEFUN([XORG_MANPAGE_SECTIONS],[
+AC_REQUIRE([AC_CANONICAL_HOST])
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)	APP_MAN_SUFFIX=1x ;;
+	*)	APP_MAN_SUFFIX=1  ;;
+    esac
+fi
+if test x$APP_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
+	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$LIB_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)	LIB_MAN_SUFFIX=3x ;;
+	*)	LIB_MAN_SUFFIX=3  ;;
+    esac
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
+	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)		FILE_MAN_SUFFIX=5x ;;
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
+	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+    esac
+fi
+
+# In Imake's linux.cf, the misc man suffix & dir was only changed for 
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+#	linux*)		MISC_MAN_SUFFIX=7x ;;
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
+fi
+if test x$MISC_MAN_DIR = x    ; then
+    case $host_os in
+#	linux*)	MISC_MAN_DIR='$(mandir)/man7' ;;
+	*)	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+    esac
+fi
+
+# In Imake's linux.cf, the driver man suffix & dir was only changed for 
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+#	linux*)		DRIVER_MAN_SUFFIX=4x ;;
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    case $host_os in
+#	linux*)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
+	*)	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+AC_SUBST([APP_MAN_SUFFIX])
+AC_SUBST([LIB_MAN_SUFFIX])
+AC_SUBST([FILE_MAN_SUFFIX])
+AC_SUBST([MISC_MAN_SUFFIX])
+AC_SUBST([DRIVER_MAN_SUFFIX])
+AC_SUBST([ADMIN_MAN_SUFFIX])
+AC_SUBST([APP_MAN_DIR])
+AC_SUBST([LIB_MAN_DIR])
+AC_SUBST([FILE_MAN_DIR])
+AC_SUBST([MISC_MAN_DIR])
+AC_SUBST([DRIVER_MAN_DIR])
+AC_SUBST([ADMIN_MAN_DIR])
+]) # XORG_MANPAGE_SECTIONS
+
+# XORG_CHECK_LINUXDOC
+# -------------------
+# Defines the variable MAKE_TEXT if the necessary tools and
+# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
+# Whether or not the necessary tools and files are found can be checked
+# with the AM_CONDITIONAL "BUILD_LINUXDOC"
+AC_DEFUN([XORG_CHECK_LINUXDOC],[
+AC_CHECK_FILE(
+	[$prefix/share/X11/sgml/defs.ent], 
+	[DEFS_ENT_PATH=$prefix/share/X11/sgml],
+	[DEFS_ENT_PATH=]
+)
+
+AC_PATH_PROG(LINUXDOC, linuxdoc)
+AC_PATH_PROG(PS2PDF, ps2pdf)
+
+AC_MSG_CHECKING([Whether to build documentation])
+
+if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+   BUILDDOC=yes
+else
+   BUILDDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
+
+AC_MSG_RESULT([$BUILDDOC])
+
+AC_MSG_CHECKING([Whether to build pdf documentation])
+
+if test x$PS2PDF != x ; then
+   BUILDPDFDOC=yes
+else
+   BUILDPDFDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_PDF="$PS2PDF"
+MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC  -B html --split=0"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_LINUXDOC
+
+# XORG_CHECK_MALLOC_ZERO
+# ----------------------
+# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
+# malloc(0) returns NULL.  Packages should add one of these cflags to
+# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
+AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
+AC_ARG_ENABLE(malloc0returnsnull,
+	AC_HELP_STRING([--enable-malloc0returnsnull],
+		       [malloc(0) returns NULL (default: auto)]),
+	[MALLOC_ZERO_RETURNS_NULL=$enableval],
+	[MALLOC_ZERO_RETURNS_NULL=auto])
+
+AC_MSG_CHECKING([whether malloc(0) returns NULL])
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
+	AC_RUN_IFELSE([
+char *malloc();
+char *realloc();
+char *calloc();
+main() {
+    char *m0, *r0, *c0, *p;
+    m0 = malloc(0);
+    p = malloc(10);
+    r0 = realloc(p,0);
+    c0 = calloc(0);
+    exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
+}],
+		[MALLOC_ZERO_RETURNS_NULL=yes],
+		[MALLOC_ZERO_RETURNS_NULL=no])
+fi
+AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
+
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
+	MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
+	XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
+	XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
+else
+	MALLOC_ZERO_CFLAGS=""
+	XMALLOC_ZERO_CFLAGS=""
+	XTMALLOC_ZERO_CFLAGS=""
+fi
+
+AC_SUBST([MALLOC_ZERO_CFLAGS])
+AC_SUBST([XMALLOC_ZERO_CFLAGS])
+AC_SUBST([XTMALLOC_ZERO_CFLAGS])
+]) # XORG_CHECK_MALLOC_ZERO
+
+dnl Copyright 2005 Red Hat, Inc
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
+
+# XORG_RELEASE_VERSION
+# --------------------
+# Adds --with/without-release-string and changes the PACKAGE and
+# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION".  If
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+ 
+AC_DEFUN([XORG_RELEASE_VERSION],[
+	AC_ARG_WITH(release-version,
+			AC_HELP_STRING([--with-release-version=STRING],
+				[Use release version string in package name]),
+			[RELEASE_VERSION="$withval"],
+			[RELEASE_VERSION=""])
+	if test "x$RELEASE_VERSION" != "x"; then
+		PACKAGE="$PACKAGE-$RELEASE_VERSION"
+		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+		AC_MSG_NOTICE([Building with package name set to $PACKAGE])
+	fi
+])
+
diff --git a/app/x11perf/bitmaps.c b/app/x11perf/bitmaps.c
new file mode 100644
index 000000000..4dc60bfa6
--- /dev/null
+++ b/app/x11perf/bitmaps.c
@@ -0,0 +1,878 @@
+/* $Xorg: bitmaps.c,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+
+#include "x11perf.h"
+#include "bitmaps.h"
+
+static unsigned char bitmap8x8[] = {
+    0xCC, 0x66, 0x33, 0x99, 0xCC, 0x66, 0x33, 0x99
+/* Alternate maps for testing out your stipple code.  Only the above should
+   be used for timing, though.
+    0x00, 0xfe, 0x92, 0x92, 0xfe, 0x92, 0x92, 0xfe
+    0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA
+*/
+};
+
+static unsigned char bitmap4x4[] = {
+   0x03, 0x06, 0x0c, 0x09
+};
+
+#define oddbit_width 17
+#define oddbit_height 15
+static unsigned char oddbit_bits[] = {
+   0x01, 0x00, 0x01, 0xc2, 0x87, 0x00, 0x34, 0x58, 0x00, 0x08, 0x20, 0x00,
+   0x38, 0x38, 0x00, 0x44, 0x44, 0x00, 0x84, 0x42, 0x00, 0x04, 0x41, 0x00,
+   0x84, 0x42, 0x00, 0x44, 0x44, 0x00, 0x28, 0x28, 0x00, 0x18, 0x30, 0x00,
+   0x34, 0x58, 0x00, 0xc2, 0x87, 0x00, 0x01, 0x00, 0x01};
+
+/* A big bitmap */
+#define mensetmanus_width 161
+#define mensetmanus_height 145
+
+static unsigned char mensetmanus_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x3f, 0xdb, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x07,
+ 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xf7, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x61, 0x00, 0x00, 0xc6,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3, 0xff,
+ 0x1f, 0x00, 0x00, 0x00, 0xc0, 0xe1, 0xff, 0xff, 0x87, 0x01, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3, 0xf6, 0x1f, 0x00, 0x00,
+ 0x00, 0xc0, 0xc0, 0xff, 0xff, 0x87, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x80, 0x9f, 0x65, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0x00,
+ 0x07, 0x80, 0x87, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0x9f, 0x6d, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xff, 0xff, 0xc7,
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x89, 0x6d,
+ 0x1b, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x81, 0x6d, 0x1b, 0x00, 0x00,
+ 0x00, 0xc0, 0xe1, 0x5b, 0xdb, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xc0, 0x81, 0x6d, 0x1b, 0x00, 0x00, 0x00, 0x80, 0x83,
+ 0x5b, 0xdb, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xc0, 0x81, 0x6d, 0x1b, 0x00, 0x00, 0x00, 0x00, 0xcf, 0x5b, 0x1b, 0x0c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x6d,
+ 0x1b, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x5b, 0x1b, 0x0c, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x80, 0x6d, 0x1b, 0x00, 0x00,
+ 0x00, 0x00, 0xf8, 0x5b, 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xe0, 0x83, 0x6d, 0x19, 0x00, 0x00, 0x00, 0x00, 0x80,
+ 0x5b, 0x0b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xe0, 0x83, 0x6d, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5b, 0x0f, 0x0e,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x6d,
+ 0x1b, 0x00, 0x00, 0x00, 0x00, 0x80, 0x4b, 0x0f, 0x07, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x79, 0x1b, 0x00, 0x00,
+ 0x00, 0x00, 0x80, 0x6b, 0xbf, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x80,
+ 0x6d, 0xb7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x03, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xed, 0xf7, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0xfe,
+ 0x7f, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xed, 0xd7, 0x07, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0xf8, 0xff, 0x07, 0x00,
+ 0x00, 0x00, 0xe0, 0xfe, 0xd7, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x80, 0xff, 0x7f, 0xe0, 0xff, 0x3f, 0x00, 0x00, 0x00, 0xf0,
+ 0xff, 0xd6, 0xfe, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+ 0xbf, 0x73, 0x80, 0x3b, 0x7c, 0x00, 0x00, 0x00, 0xf8, 0xe7, 0xd6, 0xef,
+ 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xb9, 0x73, 0xc0,
+ 0x3b, 0xf0, 0x01, 0x00, 0x00, 0xff, 0xc3, 0xbf, 0xe7, 0x3f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xb8, 0x7f, 0xe0, 0x3b, 0xc0, 0x03,
+ 0x00, 0xc0, 0xbf, 0xc7, 0xbf, 0xe7, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0xb8, 0xff, 0xf8, 0x3b, 0x80, 0x07, 0x00, 0xe0, 0x61,
+ 0x87, 0xfd, 0xe7, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e,
+ 0xb8, 0xf3, 0xff, 0x3b, 0x00, 0x0f, 0x00, 0x78, 0x60, 0x8e, 0xf1, 0x67,
+ 0xc7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xb8, 0xc3, 0x8f,
+ 0x7b, 0x00, 0x0e, 0x00, 0x38, 0xe0, 0x8c, 0x03, 0x66, 0x87, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0xb8, 0x03, 0x83, 0x7b, 0x00, 0x1e,
+ 0x00, 0x1c, 0xe0, 0x1d, 0x03, 0x76, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xc0, 0x07, 0xb8, 0xe3, 0x8f, 0xbb, 0x01, 0x39, 0x00, 0x1e, 0xe0,
+ 0x3b, 0x03, 0xf6, 0x87, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f,
+ 0xb8, 0xe3, 0x8f, 0x3b, 0xc6, 0x38, 0x00, 0x17, 0xe0, 0x73, 0x07, 0xfe,
+ 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0b, 0xb8, 0xe7, 0x8e,
+ 0x3b, 0x38, 0x78, 0x00, 0x13, 0xe0, 0x77, 0x06, 0xfe, 0xff, 0xff, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0xe0, 0x12, 0x3c, 0xff, 0xce, 0x3b, 0x00, 0x78,
+ 0x80, 0x13, 0x60, 0xef, 0x0e, 0xfe, 0x00, 0x00, 0x60, 0x08, 0x00, 0x00,
+ 0x00, 0x70, 0x22, 0x3e, 0xfc, 0xfe, 0x39, 0x00, 0xe8, 0x80, 0x61, 0x60,
+ 0xce, 0x0f, 0xfe, 0x00, 0x00, 0x60, 0xf8, 0x00, 0x00, 0x00, 0x70, 0xc2,
+ 0x39, 0xf8, 0x7e, 0x38, 0x00, 0xc8, 0xc0, 0x81, 0x71, 0xde, 0x0f, 0xfe,
+ 0x00, 0x00, 0x60, 0x88, 0x00, 0x00, 0x00, 0x70, 0x04, 0x38, 0xe0, 0x0e,
+ 0x38, 0x00, 0xc4, 0xc0, 0x01, 0x7e, 0xbc, 0x1f, 0xfe, 0x00, 0x00, 0x60,
+ 0x88, 0x00, 0x00, 0x00, 0x78, 0x04, 0x38, 0xe0, 0x0e, 0x38, 0x00, 0xc4,
+ 0xc1, 0x01, 0x60, 0x3c, 0x1f, 0xfe, 0x00, 0x00, 0x60, 0x84, 0x0f, 0x00,
+ 0x00, 0x78, 0x08, 0x38, 0xe0, 0x0f, 0x38, 0x00, 0x82, 0xe1, 0x01, 0x60,
+ 0x74, 0x3e, 0xfe, 0x00, 0x00, 0x60, 0x44, 0x08, 0x00, 0x00, 0xb8, 0x10,
+ 0x38, 0xe0, 0x0f, 0x38, 0x00, 0x81, 0xe1, 0x00, 0x60, 0xe4, 0x3e, 0xfe,
+ 0x00, 0x00, 0x60, 0x44, 0x08, 0x00, 0x00, 0x98, 0x20, 0x38, 0xf8, 0x3f,
+ 0x38, 0x80, 0x80, 0xe1, 0x01, 0x60, 0xc4, 0x3c, 0xfe, 0x00, 0x00, 0x60,
+ 0x24, 0x0c, 0x00, 0x00, 0x1c, 0xc1, 0x39, 0x3c, 0x78, 0x38, 0x40, 0x80,
+ 0x61, 0x01, 0x60, 0xc4, 0x79, 0xfe, 0x00, 0x00, 0x60, 0x22, 0x32, 0x00,
+ 0x00, 0x1c, 0x01, 0x3e, 0x1c, 0xf0, 0x38, 0xf0, 0x9f, 0x61, 0x01, 0x60,
+ 0x84, 0x7b, 0xee, 0x00, 0x00, 0x60, 0x12, 0x21, 0x00, 0x00, 0x1c, 0x02,
+ 0x38, 0x0e, 0xe7, 0xf8, 0x3f, 0xe0, 0x61, 0x00, 0x60, 0x04, 0xf7, 0xce,
+ 0x00, 0x00, 0x60, 0x92, 0x10, 0x00, 0x00, 0x1c, 0x04, 0x38, 0x06, 0xff,
+ 0x38, 0x40, 0x80, 0x61, 0x02, 0x60, 0x04, 0xe7, 0xcf, 0x00, 0x00, 0x60,
+ 0x8a, 0x18, 0x00, 0x00, 0x1c, 0x18, 0x38, 0x07, 0xf0, 0x38, 0x00, 0x81,
+ 0x61, 0x02, 0x60, 0x04, 0xee, 0xcf, 0xff, 0x03, 0x60, 0x49, 0xe4, 0x00,
+ 0x00, 0x1c, 0x70, 0x38, 0x07, 0xe7, 0x38, 0x00, 0x82, 0x61, 0x04, 0x60,
+ 0x04, 0xdc, 0xcf, 0x01, 0x04, 0x60, 0x25, 0x42, 0x00, 0x00, 0x1c, 0xfe,
+ 0x3f, 0x03, 0xff, 0x38, 0x00, 0x84, 0x61, 0x08, 0x60, 0x04, 0xfc, 0xcf,
+ 0xf8, 0xff, 0x60, 0x95, 0x31, 0x00, 0x00, 0xfc, 0x01, 0xff, 0x03, 0xf0,
+ 0xf8, 0x1f, 0x88, 0x61, 0x10, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00, 0xe1,
+ 0x53, 0x0c, 0x00, 0x00, 0x38, 0xf0, 0xff, 0x03, 0xef, 0xf8, 0x7f, 0x90,
+ 0x61, 0x40, 0xe0, 0xff, 0xff, 0xff, 0x00, 0xff, 0xe3, 0x2b, 0xfe, 0x00,
+ 0x00, 0x18, 0xf8, 0xff, 0x03, 0xff, 0x7c, 0xf0, 0x90, 0x61, 0x00, 0x3e,
+ 0x36, 0xe3, 0xe1, 0x00, 0x00, 0xe3, 0x9f, 0x60, 0x00, 0x00, 0x38, 0x3c,
+ 0x00, 0x03, 0xf0, 0x1f, 0xe0, 0xa0, 0xe1, 0x00, 0x30, 0x22, 0xe2, 0xc0,
+ 0x00, 0xff, 0xe3, 0x7f, 0x18, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x07, 0xe7,
+ 0x07, 0xc0, 0xe1, 0xc1, 0x00, 0x18, 0x22, 0xe2, 0xc0, 0x00, 0x00, 0xe1,
+ 0x1f, 0x07, 0x00, 0x00, 0x38, 0x06, 0x00, 0x07, 0xef, 0x01, 0xc0, 0xc1,
+ 0xc1, 0x01, 0x16, 0x24, 0xe2, 0xc0, 0x01, 0xff, 0xe1, 0xff, 0x00, 0x00,
+ 0x00, 0x70, 0x07, 0x00, 0x0e, 0xf8, 0x00, 0x80, 0xc3, 0xc0, 0xf1, 0x11,
+ 0x24, 0xe4, 0xc0, 0x03, 0xe0, 0xe1, 0x7f, 0x00, 0x00, 0x00, 0x70, 0x07,
+ 0x00, 0x1e, 0x3c, 0x00, 0x80, 0xe3, 0x80, 0x0f, 0x10, 0x24, 0xe4, 0xc0,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0xe0, 0x03, 0x00, 0xfc, 0x0f,
+ 0x00, 0x00, 0x63, 0x80, 0x01, 0x08, 0x44, 0xe4, 0xc0, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0x01, 0x00, 0xe0, 0x03, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x73,
+ 0x80, 0x03, 0x08, 0x44, 0xe4, 0xc0, 0xfc, 0x00, 0x07, 0x0e, 0x00, 0x00,
+ 0x00, 0xc0, 0x03, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x33, 0x00, 0x03, 0x08,
+ 0x44, 0xe4, 0xe0, 0xcc, 0x00, 0x07, 0x0e, 0x00, 0x00, 0x00, 0xc0, 0x03,
+ 0x00, 0x78, 0x00, 0x00, 0x80, 0x3f, 0x00, 0x07, 0x04, 0x44, 0xe8, 0x70,
+ 0xcc, 0x01, 0x87, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x3e, 0x00,
+ 0x00, 0x80, 0x1f, 0x00, 0x0e, 0x04, 0x44, 0xe8, 0x38, 0xcc, 0x81, 0xe7,
+ 0x03, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x00, 0x80, 0x0f,
+ 0x00, 0x1c, 0x02, 0x44, 0xf8, 0x1e, 0xcc, 0xe1, 0xff, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x0f, 0xc0, 0x23, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x38, 0x01,
+ 0x42, 0xfc, 0x0f, 0xcc, 0xf1, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e,
+ 0xf0, 0x39, 0x00, 0x00, 0xe0, 0x03, 0x00, 0xf0, 0x00, 0xc2, 0xff, 0x07,
+ 0xcc, 0x7f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x7c, 0x0e, 0x00,
+ 0x00, 0xf0, 0x01, 0x00, 0xe0, 0x03, 0xe2, 0xe7, 0x07, 0xcc, 0x1f, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xbf, 0x23, 0xe0, 0xff, 0xff, 0x00,
+ 0x00, 0xc0, 0x1f, 0xff, 0x64, 0x06, 0xcc, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xf0, 0xff, 0x3c, 0xf0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xff,
+ 0x7f, 0x64, 0x06, 0xcc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+ 0xf8, 0x1f, 0x78, 0x7c, 0x7f, 0x00, 0x00, 0x00, 0xfc, 0x20, 0x64, 0x06,
+ 0xcc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf8, 0x33, 0x1c,
+ 0x38, 0x66, 0x00, 0x00, 0x00, 0x0c, 0x20, 0x6c, 0x06, 0xcc, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x3e, 0x0e, 0x38, 0x76, 0x00,
+ 0x00, 0x00, 0x0c, 0x20, 0x68, 0x06, 0xcc, 0x03, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x38, 0xf8, 0x87, 0x0f, 0x38, 0x76, 0x00, 0x00, 0x00, 0x0c,
+ 0x20, 0x68, 0x06, 0xcc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+ 0x78, 0xf8, 0x0f, 0x38, 0x76, 0x00, 0x00, 0x00, 0x0c, 0x10, 0x68, 0x06,
+ 0xcc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf8, 0xff, 0x0f,
+ 0x38, 0x76, 0x00, 0x00, 0x00, 0x0c, 0x10, 0x68, 0x06, 0xcc, 0x07, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xf8, 0xff, 0x0e, 0x38, 0x76, 0x00,
+ 0x00, 0x00, 0x0c, 0x10, 0x68, 0x06, 0xcc, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x1c, 0xf8, 0xe1, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x0c,
+ 0x08, 0x68, 0x06, 0xcc, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+ 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x68, 0x06,
+ 0xcc, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x0e,
+ 0x38, 0x3e, 0x00, 0x00, 0x00, 0x0c, 0x04, 0x68, 0x06, 0xcc, 0x0e, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00,
+ 0x00, 0x00, 0x1c, 0x04, 0x68, 0x06, 0xcc, 0x0e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x06, 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x1c,
+ 0x02, 0x68, 0x06, 0xcc, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+ 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x1c, 0x02, 0x68, 0x06,
+ 0xcc, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x38, 0xe0, 0x0e,
+ 0x38, 0x3e, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x68, 0x06, 0xcc, 0x1c, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00,
+ 0x00, 0x00, 0x18, 0x01, 0x68, 0x06, 0xcc, 0x1c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x03, 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x98,
+ 0x00, 0x68, 0x06, 0xcc, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03,
+ 0x38, 0xe0, 0x0e, 0x38, 0x3e, 0x00, 0x00, 0x00, 0x98, 0x00, 0x68, 0x06,
+ 0xcc, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x38, 0xe0, 0x0e,
+ 0x38, 0x1e, 0x00, 0x00, 0x00, 0x58, 0x00, 0x6c, 0x0e, 0xcc, 0x18, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x30, 0xe0, 0x0e, 0x38, 0x1e, 0x00,
+ 0x00, 0x00, 0x38, 0x00, 0x64, 0x0e, 0xcc, 0x18, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xc0, 0x01, 0x70, 0xe0, 0x0e, 0x1c, 0x1e, 0x00, 0x00, 0x00, 0x18,
+ 0x00, 0x64, 0x1e, 0xcc, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01,
+ 0xe0, 0xe1, 0x0e, 0x0f, 0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x64, 0x3e,
+ 0xcc, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xc0, 0xef, 0xce,
+ 0x07, 0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x64, 0x3e, 0xcc, 0x30, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0xff, 0xfe, 0x03, 0x1e, 0x00,
+ 0x00, 0x00, 0x18, 0x00, 0x64, 0x7e, 0xcc, 0x30, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0x00, 0xfc, 0xfe, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x18,
+ 0x00, 0x64, 0x66, 0xcc, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x00, 0xe0, 0x1e, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x66, 0xe6,
+ 0xcc, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0xe0, 0x0e,
+ 0x00, 0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x62, 0xc6, 0xcd, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0xfe, 0xff, 0x0f, 0x1e, 0x00,
+ 0x00, 0x00, 0x18, 0x00, 0x62, 0xc6, 0xcd, 0x70, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x70, 0x00, 0xc0, 0xff, 0xff, 0x0f, 0x0e, 0x00, 0x00, 0x00, 0x38,
+ 0x00, 0x62, 0x86, 0xcf, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00,
+ 0xf0, 0xff, 0xff, 0x0f, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x61, 0x86,
+ 0xcf, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0xfc, 0x00, 0x00,
+ 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x61, 0x8e, 0xcf, 0xe0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x78, 0x00, 0x00, 0x0e, 0x0e, 0x00,
+ 0x00, 0x00, 0xf8, 0xff, 0x7f, 0xfe, 0xdf, 0xff, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x00, 0xf0, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0xf0,
+ 0xff, 0x3f, 0xff, 0xdf, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00,
+ 0xe0, 0x01, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x8f, 0x07,
+ 0x9e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0xe0, 0x07, 0x00,
+ 0x0e, 0x0f, 0x00, 0x00, 0x00, 0x30, 0x00, 0xc0, 0xff, 0x3f, 0xc0, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00,
+ 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x1c, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0xf0,
+ 0xff, 0xff, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff,
+ 0x3f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0x00,
+ 0x38, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x7f, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x38, 0x00, 0x38, 0xe0, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x06, 0x18, 0x00, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x06, 0x18, 0x00, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0xdc, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1c, 0x00,
+ 0x38, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x9c, 0x03, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1c, 0x00, 0x18, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x07, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x07, 0x0c, 0x00, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0x1c, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x07, 0x0c, 0x00, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x1c, 0xfc, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0c, 0x00,
+ 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x1c, 0x00,
+ 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00, 0x18, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x1c, 0x00, 0x80, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0x1c, 0x1c, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
+ 0x07, 0x0e, 0x00, 0x18, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x1c, 0x1c, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00,
+ 0x18, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x1c, 0x00,
+ 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x07, 0x06, 0x00, 0x18, 0x38, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x07, 0x00,
+ 0x00, 0x00, 0x00, 0x07, 0x06, 0x00, 0x18, 0x38, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x07, 0x0e, 0x00, 0x18, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x1c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00,
+ 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00, 0x18, 0x30, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x07, 0x0e, 0x00, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x07, 0x0e, 0x00, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x00,
+ 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1e, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1c, 0x00, 0x38, 0x70, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x06, 0x1c, 0x00, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x06, 0x18, 0x00, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00,
+ 0x1e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x18, 0x00,
+ 0x30, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x1e, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 0x00, 0x30, 0xe0, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0x1f, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x0c, 0x3c, 0x00, 0x30, 0xf0, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0xf8, 0x03, 0x1f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x0c, 0x7e, 0x00, 0x70, 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x0f,
+ 0x1f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xe7, 0x00,
+ 0x70, 0xbc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x1f, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xe3, 0x00, 0x60, 0x1e, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x0f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0xfc, 0xc1, 0x01, 0xe0, 0x0f, 0x0f, 0x00, 0x00, 0x00,
+ 0x80, 0x07, 0xf0, 0x1f, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0xf8, 0x80, 0x03, 0xe0, 0x03, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0x03, 0xe0,
+ 0x1b, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x78, 0x80, 0x07,
+ 0xe0, 0x01, 0x1c, 0x00, 0x00, 0x00, 0xe0, 0x01, 0xc0, 0x1b, 0x00, 0x00,
+ 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0f, 0xe0, 0x01, 0x38,
+ 0x00, 0x00, 0x00, 0xf0, 0x00, 0xc0, 0x19, 0x00, 0x00, 0x00, 0x06, 0x00,
+ 0x00, 0x00, 0x00, 0x30, 0x0e, 0x1e, 0xc0, 0x71, 0xf8, 0x00, 0x00, 0x00,
+ 0x78, 0x00, 0xdc, 0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+ 0x30, 0x1f, 0x1e, 0xc0, 0xf9, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+#define escherknot_width 216
+#define escherknot_height 208
+
+static unsigned char escherknot_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa, 0x5f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xf0, 0x6f, 0xf6, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc0, 0xff, 0x3a, 0x13, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0d, 0x02, 0x51, 0x71, 0x0e, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2f, 0x20, 0xd9, 0x88,
+ 0x9b, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x82,
+ 0xac, 0x44, 0x4e, 0x1c, 0xf3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x1e, 0x40, 0x02, 0x44, 0x60, 0xe2, 0xfc, 0x06, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x80, 0x25, 0x09, 0x90, 0x22, 0x13, 0xb7, 0x9a, 0x1e,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x40, 0x10, 0x89,
+ 0x18, 0xe3, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x04, 0x08,
+ 0x01, 0x10, 0xc8, 0xa8, 0xd5, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x83, 0x80, 0x20, 0x40, 0x82, 0x00, 0x66, 0x9c, 0xec, 0x01, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x08, 0x08, 0x24, 0x12, 0x93, 0x5b,
+ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x12, 0x80, 0x04, 0x01, 0x00, 0x80,
+ 0x19, 0x33, 0xfa, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x80, 0x80, 0x00,
+ 0x20, 0x08, 0x12, 0xc4, 0x68, 0x26, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x02, 0x04, 0x24, 0x00, 0x01, 0x40, 0x24, 0x8c, 0xcd, 0x3f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
+ 0x00, 0x80, 0x49, 0x10, 0x90, 0x00, 0x21, 0x20, 0x08, 0x11, 0x43, 0xd9,
+ 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8,
+ 0xff, 0xff, 0x0b, 0x00, 0x60, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0x30, 0xb9, 0xf2, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xc0, 0x97, 0x04, 0x08, 0xfe, 0x05, 0x30, 0x10, 0x12, 0x20, 0x20,
+ 0x04, 0x00, 0x80, 0x48, 0x0c, 0xa3, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x3e, 0x92, 0x20, 0x49, 0x40, 0x3e, 0x0e, 0x82,
+ 0x00, 0x84, 0x25, 0x01, 0x80, 0x00, 0x80, 0xc8, 0x34, 0xed, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x25, 0x01, 0x04, 0x01, 0x08,
+ 0xd0, 0x17, 0x00, 0x80, 0x25, 0x01, 0xad, 0x04, 0x12, 0x20, 0x23, 0x4c,
+ 0x6a, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0x02, 0x48,
+ 0x92, 0x20, 0x41, 0x92, 0x9e, 0x80, 0x24, 0x24, 0x29, 0x00, 0x04, 0x00,
+ 0x10, 0x98, 0xcc, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+ 0x4f, 0x10, 0x01, 0x90, 0x24, 0x40, 0x12, 0xf0, 0x00, 0x24, 0x41, 0x0b,
+ 0xa9, 0x10, 0x00, 0x00, 0x04, 0xd9, 0x96, 0x0e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xe0, 0x00, 0x92, 0x48, 0x02, 0x04, 0x09, 0xc0, 0x84, 0x8f,
+ 0x29, 0x2d, 0xf8, 0xa9, 0x02, 0x00, 0x00, 0x20, 0x90, 0xf4, 0x1e, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x24, 0x91, 0x04, 0x50, 0x22, 0x24,
+ 0x1b, 0x12, 0x7a, 0x48, 0xca, 0x03, 0x21, 0x10, 0x00, 0x00, 0x48, 0x93,
+ 0xff, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9e, 0x24, 0x92, 0x20,
+ 0x81, 0xda, 0x24, 0xc8, 0x16, 0xd0, 0xe7, 0x50, 0xd2, 0xbf, 0x03, 0x00,
+ 0x80, 0x00, 0x30, 0x29, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03,
+ 0x20, 0x80, 0x24, 0x41, 0x12, 0x2a, 0x41, 0xb2, 0x80, 0x33, 0x0e, 0x7e,
+ 0x88, 0x1c, 0x01, 0x00, 0xa0, 0x24, 0x69, 0x75, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xe0, 0x82, 0x44, 0x11, 0x24, 0x09, 0x90, 0xa4, 0x4d, 0xd2, 0x92,
+ 0x9e, 0xd3, 0x83, 0x6b, 0x62, 0x00, 0x00, 0x10, 0x22, 0xff, 0x7f, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x30, 0x42, 0x04, 0x92, 0x24, 0x6b, 0x53, 0x32,
+ 0x59, 0x90, 0x16, 0xfa, 0xb4, 0xf4, 0xff, 0x0f, 0x01, 0x00, 0x90, 0x68,
+ 0x4a, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x90, 0x24, 0x11, 0x24,
+ 0x49, 0xda, 0x82, 0xc5, 0x92, 0xd2, 0xd0, 0x9e, 0x1e, 0x00, 0x78, 0x0a,
+ 0x00, 0x00, 0x05, 0xd2, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x02,
+ 0x44, 0xb2, 0x65, 0xea, 0x49, 0x9e, 0x2c, 0x4b, 0x1a, 0xd2, 0xeb, 0xe3,
+ 0xff, 0xc7, 0x09, 0x00, 0x20, 0x68, 0xff, 0xd6, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x0b, 0x90, 0x40, 0x92, 0x24, 0x09, 0x5f, 0xd2, 0x64, 0x59, 0x72,
+ 0x56, 0x7f, 0xfd, 0xdf, 0x1f, 0x12, 0x00, 0x20, 0x49, 0x92, 0xde, 0x01,
+ 0x00, 0x00, 0x00, 0x80, 0x41, 0x92, 0x4c, 0x92, 0x24, 0x25, 0xc9, 0x8b,
+ 0x2e, 0xcb, 0x92, 0x4b, 0x5a, 0x2f, 0x75, 0xf4, 0x04, 0x00, 0x00, 0x41,
+ 0xf6, 0x74, 0x01, 0x00, 0x00, 0x00, 0x40, 0x49, 0x02, 0x00, 0xba, 0xb6,
+ 0xfd, 0x49, 0xf8, 0x74, 0x6d, 0x4b, 0x72, 0xed, 0xdb, 0xff, 0xcf, 0x53,
+ 0x00, 0x00, 0x48, 0xb6, 0xd7, 0x03, 0x00, 0x00, 0x00, 0x60, 0x48, 0x10,
+ 0xc9, 0x93, 0x24, 0x00, 0x7b, 0xc3, 0xa6, 0x69, 0x58, 0x5a, 0xfb, 0xfa,
+ 0xa5, 0xbe, 0x16, 0x00, 0x00, 0x92, 0xa4, 0xfd, 0x03, 0x00, 0x00, 0x00,
+ 0x30, 0x01, 0x20, 0x5d, 0xa2, 0xfe, 0x7f, 0x01, 0x4f, 0x1a, 0xcd, 0x6b,
+ 0x6a, 0xa9, 0x5f, 0xff, 0xf3, 0x24, 0x01, 0x40, 0xc0, 0xb4, 0xf4, 0x03,
+ 0x00, 0x00, 0x00, 0x2c, 0x88, 0x84, 0x89, 0xb6, 0x00, 0x24, 0x7d, 0x69,
+ 0xf2, 0x34, 0xad, 0x99, 0x2d, 0xf7, 0xff, 0x9f, 0x4b, 0x00, 0x00, 0x92,
+ 0xa6, 0xad, 0x07, 0x00, 0x00, 0x00, 0x06, 0x91, 0x24, 0xe9, 0xa4, 0xfd,
+ 0xa5, 0xa9, 0x4b, 0x93, 0xe7, 0x34, 0x63, 0xf9, 0xfc, 0xd5, 0xef, 0x16,
+ 0x00, 0x40, 0x90, 0xb4, 0xbd, 0x07, 0x00, 0x00, 0x00, 0x6a, 0x80, 0x4c,
+ 0x96, 0xbe, 0x2d, 0xfd, 0x2f, 0x7c, 0x5e, 0x9c, 0x67, 0xad, 0xa5, 0xfd,
+ 0xff, 0xbf, 0x29, 0x00, 0x00, 0x92, 0x76, 0xed, 0x06, 0x00, 0x00, 0x00,
+ 0x05, 0x12, 0x48, 0x53, 0x25, 0x65, 0x25, 0xf4, 0xe5, 0xd3, 0x72, 0x9c,
+ 0x35, 0xdf, 0xf6, 0x7f, 0xf5, 0x56, 0x00, 0x00, 0x92, 0xa4, 0xed, 0x0f,
+ 0x00, 0x00, 0x80, 0x49, 0x20, 0x59, 0x38, 0xec, 0xff, 0xff, 0xad, 0x2f,
+ 0x5d, 0xd3, 0x33, 0xe6, 0x24, 0xed, 0xff, 0xdf, 0x2d, 0x01, 0x40, 0x80,
+ 0x24, 0xbd, 0x07, 0x00, 0x00, 0xc0, 0x48, 0x24, 0x49, 0x87, 0x37, 0x21,
+ 0xa0, 0xbd, 0xf4, 0x79, 0x4f, 0xc7, 0x9c, 0xde, 0xf6, 0xff, 0xff, 0x5b,
+ 0x08, 0x00, 0x92, 0xfc, 0xe9, 0x0e, 0x00, 0x00, 0x20, 0x89, 0x40, 0xd3,
+ 0xf4, 0x49, 0xff, 0xff, 0xe7, 0x2f, 0xcf, 0x79, 0x9c, 0x53, 0xb2, 0x35,
+ 0xff, 0xff, 0x37, 0x00, 0x40, 0x90, 0x24, 0xef, 0x0e, 0x00, 0x00, 0x30,
+ 0x91, 0x49, 0x32, 0x2d, 0xff, 0x6b, 0xb7, 0xbd, 0xbc, 0x3c, 0xef, 0x79,
+ 0xce, 0xde, 0xd6, 0xfd, 0xff, 0x9f, 0x00, 0x00, 0x92, 0xa6, 0xad, 0x0b,
+ 0x00, 0x00, 0x30, 0x11, 0x89, 0x8c, 0xcb, 0x5b, 0xba, 0xaf, 0xf6, 0xd7,
+ 0xe7, 0x35, 0xe7, 0x59, 0xb3, 0xfb, 0xff, 0xff, 0x7f, 0x04, 0x40, 0x80,
+ 0xe4, 0xb9, 0x1f, 0x00, 0x00, 0x48, 0x22, 0x91, 0x66, 0x79, 0xeb, 0xff,
+ 0xff, 0xdf, 0xbe, 0xbe, 0xe7, 0x8c, 0x75, 0x6b, 0x4a, 0xfa, 0xbf, 0x7f,
+ 0x00, 0x00, 0x82, 0x24, 0xef, 0x0e, 0x00, 0x00, 0x4c, 0x22, 0xb2, 0x79,
+ 0x5e, 0xfa, 0x5b, 0xa9, 0xfd, 0xeb, 0xf5, 0x9c, 0x3d, 0xc6, 0xcc, 0xee,
+ 0xed, 0x01, 0xf8, 0x00, 0x40, 0x82, 0xb6, 0xa9, 0x1b, 0x00, 0x00, 0x94,
+ 0x64, 0x66, 0x8e, 0xd3, 0x97, 0xfe, 0xff, 0xd7, 0xdf, 0x9f, 0x7b, 0xf3,
+ 0x3c, 0x35, 0x59, 0x6b, 0x00, 0x70, 0x00, 0x00, 0x40, 0xe4, 0xed, 0x1e,
+ 0x00, 0x00, 0x92, 0xc4, 0x34, 0xf3, 0xfc, 0xfd, 0x5f, 0xad, 0x7d, 0xfa,
+ 0x7a, 0xce, 0x8e, 0xb3, 0x76, 0x2f, 0xfd, 0x00, 0xe0, 0x04, 0x00, 0x9a,
+ 0x26, 0xaf, 0x1e, 0x00, 0x00, 0x13, 0x88, 0xcc, 0xb5, 0x3f, 0xbf, 0xff,
+ 0xff, 0xd7, 0xef, 0xef, 0xbd, 0x79, 0x6a, 0xde, 0xec, 0xab, 0x01, 0xc0,
+ 0x00, 0x00, 0x40, 0xb6, 0xbd, 0x1b, 0x00, 0x00, 0x05, 0x91, 0xeb, 0x5c,
+ 0xeb, 0xeb, 0xff, 0xff, 0xff, 0x7e, 0xef, 0x6b, 0xef, 0xcd, 0x99, 0xb3,
+ 0xe4, 0x07, 0x80, 0x00, 0x40, 0x49, 0xb2, 0xe5, 0x1a, 0x00, 0x80, 0x20,
+ 0x32, 0xb1, 0xe7, 0x79, 0x7f, 0xf7, 0xff, 0xfd, 0xeb, 0xbd, 0xfe, 0x2c,
+ 0x3d, 0x6b, 0xb6, 0xaf, 0x06, 0x80, 0x00, 0x00, 0x41, 0x96, 0xfe, 0x1e,
+ 0x00, 0x80, 0x44, 0xb2, 0x9b, 0xf9, 0xde, 0xff, 0xff, 0xff, 0x7f, 0xbf,
+ 0xf7, 0xbb, 0xb3, 0x77, 0xce, 0xce, 0xb6, 0x0d, 0x80, 0x01, 0x00, 0x49,
+ 0xf2, 0x94, 0x1f, 0x00, 0x40, 0x49, 0x44, 0xe6, 0x9e, 0x77, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xbf, 0xf7, 0x7e, 0xd6, 0xbc, 0xd9, 0xba, 0x3b, 0x80,
+ 0x00, 0x00, 0x64, 0x93, 0xf7, 0x1b, 0x00, 0x40, 0x89, 0xec, 0x7e, 0x67,
+ 0xbd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xce, 0xdb, 0x99, 0x33, 0x37,
+ 0xd3, 0x36, 0x80, 0x01, 0x80, 0x24, 0xda, 0xd6, 0x1e, 0x00, 0x20, 0x90,
+ 0x99, 0x99, 0x7b, 0xef, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xef, 0xbd, 0x37,
+ 0x63, 0xf3, 0x66, 0xdb, 0x7a, 0x80, 0x00, 0x00, 0x24, 0x59, 0xde, 0x1f,
+ 0x00, 0x60, 0x12, 0xb3, 0xf7, 0xdd, 0xfb, 0xfe, 0xff, 0xff, 0xff, 0xff,
+ 0xbf, 0xf7, 0xfe, 0x6e, 0xce, 0xdd, 0x6d, 0xd7, 0x80, 0x00, 0x80, 0x20,
+ 0xcb, 0xfb, 0x1f, 0x00, 0x10, 0x20, 0x6e, 0x66, 0x76, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xef, 0xde, 0xdb, 0x9b, 0x99, 0xb3, 0x5d, 0x6b, 0x81,
+ 0x00, 0x40, 0x96, 0x59, 0x6a, 0x1f, 0x00, 0x98, 0xc4, 0xe4, 0xdf, 0xff,
+ 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7b, 0x6f, 0x7b, 0x37, 0x7f,
+ 0xb3, 0xdd, 0x83, 0x00, 0x00, 0xb0, 0xed, 0xef, 0x1d, 0x00, 0x10, 0x88,
+ 0x9e, 0xdd, 0xcd, 0xbd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xed,
+ 0x6c, 0xe6, 0xcc, 0x76, 0x6d, 0xc1, 0x00, 0x40, 0x91, 0x24, 0x7b, 0x1f,
+ 0x00, 0x08, 0xd1, 0xf1, 0x66, 0x76, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xdf, 0xbd, 0xbf, 0xd9, 0xdd, 0xdd, 0xb6, 0x47, 0x00, 0x00, 0xd8,
+ 0xb4, 0xad, 0x1f, 0x00, 0x24, 0x24, 0x6f, 0xf6, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xb7, 0x9d, 0x33, 0xd9, 0x96, 0x4e,
+ 0x00, 0x20, 0x49, 0xf7, 0xfd, 0x1e, 0x00, 0x48, 0xe4, 0xac, 0xb9, 0xdd,
+ 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xdd, 0x76, 0xb6,
+ 0xb7, 0xfd, 0x7a, 0x00, 0x00, 0x44, 0x96, 0xb7, 0x1f, 0x00, 0x02, 0x9a,
+ 0xbe, 0x6f, 0x77, 0xff, 0xff, 0x7f, 0x61, 0xd9, 0xff, 0xff, 0xff, 0xfd,
+ 0xdd, 0x66, 0xed, 0x66, 0x5b, 0x37, 0x00, 0x90, 0x64, 0xb9, 0xf6, 0x1f,
+ 0x00, 0x02, 0xc9, 0xf3, 0xee, 0xfd, 0xff, 0xff, 0x2f, 0x24, 0x4f, 0xfe,
+ 0xff, 0xff, 0x7f, 0x37, 0xdb, 0xcd, 0x7c, 0xff, 0x3a, 0x00, 0x88, 0x24,
+ 0xdb, 0xde, 0x1a, 0x00, 0x13, 0x31, 0x6f, 0xbb, 0xdf, 0xff, 0xff, 0x21,
+ 0xa0, 0x64, 0xf3, 0xff, 0xff, 0xe7, 0xff, 0x96, 0xbb, 0x9b, 0xa5, 0x1d,
+ 0x00, 0x60, 0x32, 0xe9, 0xdb, 0x0f, 0x00, 0x65, 0xe6, 0x3c, 0xfb, 0xf6,
+ 0xff, 0x7f, 0x10, 0xa4, 0xb5, 0x9d, 0xfe, 0xdf, 0xdf, 0xdd, 0x6d, 0x32,
+ 0xb3, 0x7d, 0x0d, 0x00, 0x0b, 0x93, 0x7c, 0x7b, 0x0f, 0x00, 0x89, 0xdc,
+ 0xb3, 0xed, 0xfb, 0xff, 0x1f, 0x10, 0x90, 0x92, 0xd9, 0xfe, 0x7f, 0xff,
+ 0x77, 0xdb, 0xee, 0x6e, 0xdb, 0x0e, 0x00, 0x20, 0xdd, 0x66, 0x6f, 0x0f,
+ 0x80, 0x91, 0x5a, 0xfb, 0xbe, 0xef, 0xff, 0x0f, 0x10, 0xda, 0x92, 0xee,
+ 0xff, 0xff, 0xff, 0xf7, 0xb7, 0xcd, 0xee, 0xde, 0x07, 0x00, 0x24, 0x49,
+ 0xb6, 0xed, 0x0f, 0x00, 0x12, 0x6b, 0xcd, 0xf3, 0xbe, 0xff, 0x07, 0x08,
+ 0x48, 0xda, 0x76, 0xb7, 0xff, 0xff, 0xdd, 0x6e, 0xba, 0x99, 0x65, 0x03,
+ 0x40, 0x92, 0xe4, 0xba, 0xbd, 0x0e, 0x80, 0x62, 0xed, 0x7d, 0x5f, 0xf7,
+ 0xff, 0x01, 0x08, 0x28, 0xc9, 0x26, 0xbb, 0xff, 0xff, 0xff, 0x99, 0xb7,
+ 0xbb, 0x7d, 0x03, 0x00, 0x89, 0x64, 0xdb, 0xf6, 0x07, 0x40, 0x0c, 0x35,
+ 0xe7, 0x79, 0xdd, 0xff, 0x01, 0x84, 0xa5, 0x7d, 0xba, 0xdd, 0xfe, 0x7f,
+ 0xbf, 0xbf, 0x6d, 0x76, 0xdb, 0x01, 0x00, 0x48, 0x36, 0xdb, 0xd6, 0x07,
+ 0xc0, 0x88, 0xb4, 0xb6, 0xbf, 0xff, 0x7f, 0x00, 0x0c, 0x24, 0x44, 0xdb,
+ 0xed, 0xff, 0xdf, 0xef, 0x6e, 0xdb, 0x6e, 0xb7, 0x00, 0x80, 0x44, 0x93,
+ 0xed, 0x5b, 0x07, 0x40, 0x91, 0xd2, 0xfa, 0xfc, 0xf6, 0x7f, 0x00, 0x02,
+ 0xb4, 0x35, 0xd9, 0xef, 0xff, 0xff, 0xfb, 0xef, 0xb6, 0xc9, 0xe4, 0x00,
+ 0x10, 0x24, 0xd9, 0x6d, 0xfb, 0x03, 0x00, 0x27, 0xfe, 0xd3, 0xd6, 0xdb,
+ 0x3f, 0x00, 0xa2, 0x94, 0xb4, 0xdb, 0x7c, 0xff, 0xff, 0xbf, 0xd9, 0xad,
+ 0xdb, 0x7d, 0x00, 0x40, 0x32, 0xd9, 0xb6, 0xef, 0x03, 0x60, 0xe4, 0x5a,
+ 0x5f, 0x5f, 0xff, 0x1f, 0x00, 0x02, 0x52, 0x92, 0xec, 0xb6, 0xff, 0xff,
+ 0xef, 0xff, 0x6d, 0xb6, 0x3b, 0x00, 0x28, 0x90, 0xcc, 0xbe, 0xfd, 0x03,
+ 0xa0, 0x88, 0xeb, 0xf9, 0xfd, 0xf5, 0x1f, 0x00, 0x82, 0x53, 0xbb, 0x6d,
+ 0xf7, 0xff, 0xf9, 0xff, 0x6f, 0xdb, 0x6d, 0x1b, 0x00, 0x04, 0xc9, 0x66,
+ 0xdb, 0x57, 0x03, 0xa0, 0x52, 0xaf, 0xa7, 0x97, 0xff, 0x0f, 0x00, 0x51,
+ 0x48, 0xda, 0x66, 0xdb, 0xff, 0xf8, 0xdf, 0xed, 0xbe, 0xed, 0x0e, 0x00,
+ 0x92, 0x64, 0x32, 0xeb, 0xf6, 0x01, 0x20, 0x63, 0xbd, 0xbc, 0xfc, 0xfa,
+ 0x0f, 0x00, 0x09, 0x20, 0x89, 0x3e, 0xff, 0xff, 0xe0, 0x7f, 0xdf, 0x6f,
+ 0xdb, 0x07, 0x00, 0x01, 0x24, 0xbb, 0xed, 0xfe, 0x01, 0xa0, 0xce, 0xf5,
+ 0xf6, 0xdb, 0xdf, 0x07, 0x00, 0x41, 0xad, 0x5f, 0xf2, 0xed, 0xff, 0xc0,
+ 0xff, 0xbf, 0xdd, 0x92, 0x03, 0x00, 0x44, 0xb2, 0xd9, 0x7d, 0xfb, 0x01,
+ 0xe0, 0xaa, 0xdf, 0x9b, 0x7f, 0xfb, 0x07, 0x80, 0x28, 0x21, 0x64, 0xbb,
+ 0x7f, 0x7f, 0x80, 0xff, 0xf6, 0xbb, 0xee, 0x03, 0x80, 0x22, 0x99, 0xed,
+ 0xb6, 0xff, 0x00, 0x90, 0xb8, 0x5e, 0x5b, 0x6b, 0xed, 0x03, 0x00, 0x01,
+ 0xa6, 0x6d, 0xdb, 0xf6, 0x7f, 0x00, 0xff, 0xff, 0xf6, 0xcd, 0x00, 0x40,
+ 0x10, 0xc9, 0x6c, 0xff, 0xf7, 0x00, 0xa0, 0xe3, 0x72, 0xeb, 0xef, 0xff,
+ 0x03, 0x80, 0xe0, 0x90, 0x24, 0xdb, 0xbd, 0x3f, 0x00, 0xfe, 0xdb, 0x6f,
+ 0xfb, 0x00, 0x00, 0x89, 0x4c, 0xb6, 0xd9, 0x7e, 0x00, 0x70, 0xaf, 0xaf,
+ 0x6f, 0xb5, 0xde, 0x03, 0x80, 0x94, 0x92, 0xb6, 0xf9, 0xf6, 0x3f, 0x00,
+ 0xfc, 0xbf, 0xdd, 0x7b, 0x00, 0x10, 0x48, 0x26, 0xb3, 0xdf, 0x7f, 0x00,
+ 0x70, 0xd8, 0xae, 0xfd, 0xff, 0xf7, 0x03, 0x80, 0x00, 0xd2, 0x36, 0xcf,
+ 0xdf, 0x3f, 0x00, 0xb8, 0x6d, 0xdf, 0x16, 0x00, 0x48, 0x44, 0xb2, 0xfb,
+ 0x6c, 0x3f, 0x00, 0x50, 0x75, 0xfd, 0xa5, 0xd5, 0xfe, 0x01, 0x40, 0xd1,
+ 0x12, 0xa2, 0x7d, 0xfb, 0x1f, 0x00, 0xf0, 0xff, 0xbf, 0x0d, 0x00, 0x20,
+ 0x12, 0x9b, 0xcd, 0xf6, 0x3f, 0x00, 0x90, 0xd5, 0xa7, 0xfd, 0x77, 0xab,
+ 0x03, 0x40, 0x1c, 0xc8, 0xbe, 0x6d, 0xfb, 0x1f, 0x00, 0xe0, 0xff, 0xee,
+ 0x07, 0x00, 0x04, 0x91, 0xc9, 0x7e, 0xbf, 0x1f, 0x00, 0x30, 0x57, 0xbf,
+ 0xa6, 0xde, 0xfd, 0x01, 0x40, 0x40, 0x6b, 0xd3, 0x6e, 0xef, 0x0f, 0x00,
+ 0xc0, 0xeb, 0x7d, 0x03, 0x00, 0x90, 0xc8, 0x6c, 0x76, 0xfb, 0x0f, 0x00,
+ 0x70, 0x5c, 0xe5, 0xf7, 0xfa, 0xeb, 0x01, 0x40, 0x50, 0x49, 0x92, 0xf4,
+ 0xfd, 0x0f, 0x00, 0xc0, 0xff, 0xdb, 0x01, 0x80, 0x44, 0x44, 0x66, 0xbb,
+ 0x6f, 0x0f, 0x00, 0xd0, 0xf1, 0x95, 0xf6, 0x6f, 0xad, 0x01, 0x40, 0x08,
+ 0x78, 0xdb, 0xb6, 0xef, 0x0f, 0x00, 0x00, 0xdf, 0xd6, 0x00, 0x00, 0x20,
+ 0x32, 0xb3, 0xdb, 0xfd, 0x0f, 0x00, 0x10, 0xd7, 0xf7, 0xb6, 0xd8, 0xeb,
+ 0x03, 0x20, 0x43, 0x27, 0xd9, 0xb6, 0xfd, 0x0f, 0x00, 0x00, 0xff, 0x7e,
+ 0x00, 0x40, 0x12, 0x93, 0xd9, 0xec, 0xb6, 0x07, 0x00, 0x70, 0x55, 0xdd,
+ 0xf6, 0x6f, 0xbb, 0x01, 0x40, 0x28, 0xa1, 0x6f, 0xb6, 0xb7, 0x0f, 0x00,
+ 0x00, 0xde, 0x1f, 0x00, 0x80, 0x88, 0xd8, 0xcc, 0x66, 0xff, 0x03, 0x00,
+ 0x70, 0xf4, 0xf5, 0xdb, 0xaa, 0xee, 0x01, 0x60, 0x28, 0x2d, 0x49, 0xf7,
+ 0xf6, 0x07, 0x00, 0x00, 0x7c, 0x0f, 0x00, 0x08, 0x48, 0x66, 0x6e, 0xfb,
+ 0xef, 0x03, 0x00, 0xd0, 0xd5, 0xdf, 0x52, 0xff, 0xda, 0x03, 0x20, 0xa3,
+ 0xa5, 0xd9, 0xb2, 0xff, 0x07, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x20, 0x22,
+ 0x33, 0x37, 0xbf, 0xfd, 0x01, 0x00, 0x70, 0x5f, 0xf7, 0xfe, 0xab, 0x6b,
+ 0x02, 0xa0, 0xa8, 0xb4, 0x6d, 0xdf, 0xf6, 0x07, 0x00, 0x00, 0xf8, 0x01,
+ 0x00, 0x12, 0x33, 0x11, 0xd9, 0xdd, 0xff, 0x01, 0x00, 0x70, 0x75, 0xd5,
+ 0x52, 0xea, 0x8a, 0x03, 0x20, 0x84, 0x36, 0x69, 0xba, 0xdb, 0x07, 0x00,
+ 0x00, 0xf0, 0x01, 0x00, 0x81, 0xc8, 0xcc, 0xdd, 0xed, 0xff, 0x00, 0x00,
+ 0x60, 0xd5, 0xdf, 0xf6, 0xae, 0x6b, 0x03, 0x00, 0xa1, 0xa4, 0x6d, 0xdf,
+ 0xfe, 0x07, 0x00, 0x00, 0x60, 0x00, 0x40, 0x44, 0xc6, 0xcc, 0x64, 0xb7,
+ 0xfd, 0x00, 0x00, 0xe0, 0x55, 0xf7, 0xd6, 0xea, 0xba, 0x07, 0x20, 0x94,
+ 0x94, 0x6d, 0xfb, 0xdb, 0x07, 0x00, 0x00, 0x20, 0x00, 0x20, 0x20, 0x32,
+ 0x76, 0x77, 0xff, 0x7f, 0x00, 0x00, 0x60, 0x7d, 0xd5, 0xb6, 0x3f, 0xaf,
+ 0x06, 0xa0, 0xa4, 0x95, 0x6c, 0x9b, 0xee, 0x07, 0x00, 0x00, 0x18, 0x00,
+ 0x10, 0x92, 0x15, 0x73, 0xbb, 0xd9, 0x3f, 0x00, 0x00, 0xe0, 0xf5, 0xff,
+ 0xf7, 0x6a, 0xa9, 0x06, 0x80, 0xa2, 0xb4, 0x6d, 0xfb, 0xfb, 0x07, 0x00,
+ 0x00, 0x04, 0x00, 0x84, 0x88, 0xc8, 0x99, 0xdd, 0xff, 0x3f, 0x00, 0x00,
+ 0xe0, 0x8b, 0xff, 0x96, 0x6a, 0xb6, 0x0a, 0xa0, 0x94, 0x96, 0x64, 0xdb,
+ 0xee, 0x07, 0x00, 0x00, 0x03, 0x08, 0x20, 0x60, 0x66, 0xec, 0xee, 0xb6,
+ 0x1d, 0x00, 0x00, 0xc0, 0x7e, 0xa5, 0xf4, 0xab, 0x55, 0x0d, 0x20, 0xe7,
+ 0xd4, 0x6d, 0xdb, 0xfb, 0x07, 0x00, 0x80, 0x00, 0x00, 0x09, 0x12, 0x33,
+ 0x67, 0x77, 0xff, 0x0f, 0x00, 0x00, 0xc0, 0xfa, 0xff, 0xb7, 0x7a, 0x55,
+ 0x19, 0x90, 0x91, 0xd4, 0x64, 0xdb, 0xee, 0x07, 0x00, 0x40, 0x00, 0x81,
+ 0x04, 0x88, 0x91, 0x3b, 0xbb, 0xfd, 0x0f, 0x00, 0x00, 0xc0, 0xab, 0xbf,
+ 0xed, 0x4e, 0xbb, 0x32, 0x20, 0x94, 0x96, 0x6c, 0xff, 0xfa, 0x03, 0x00,
+ 0x30, 0x40, 0x20, 0x20, 0x64, 0xcc, 0xdc, 0xdd, 0xff, 0x07, 0x00, 0x00,
+ 0xc0, 0xeb, 0xea, 0xfd, 0xd5, 0xaa, 0x2a, 0x20, 0xd7, 0xb0, 0x6d, 0x93,
+ 0xef, 0x07, 0x00, 0x08, 0x00, 0x08, 0x01, 0x23, 0xee, 0xee, 0xee, 0xfb,
+ 0x03, 0x00, 0x00, 0xc0, 0xfe, 0xff, 0x2d, 0xdd, 0x6a, 0x49, 0xd0, 0x90,
+ 0x9a, 0x64, 0xdf, 0xea, 0x07, 0x00, 0x03, 0x80, 0x40, 0x8c, 0x98, 0x33,
+ 0xb3, 0xbb, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xa5, 0x7b, 0x6d, 0xa7, 0x56,
+ 0xc5, 0xa0, 0x94, 0x94, 0x6f, 0xd3, 0xbb, 0x07, 0x80, 0x10, 0x0c, 0x12,
+ 0x40, 0xc6, 0xb9, 0xdb, 0xfb, 0xfd, 0x01, 0x00, 0x00, 0x80, 0x97, 0xee,
+ 0xdf, 0xba, 0x54, 0x1a, 0xa1, 0xe5, 0xd2, 0x64, 0x7e, 0xee, 0x07, 0x60,
+ 0x02, 0x80, 0x00, 0x31, 0x62, 0xcc, 0xdc, 0xee, 0x7f, 0x00, 0x00, 0x00,
+ 0x80, 0xff, 0xff, 0xdb, 0xaa, 0xb5, 0x8a, 0x86, 0x98, 0x96, 0x6d, 0x9b,
+ 0xea, 0x07, 0x98, 0x00, 0x22, 0x44, 0x88, 0x39, 0x77, 0x77, 0xff, 0x7f,
+ 0x00, 0x00, 0x00, 0x80, 0x7d, 0x77, 0xba, 0x7b, 0x2d, 0x55, 0x3c, 0xa6,
+ 0xb4, 0x6c, 0xf6, 0xaf, 0x07, 0x07, 0x90, 0x88, 0x20, 0x42, 0x9c, 0xbb,
+ 0xbb, 0xbb, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x4b, 0xbd, 0xbf, 0x55, 0x53,
+ 0xa5, 0xb2, 0xa1, 0xb4, 0xc9, 0x9f, 0xda, 0xcf, 0x28, 0x24, 0x42, 0x08,
+ 0x31, 0xe6, 0xcc, 0xdd, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xff, 0xef,
+ 0xb7, 0xbd, 0xde, 0x12, 0xd1, 0xac, 0x95, 0x4d, 0xf2, 0x56, 0x9f, 0x88,
+ 0x80, 0x10, 0xc2, 0x9c, 0x73, 0x77, 0xef, 0xfe, 0x7f, 0x00, 0x00, 0x00,
+ 0x00, 0xbf, 0xfb, 0xed, 0xeb, 0x35, 0x95, 0x72, 0xa2, 0x35, 0xcd, 0xb6,
+ 0xd6, 0x2f, 0x21, 0x24, 0x04, 0x31, 0xc6, 0x98, 0x33, 0xf7, 0xff, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0xd6, 0x6a, 0x7f, 0x5b, 0xab, 0x2d, 0x28, 0x23,
+ 0x65, 0xd9, 0xb6, 0x55, 0x5f, 0x88, 0x08, 0x43, 0x0c, 0x61, 0xde, 0xdd,
+ 0xfb, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x76, 0xff, 0x4d, 0xd7, 0x4d,
+ 0x4a, 0xa5, 0x29, 0x2d, 0xdb, 0xbe, 0x55, 0x1f, 0x22, 0x42, 0x28, 0xc2,
+ 0x39, 0xe7, 0xee, 0xee, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x7f,
+ 0xfb, 0xb6, 0xb6, 0x95, 0x70, 0x2e, 0xa5, 0xd9, 0x24, 0x5d, 0x5f, 0x8a,
+ 0x28, 0x88, 0x31, 0x9e, 0x39, 0x73, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+ 0x00, 0xec, 0xb7, 0xdf, 0x6c, 0xb5, 0x65, 0x26, 0xa3, 0x39, 0x9b, 0xfc,
+ 0x85, 0x5d, 0x21, 0x04, 0x63, 0x1c, 0xe6, 0xdd, 0xbd, 0xfb, 0xff, 0xff,
+ 0x01, 0x00, 0x00, 0x00, 0xb8, 0xfa, 0xb6, 0x6f, 0x4d, 0x9a, 0x28, 0x59,
+ 0x4d, 0xd3, 0x2f, 0xf5, 0x3f, 0x8c, 0xd1, 0x18, 0xc6, 0x31, 0xf6, 0xdd,
+ 0xfe, 0xff, 0xfe, 0x01, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xef, 0xb9, 0xb6,
+ 0x25, 0xe1, 0x4d, 0x69, 0xba, 0x6c, 0xad, 0x3c, 0x41, 0x14, 0x84, 0xe9,
+ 0x9e, 0x37, 0xf7, 0xff, 0xff, 0xfb, 0x03, 0x00, 0x00, 0x00, 0x70, 0x5d,
+ 0x3d, 0x9f, 0x3d, 0x6d, 0x26, 0x52, 0x59, 0xb6, 0x6d, 0xab, 0x7f, 0x14,
+ 0x82, 0xe1, 0x39, 0xe6, 0xdd, 0xfb, 0xff, 0xbf, 0xff, 0x01, 0x00, 0x00,
+ 0x00, 0xf0, 0xf6, 0x6f, 0x77, 0xcd, 0x92, 0xd0, 0x52, 0x4b, 0xb3, 0x49,
+ 0x0b, 0x3a, 0x41, 0x61, 0x38, 0x9e, 0x73, 0xee, 0xdc, 0xff, 0xff, 0xfd,
+ 0x03, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xd7, 0x65, 0xda, 0x66, 0x63, 0x9d,
+ 0xf2, 0x36, 0x7b, 0x6a, 0x7f, 0x14, 0x18, 0x8e, 0xe7, 0xd9, 0x7b, 0xff,
+ 0xff, 0xef, 0xff, 0x03, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xdd, 0xb6,
+ 0xc9, 0x4c, 0x46, 0x9a, 0x64, 0xcb, 0x5b, 0xed, 0x06, 0xc6, 0xe3, 0x71,
+ 0xde, 0xbd, 0xff, 0xff, 0x7f, 0xff, 0x07, 0x00, 0x00, 0x00, 0xc0, 0x7f,
+ 0x7f, 0xff, 0x59, 0x37, 0x75, 0xbb, 0x96, 0x66, 0xdb, 0x56, 0xf7, 0xe0,
+ 0xf2, 0x74, 0x9e, 0x77, 0xef, 0xfd, 0xff, 0xeb, 0xed, 0x03, 0x00, 0x00,
+ 0x00, 0xc0, 0xea, 0xdf, 0xb3, 0xdb, 0xde, 0xc6, 0x81, 0xb0, 0x6c, 0xba,
+ 0xb4, 0xf6, 0x38, 0x18, 0x3c, 0xe7, 0x9c, 0xfb, 0xff, 0x7f, 0xff, 0xff,
+ 0x07, 0x00, 0x00, 0x00, 0x80, 0xff, 0xf7, 0x6e, 0x66, 0xd9, 0x99, 0xac,
+ 0xa4, 0xcd, 0x96, 0xa5, 0xea, 0x03, 0xa7, 0xcf, 0x79, 0xef, 0xfd, 0xff,
+ 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfd, 0xef, 0xdf,
+ 0x6f, 0xef, 0x72, 0x65, 0xd9, 0xb6, 0xad, 0xe8, 0xc1, 0xe1, 0xf1, 0xbe,
+ 0x7b, 0xef, 0xff, 0xdf, 0x7a, 0xfb, 0x07, 0x00, 0x00, 0x00, 0x00, 0xfe,
+ 0x5f, 0xdd, 0x9d, 0xac, 0x99, 0x84, 0x29, 0xcd, 0x3c, 0x4f, 0x9d, 0x7d,
+ 0x3c, 0x9e, 0xe7, 0xbe, 0xff, 0xff, 0xff, 0xff, 0xef, 0x0f, 0x00, 0x00,
+ 0x00, 0x00, 0xfe, 0xff, 0x77, 0x7b, 0x33, 0xe7, 0x5a, 0x49, 0x9b, 0x65,
+ 0x59, 0x75, 0x07, 0x97, 0xf7, 0xbb, 0xef, 0xff, 0xff, 0xdb, 0xfe, 0xff,
+ 0x07, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf7, 0x3f, 0xe7, 0xcf, 0x9c, 0x51,
+ 0x4d, 0xb0, 0x6d, 0x4b, 0xc9, 0xd3, 0xf5, 0x79, 0xfe, 0xfb, 0xff, 0xff,
+ 0xdb, 0xda, 0xfe, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xef, 0xde,
+ 0xdd, 0xf3, 0x4d, 0x52, 0x36, 0xcb, 0xd2, 0x3a, 0x7e, 0x3c, 0xde, 0xe7,
+ 0xbe, 0xff, 0x7f, 0xda, 0xff, 0xdf, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xf8,
+ 0xff, 0xfb, 0xdd, 0x73, 0x8f, 0xa5, 0x9a, 0xe6, 0xd9, 0xb6, 0xe2, 0x4e,
+ 0xc7, 0xf7, 0xfd, 0xff, 0xff, 0xff, 0xf7, 0xf6, 0xff, 0x0f, 0x00, 0x00,
+ 0x00, 0x00, 0xe0, 0xff, 0xff, 0x7f, 0xee, 0x79, 0xb2, 0xb2, 0x2c, 0x9f,
+ 0xb6, 0x54, 0xfe, 0xfb, 0x79, 0xbf, 0xff, 0xff, 0x5f, 0xda, 0xff, 0xfa,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xf7, 0xbf, 0xe7, 0x4b,
+ 0xb4, 0x69, 0xd3, 0x2c, 0x25, 0xbd, 0xbc, 0xcf, 0xf7, 0xfd, 0xff, 0xd7,
+ 0xf6, 0xfe, 0xdf, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xbf, 0x9d,
+ 0xf1, 0x3e, 0x57, 0x25, 0xcb, 0xb6, 0x6d, 0xa9, 0xb5, 0xef, 0xfb, 0xff,
+ 0xff, 0xff, 0xd5, 0xda, 0xd6, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x80,
+ 0xff, 0xff, 0xfb, 0xcf, 0xf5, 0x25, 0x65, 0xd9, 0x66, 0x5b, 0x4a, 0xfa,
+ 0xf9, 0x7e, 0xff, 0xff, 0xff, 0xf6, 0xd6, 0xdf, 0xfa, 0x0f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xfe, 0xff, 0xef, 0x3e, 0xf7, 0x9f, 0x5b, 0x92, 0x6c,
+ 0xdb, 0x52, 0xe5, 0xbe, 0xdf, 0xff, 0xff, 0xbf, 0x51, 0xda, 0xfa, 0x7f,
+ 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7b, 0x9f, 0xe7,
+ 0x4c, 0xb3, 0x4d, 0xd3, 0x54, 0xd9, 0xe7, 0xfb, 0xff, 0xff, 0x5f, 0xdc,
+ 0xfa, 0xdf, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x7f,
+ 0xe7, 0xf9, 0x3a, 0xd3, 0xa6, 0xe9, 0xb6, 0xa5, 0xca, 0xf9, 0xfd, 0xff,
+ 0xff, 0x83, 0x42, 0xd2, 0xff, 0xfb, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xf0, 0xff, 0xfd, 0xbf, 0xef, 0x4f, 0xd5, 0x64, 0xdb, 0x26, 0x4d, 0x30,
+ 0x7f, 0xff, 0xff, 0xff, 0x91, 0xda, 0xdb, 0xda, 0xdf, 0x1f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xe0, 0xff, 0xbf, 0xff, 0x7d, 0xbe, 0xb5, 0x6d, 0x97,
+ 0x6d, 0x93, 0x56, 0xdf, 0xff, 0xff, 0x7f, 0x81, 0x4a, 0xda, 0x7f, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xef, 0xeb, 0xbb,
+ 0xa6, 0x4d, 0x73, 0xcd, 0x92, 0xaa, 0xfe, 0xff, 0xff, 0x1f, 0x01, 0x6a,
+ 0x5b, 0xfb, 0xfb, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+ 0xfd, 0xbf, 0x5f, 0x3b, 0xdb, 0x36, 0xbb, 0x26, 0x4c, 0xf9, 0xff, 0xff,
+ 0x0f, 0xa3, 0x2a, 0xe9, 0x7f, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xee, 0xff, 0xff, 0xfe, 0xfe, 0xcc, 0x91, 0xec, 0x93, 0x6d, 0x93,
+ 0xf2, 0xff, 0xff, 0x03, 0x00, 0x6a, 0x6d, 0x6f, 0xff, 0x1f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xf7, 0x6f, 0x76, 0xb6, 0xcd,
+ 0x76, 0xc9, 0x2a, 0xe9, 0xff, 0xff, 0x00, 0x02, 0x24, 0xed, 0xf9, 0xed,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xdf, 0xff,
+ 0xd9, 0x66, 0x9b, 0x6c, 0x93, 0x54, 0xc5, 0xff, 0x3f, 0x00, 0x01, 0x95,
+ 0xb5, 0xaf, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff,
+ 0xff, 0xff, 0xfd, 0xae, 0x7d, 0xde, 0x6d, 0xf6, 0xa1, 0x8a, 0xff, 0x0f,
+ 0x00, 0x81, 0x90, 0xb4, 0xfd, 0xfd, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xcd, 0xb2, 0xdb, 0x2c, 0xcb,
+ 0x54, 0xfe, 0x01, 0x00, 0x01, 0xd2, 0xb6, 0xb7, 0xff, 0x0f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x39, 0xdb, 0x76,
+ 0xb3, 0x4b, 0xb6, 0x0a, 0xfe, 0x00, 0x00, 0x01, 0x48, 0xda, 0xfe, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff,
+ 0xcf, 0xb9, 0x6d, 0xb6, 0xd9, 0xa5, 0x75, 0x1c, 0x00, 0x80, 0x80, 0x20,
+ 0xdb, 0xda, 0xbe, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
+ 0xff, 0xff, 0xff, 0x77, 0x96, 0xd9, 0x26, 0xb3, 0x4d, 0x82, 0x11, 0x00,
+ 0x80, 0x80, 0x24, 0x6d, 0xff, 0xf7, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xbb, 0x67, 0xdb, 0xdd, 0x36, 0xd9,
+ 0x54, 0x60, 0x00, 0xc0, 0x00, 0x92, 0x65, 0x6b, 0xff, 0x0f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x4f, 0x7d, 0x96,
+ 0xd9, 0x6c, 0x36, 0xad, 0xc2, 0x00, 0x60, 0x00, 0xc8, 0xb6, 0x6d, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff,
+ 0xff, 0xc8, 0x76, 0xbb, 0xcb, 0x64, 0x52, 0x02, 0x03, 0x10, 0x00, 0x64,
+ 0xda, 0xff, 0xfb, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x80, 0xff, 0xff, 0x5f, 0xd7, 0x4d, 0x33, 0x99, 0xdd, 0x96, 0x04, 0x2c,
+ 0x1c, 0x40, 0x22, 0xdb, 0xb6, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xdf, 0xb5, 0xed, 0xe6, 0x36, 0x9b,
+ 0x6c, 0x29, 0xf0, 0x03, 0x00, 0x99, 0x6c, 0xfb, 0xfd, 0x07, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x7f, 0x35, 0xbb,
+ 0xec, 0x76, 0x33, 0x91, 0x02, 0x00, 0x00, 0x00, 0x64, 0x67, 0xdf, 0xff,
+ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+ 0xbf, 0x6f, 0x9b, 0x9d, 0xc9, 0xce, 0x36, 0x49, 0x00, 0x00, 0x00, 0x93,
+ 0xb1, 0xdd, 0xfe, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x40, 0xff, 0x6a, 0x76, 0xbb, 0xdd, 0xd9, 0x64, 0x12, 0x01,
+ 0x00, 0x40, 0x98, 0xdd, 0x6d, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xdf, 0x66, 0x73, 0x33, 0xbb,
+ 0x9d, 0x4d, 0x00, 0x00, 0x00, 0x63, 0xe6, 0xf6, 0xff, 0x07, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xed, 0xfd,
+ 0xee, 0xee, 0x36, 0x73, 0x2b, 0x04, 0x00, 0xa0, 0x38, 0x75, 0xbf, 0xff,
+ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x7f, 0xd9, 0xec, 0xce, 0x66, 0x66, 0x66, 0x22, 0x04, 0x00, 0xc6,
+ 0x99, 0xbb, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x5e, 0xb3, 0xdb, 0xb9, 0xcd, 0xc9, 0x88, 0x89,
+ 0x00, 0x68, 0x31, 0xee, 0xdd, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xbe, 0xbb, 0x9b, 0x3f,
+ 0xbb, 0x33, 0x23, 0x04, 0x00, 0x8c, 0xf3, 0xee, 0xff, 0x03, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0x67,
+ 0x76, 0x77, 0xb2, 0x66, 0xce, 0x0c, 0xd1, 0xd6, 0xe3, 0x79, 0xf7, 0xff,
+ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xf8, 0xfd, 0xef, 0xe6, 0xee, 0xce, 0x9c, 0x31, 0x16, 0x00, 0x3c,
+ 0x9e, 0xfb, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x78, 0x9f, 0xdb, 0xdc, 0x9d, 0x99, 0x33, 0xc6,
+ 0xc1, 0xff, 0x8f, 0xe7, 0xbb, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf7, 0xbd, 0xbb, 0x33,
+ 0x7b, 0xee, 0x18, 0x1e, 0x50, 0xf0, 0xf9, 0xfe, 0xff, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7b,
+ 0xf7, 0x77, 0xf7, 0xe6, 0x9c, 0xe3, 0xf0, 0x4d, 0xff, 0x7c, 0xef, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xc0, 0xdf, 0x76, 0x7f, 0xcf, 0x9e, 0x73, 0x8f, 0x07, 0xff, 0x0b,
+ 0xdf, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x80, 0xee, 0xcd, 0xdd, 0x9d, 0x7b, 0xf7, 0x7c,
+ 0x7a, 0x00, 0xf0, 0xe7, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x7f, 0xbf, 0xdd, 0x7b,
+ 0x6b, 0x9e, 0xf3, 0xe1, 0xff, 0xff, 0x7d, 0xff, 0x7f, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee,
+ 0xb7, 0xbb, 0x7b, 0xee, 0x79, 0x8f, 0x0f, 0xfa, 0x2f, 0xff, 0xf7, 0x3f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x7e, 0xff, 0x77, 0xef, 0xdd, 0x77, 0x7c, 0xfe, 0x02, 0xe8,
+ 0xcf, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xef, 0xee, 0xdd, 0xb3, 0xcf, 0xf3,
+ 0xf1, 0xff, 0xff, 0xf9, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfb, 0xff, 0xbf,
+ 0xef, 0xbe, 0xcf, 0x8f, 0xfe, 0x5f, 0xfe, 0xff, 0x0f, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
+ 0xbf, 0xbb, 0xf7, 0xde, 0x79, 0x3e, 0xff, 0x52, 0xd2, 0xdf, 0xff, 0x0f,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xe0, 0xef, 0xef, 0xef, 0x3c, 0xef, 0xf9, 0xf8, 0xff, 0xff,
+ 0xf7, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xee, 0xdc, 0xf7, 0xfe, 0xe7,
+ 0x97, 0xfe, 0xff, 0xfe, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf,
+ 0xef, 0xbf, 0x3e, 0xff, 0xda, 0xf6, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xfe, 0xbf, 0xf7, 0xfe, 0xf7, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xfe, 0xff, 0xde, 0xbd, 0xef, 0xfb, 0xd7, 0xff, 0xbf,
+ 0xfd, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xf7, 0x7d, 0xbf,
+ 0xff, 0xd2, 0xf6, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xbf,
+ 0xef, 0xfb, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xc0, 0xff, 0xef, 0xbe, 0xf7, 0xef, 0xef, 0xff, 0xff, 0xff, 0x3f, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xdf, 0xbf, 0xff, 0xff, 0xff,
+ 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff,
+ 0xfe, 0xff, 0xfb, 0xf7, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0xf0, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xfd, 0xff, 0xff, 0x03, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0xfc, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x07,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff,
+ 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+
+# define GCBits	(GCFillStyle|GCTileStipXOrigin|GCTileStipYOrigin)
+
+void SetFillStyle(xp, p)
+    XParms  xp;
+    Parms   p;
+{
+    int	    xorg = 0, yorg = 0;
+
+    if (p->fillStyle == FillStippled || p->fillStyle == FillOpaqueStippled) {
+	Pixmap      stipple;
+	XGCValues   gcv;
+
+	if (!p->font) {
+	    /* Little 8x8 stipple */
+	    stipple = XCreateBitmapFromData(xp->d, xp->w, (char *)bitmap8x8, 8, 8);
+	} else if (!strcmp (p->font, "escherknot")) {
+	    /* Enormous stipple which is x4 bits wide */
+	    stipple = XCreateBitmapFromData(xp->d, xp->w,
+			(char *)escherknot_bits, escherknot_width, escherknot_height);
+	    xorg = -3;
+	} else if (!strcmp (p->font, "OddTile")) {
+	    /* Odd sized tile */
+	    stipple = XCreateBitmapFromData(xp->d, xp->w,
+			(char *)oddbit_bits, oddbit_width, oddbit_height);
+	} else {
+	    /* Enormous stipple.  Well, pretty big. */
+	    stipple = XCreateBitmapFromData(xp->d, xp->w,
+		       (char *)mensetmanus_bits, mensetmanus_width, mensetmanus_height);
+	}
+
+	gcv.stipple = stipple;
+	gcv.fill_style = p->fillStyle;
+	gcv.ts_x_origin = xorg;
+	gcv.ts_y_origin = yorg;
+	XChangeGC(xp->d, xp->fggc, GCBits | GCStipple, &gcv);
+	XChangeGC(xp->d, xp->bggc, GCBits | GCStipple, &gcv);
+	XFreePixmap(xp->d, stipple);
+
+    } else if (p->fillStyle == FillTiled) {
+	Pixmap      tile;
+	XGCValues   gcv;
+
+	gcv.fill_style = FillTiled;
+	if (!p->font) {
+	    /* Little 4x4 tile */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w, (char *)bitmap4x4, 4, 4,
+		    xp->foreground, xp->background, xp->vinfo.depth);
+	} else if (!strcmp (p->font, "escherknot")) {
+	    /* Enormous stipple which is x4 bits wide */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)escherknot_bits, escherknot_width, escherknot_height,
+		    xp->foreground, xp->background, xp->vinfo.depth);
+	    /* align tile with screen */
+	    xorg = -3;
+	} else if (!strcmp (p->font, "OddTile")) {
+	    /* Odd sized tile */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)oddbit_bits, oddbit_width, oddbit_height,
+		    xp->foreground, xp->background, xp->vinfo.depth);
+	    /* align tile with screen */
+	} else {
+	    /* Enormous tile.  Well, pretty big. */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)mensetmanus_bits, mensetmanus_width, mensetmanus_height,
+		    xp->foreground, xp->background, xp->vinfo.depth);
+	}
+	gcv.tile = tile;
+	gcv.ts_x_origin = xorg;
+	gcv.ts_y_origin = yorg;
+	XChangeGC(xp->d, xp->fggc, GCBits | GCTile, &gcv);
+	XFreePixmap(xp->d, tile);
+	if (!p->font) {
+	    /* Little 4x4 tile */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w, (char *)bitmap4x4, 4, 4,
+		    xp->background, xp->foreground, xp->vinfo.depth);
+	} else if (!strcmp (p->font, "escherknot")) {
+	    /* Enormous stipple which is x4 bits wide */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)escherknot_bits, escherknot_width, escherknot_height,
+		    xp->background, xp->foreground, xp->vinfo.depth);
+	} else if (!strcmp (p->font, "OddTile")) {
+	    /* Odd sized tile */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)oddbit_bits, oddbit_width, oddbit_height,
+		    xp->background, xp->foreground, xp->vinfo.depth);
+	} else {
+	    /* Enormous tile.  Well, pretty big. */
+	    tile = XCreatePixmapFromBitmapData(xp->d, xp->w,
+		    (char *)mensetmanus_bits, mensetmanus_width, mensetmanus_height,
+		    xp->background, xp->foreground, xp->vinfo.depth);
+	}
+	gcv.tile = tile;
+	XChangeGC(xp->d, xp->bggc, GCFillStyle | GCTile, &gcv);
+	XFreePixmap(xp->d, tile);
+    }
+}
diff --git a/app/x11perf/bitmaps.h b/app/x11perf/bitmaps.h
new file mode 100644
index 000000000..5ffb431ef
--- /dev/null
+++ b/app/x11perf/bitmaps.h
@@ -0,0 +1,28 @@
+/* $Xorg: bitmaps.h,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.3 1999/03/02 11:49:28 dawes Exp $ */
+
+/* Set fill style (if any) to a bitmap or tile */
+
+extern void SetFillStyle(XParms xp, Parms p);
diff --git a/app/x11perf/config.guess b/app/x11perf/config.guess
new file mode 100644
index 000000000..500ee74b0
--- /dev/null
+++ b/app/x11perf/config.guess
@@ -0,0 +1,1410 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-10-03'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+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`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/app/x11perf/config.h.in b/app/x11perf/config.h.in
new file mode 100644
index 000000000..8334a3f12
--- /dev/null
+++ b/app/x11perf/config.h.in
@@ -0,0 +1,37 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `XShmQueryExtension' function. */
+#undef HAVE_XSHMQUERYEXTENSION
+
+/* MIT-SHM extension available */
+#undef MITSHM
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Version number of package */
+#undef VERSION
+
+/* Xft library available */
+#undef XFT
+
+/* Xrender library available */
+#undef XRENDER
diff --git a/app/x11perf/config.sub b/app/x11perf/config.sub
new file mode 100644
index 000000000..1f31816b9
--- /dev/null
+++ b/app/x11perf/config.sub
@@ -0,0 +1,1510 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2003-08-18'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/app/x11perf/configure b/app/x11perf/configure
new file mode 100644
index 000000000..cb49150c7
--- /dev/null
+++ b/app/x11perf/configure
@@ -0,0 +1,5141 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.59 for x11perf 1.4.1.
+#
+# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+#
+# Copyright (C) 2003 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 Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# 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
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  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
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # 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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='x11perf'
+PACKAGE_TARNAME='x11perf'
+PACKAGE_VERSION='1.4.1'
+PACKAGE_STRING='x11perf 1.4.1'
+PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED PKG_CONFIG ac_pt_PKG_CONFIG X11PERF_CFLAGS X11PERF_LIBS XRENDER_CFLAGS XRENDER_LIBS XFT_CFLAGS XFT_LIBS XEXT_CFLAGS XEXT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_files=''
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# 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.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+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
+
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_option in
+
+  -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 | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$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 ;;
+
+  -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 ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    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 ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -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_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=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 ;;
+
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$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'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+	      localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+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
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  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
+
+
+# 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 its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    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
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_env_X11PERF_CFLAGS_set=${X11PERF_CFLAGS+set}
+ac_env_X11PERF_CFLAGS_value=$X11PERF_CFLAGS
+ac_cv_env_X11PERF_CFLAGS_set=${X11PERF_CFLAGS+set}
+ac_cv_env_X11PERF_CFLAGS_value=$X11PERF_CFLAGS
+ac_env_X11PERF_LIBS_set=${X11PERF_LIBS+set}
+ac_env_X11PERF_LIBS_value=$X11PERF_LIBS
+ac_cv_env_X11PERF_LIBS_set=${X11PERF_LIBS+set}
+ac_cv_env_X11PERF_LIBS_value=$X11PERF_LIBS
+ac_env_XRENDER_CFLAGS_set=${XRENDER_CFLAGS+set}
+ac_env_XRENDER_CFLAGS_value=$XRENDER_CFLAGS
+ac_cv_env_XRENDER_CFLAGS_set=${XRENDER_CFLAGS+set}
+ac_cv_env_XRENDER_CFLAGS_value=$XRENDER_CFLAGS
+ac_env_XRENDER_LIBS_set=${XRENDER_LIBS+set}
+ac_env_XRENDER_LIBS_value=$XRENDER_LIBS
+ac_cv_env_XRENDER_LIBS_set=${XRENDER_LIBS+set}
+ac_cv_env_XRENDER_LIBS_value=$XRENDER_LIBS
+ac_env_XFT_CFLAGS_set=${XFT_CFLAGS+set}
+ac_env_XFT_CFLAGS_value=$XFT_CFLAGS
+ac_cv_env_XFT_CFLAGS_set=${XFT_CFLAGS+set}
+ac_cv_env_XFT_CFLAGS_value=$XFT_CFLAGS
+ac_env_XFT_LIBS_set=${XFT_LIBS+set}
+ac_env_XFT_LIBS_value=$XFT_LIBS
+ac_cv_env_XFT_LIBS_set=${XFT_LIBS+set}
+ac_cv_env_XFT_LIBS_value=$XFT_LIBS
+ac_env_XEXT_CFLAGS_set=${XEXT_CFLAGS+set}
+ac_env_XEXT_CFLAGS_value=$XEXT_CFLAGS
+ac_cv_env_XEXT_CFLAGS_set=${XEXT_CFLAGS+set}
+ac_cv_env_XEXT_CFLAGS_value=$XEXT_CFLAGS
+ac_env_XEXT_LIBS_set=${XEXT_LIBS+set}
+ac_env_XEXT_LIBS_value=$XEXT_LIBS
+ac_cv_env_XEXT_LIBS_set=${XEXT_LIBS+set}
+ac_cv_env_XEXT_LIBS_value=$XEXT_LIBS
+
+#
+# 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 x11perf 1.4.1 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 \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+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]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --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]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of x11perf 1.4.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-release-version=STRING
+                          Use release version string in package name
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  PKG_CONFIG  path to pkg-config utility
+  X11PERF_CFLAGS
+              C compiler flags for X11PERF, overriding pkg-config
+  X11PERF_LIBS
+              linker flags for X11PERF, overriding pkg-config
+  XRENDER_CFLAGS
+              C compiler flags for XRENDER, overriding pkg-config
+  XRENDER_LIBS
+              linker flags for XRENDER, overriding pkg-config
+  XFT_CFLAGS  C compiler flags for XFT, overriding pkg-config
+  XFT_LIBS    linker flags for XFT, overriding pkg-config
+  XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
+  XEXT_LIBS   linker flags for XEXT, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    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
+    elif test -f $ac_srcdir/configure.ac ||
+	   test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+x11perf configure 1.4.1
+generated by GNU Autoconf 2.59
+
+Copyright (C) 2003 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 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by x11perf $as_me 1.4.1, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+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`
+hostinfo               = `(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
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
+} >&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_sep=
+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=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$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
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export 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: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=$`echo $ac_var`
+	echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h | sort
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  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.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
+else
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$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 `(set) 2>&1 |
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$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
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$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.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+am__api_version="1.7"
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
+
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$AWK" && break
+done
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+all:
+	@echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+ # test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='x11perf'
+ VERSION='1.4.1'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+
+
+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+          ac_config_headers="$ac_config_headers config.h"
+
+
+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
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$ac_ct_CC" && break
+done
+
+  CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+	;;
+    conftest.$ac_ext )
+	# This is the source file.
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
+    * )
+	break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  export ac_cv_exeext
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+DEPDIR="${am__leading_dot}deps"
+
+          ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval="$enable_dependency_tracking"
+
+fi;
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+
+depcc="$CC"   am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+done
+
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL=$ac_install_sh
+  fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Extract the first word of "sed", so it can be a program name with args.
+set dummy sed; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SED+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $SED in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SED="$SED" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+SED=$ac_cv_path_SED
+
+if test -n "$SED"; then
+  echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if [ -z $SED ] ; then
+   { { echo "$as_me:$LINENO: error: sed is needed to build x11perf" >&5
+echo "$as_me: error: sed is needed to build x11perf" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+if test "${ac_cv_type_signal+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+# undef signal
+#endif
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int
+main ()
+{
+int i;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_signal=void
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_signal=int
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
+
+# Checks for pkg-config packages
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	else
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		PKG_CONFIG=""
+	fi
+
+fi
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for X11PERF" >&5
+echo $ECHO_N "checking for X11PERF... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xmuu\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xmuu") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_X11PERF_CFLAGS=`$PKG_CONFIG --cflags "x11 xmuu" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xmuu\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xmuu") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_X11PERF_LIBS=`$PKG_CONFIG --libs "x11 xmuu" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	X11PERF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xmuu"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$X11PERF_PKG_ERRORS" 1>&5
+
+	{ { echo "$as_me:$LINENO: error: Package requirements (x11 xmuu) were not met.
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively you may set the X11PERF_CFLAGS and X11PERF_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details." >&5
+echo "$as_me: error: Package requirements (x11 xmuu) were not met.
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively you may set the X11PERF_CFLAGS and X11PERF_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details." >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively you may set the X11PERF_CFLAGS and X11PERF_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively you may set the X11PERF_CFLAGS and X11PERF_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	X11PERF_CFLAGS=$pkg_cv_X11PERF_CFLAGS
+	X11PERF_LIBS=$pkg_cv_X11PERF_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	:
+fi
+
+
+
+# Check for Xrender library
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for XRENDER" >&5
+echo $ECHO_N "checking for XRENDER... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrender\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$XRENDER_PKG_ERRORS" 1>&5
+
+	xrender_found=no
+elif test $pkg_failed = untried; then
+	xrender_found=no
+else
+	XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
+	XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	xrender_found=yes
+fi
+
+
+case "$xrender_found" in
+yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define XRENDER 1
+_ACEOF
+
+	;;
+esac
+
+# Check for Xft library
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for XFT" >&5
+echo $ECHO_N "checking for XFT... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xft") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xft") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$XFT_PKG_ERRORS" 1>&5
+
+	xft_found=no
+elif test $pkg_failed = untried; then
+	xft_found=no
+else
+	XFT_CFLAGS=$pkg_cv_XFT_CFLAGS
+	XFT_LIBS=$pkg_cv_XFT_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	xft_found=yes
+fi
+
+
+case "$xft_found" in
+yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define XFT 1
+_ACEOF
+
+	;;
+esac
+
+# Check for MIT-SHM extension
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for XEXT" >&5
+echo $ECHO_N "checking for XEXT... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xext") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xext" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xext") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xext" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$XEXT_PKG_ERRORS" 1>&5
+
+	xext_found=no
+elif test $pkg_failed = untried; then
+	xext_found=no
+else
+	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
+	XEXT_LIBS=$pkg_cv_XEXT_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	xext_found=yes
+fi
+
+
+case "$xext_found" in
+yes)
+	save_LIBS="$LIBS"
+	LIBS="$XEXT_LIBS $LIBS"
+
+for ac_func in XShmQueryExtension
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
+#define MITSHM 1
+_ACEOF
+
+fi
+done
+
+	LIBS="$save_LIBS"
+	;;
+esac
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+
+
+
+if test x$APP_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)	APP_MAN_SUFFIX=1x ;;
+	*)	APP_MAN_SUFFIX=1  ;;
+    esac
+fi
+if test x$APP_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
+	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$LIB_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)	LIB_MAN_SUFFIX=3x ;;
+	*)	LIB_MAN_SUFFIX=3  ;;
+    esac
+fi
+if test x$LIB_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
+	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$FILE_MAN_SUFFIX = x    ; then
+    case $host_os in
+	linux*)		FILE_MAN_SUFFIX=5x ;;
+	solaris*)	FILE_MAN_SUFFIX=4  ;;
+	*)		FILE_MAN_SUFFIX=5  ;;
+    esac
+fi
+if test x$FILE_MAN_DIR = x    ; then
+    case $host_os in
+	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
+	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+    esac
+fi
+
+# In Imake's linux.cf, the misc man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$MISC_MAN_SUFFIX = x    ; then
+    case $host_os in
+#	linux*)		MISC_MAN_SUFFIX=7x ;;
+	solaris*)	MISC_MAN_SUFFIX=5  ;;
+	*)		MISC_MAN_SUFFIX=7  ;;
+    esac
+fi
+if test x$MISC_MAN_DIR = x    ; then
+    case $host_os in
+#	linux*)	MISC_MAN_DIR='$(mandir)/man7' ;;
+	*)	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+    esac
+fi
+
+# In Imake's linux.cf, the driver man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$DRIVER_MAN_SUFFIX = x    ; then
+    case $host_os in
+#	linux*)		DRIVER_MAN_SUFFIX=4x ;;
+	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+	*)		DRIVER_MAN_SUFFIX=4  ;;
+    esac
+fi
+if test x$DRIVER_MAN_DIR = x    ; then
+    case $host_os in
+#	linux*)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
+	*)	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+    esac
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x    ; then
+    case $host_os in
+	solaris*)	ADMIN_MAN_SUFFIX=1m ;;
+	*)		ADMIN_MAN_SUFFIX=8  ;;
+    esac
+fi
+if test x$ADMIN_MAN_DIR = x    ; then
+    ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-release-version or --without-release-version was given.
+if test "${with_release_version+set}" = set; then
+  withval="$with_release_version"
+  RELEASE_VERSION="$withval"
+else
+  RELEASE_VERSION=""
+fi;
+	if test "x$RELEASE_VERSION" != "x"; then
+		PACKAGE="$PACKAGE-$RELEASE_VERSION"
+		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+		{ echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
+echo "$as_me: Building with package name set to $PACKAGE" >&6;}
+	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, don't put newlines in cache variables' values.
+# 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.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *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 \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  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}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ 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[	 ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[	 ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[	 ]*$//;
+}'
+fi
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $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}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# 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
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  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
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # 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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by x11perf $as_me 1.4.1, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -q, --quiet      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
+  --header=FILE[:TEMPLATE]
+		   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+x11perf config.status 1.4.1
+configured by $0, generated by GNU Autoconf 2.59,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2003 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+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=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  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
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
+
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+_ACEOF
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  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+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@CYGPATH_W@,$CYGPATH_W,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s,@CCDEPMODE@,$CCDEPMODE,;t t
+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@SED@,$SED,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+s,@X11PERF_CFLAGS@,$X11PERF_CFLAGS,;t t
+s,@X11PERF_LIBS@,$X11PERF_LIBS,;t t
+s,@XRENDER_CFLAGS@,$XRENDER_CFLAGS,;t t
+s,@XRENDER_LIBS@,$XRENDER_LIBS,;t t
+s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
+s,@XFT_LIBS@,$XFT_LIBS,;t t
+s,@XEXT_CFLAGS@,$XEXT_CFLAGS,;t t
+s,@XEXT_LIBS@,$XEXT_LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@APP_MAN_SUFFIX@,$APP_MAN_SUFFIX,;t t
+s,@LIB_MAN_SUFFIX@,$LIB_MAN_SUFFIX,;t t
+s,@FILE_MAN_SUFFIX@,$FILE_MAN_SUFFIX,;t t
+s,@MISC_MAN_SUFFIX@,$MISC_MAN_SUFFIX,;t t
+s,@DRIVER_MAN_SUFFIX@,$DRIVER_MAN_SUFFIX,;t t
+s,@ADMIN_MAN_SUFFIX@,$ADMIN_MAN_SUFFIX,;t t
+s,@APP_MAN_DIR@,$APP_MAN_DIR,;t t
+s,@LIB_MAN_DIR@,$LIB_MAN_DIR,;t t
+s,@FILE_MAN_DIR@,$FILE_MAN_DIR,;t t
+s,@MISC_MAN_DIR@,$MISC_MAN_DIR,;t t
+s,@DRIVER_MAN_DIR@,$DRIVER_MAN_DIR,;t t
+s,@ADMIN_MAN_DIR@,$ADMIN_MAN_DIR,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+	cat >$tmp/stdin
+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  esac
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # 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.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+				     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+	 # Absolute (can't be DOS-style, as IFS=:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 echo "$f";;
+      *) # Relative
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_HEADER section.
+#
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+ac_dB='[	 ].*$,\1#\2'
+ac_dC=' '
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+ac_uB='$,\1#\2define\3'
+ac_uC=' '
+ac_uD=',;t'
+
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+	cat >$tmp/stdin
+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+	 # Absolute (can't be DOS-style, as IFS=:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 # Do quote $f, to prevent DOS paths from being IFS'd.
+	 echo "$f";;
+      *) # Relative
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+
+_ACEOF
+
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status.  Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\_ACEOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+t end
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+_ACEOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
+
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >>conftest.undefs <<\_ACEOF
+s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+_ACEOF
+
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null
+do
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines
+echo '  fi # grep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
+
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.undefs >/dev/null
+do
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
+  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+  rm -f conftest.undefs
+  mv conftest.tail conftest.undefs
+done
+rm -f conftest.undefs
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+  # 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.  */
+  if test x"$ac_file" = x-; then
+    echo "/* Generated by configure.  */" >$tmp/config.h
+  else
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+  fi
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if test x"$ac_file" != x-; then
+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+      rm -f $ac_file
+      mv $tmp/config.h $ac_file
+    fi
+  else
+    cat $tmp/config.h
+    rm -f $tmp/config.h
+  fi
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X$ac_file |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+	 X"$ac_dest" : 'X\(//\)$' \| \
+	 X"$ac_dest" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`(dirname "$mf") 2>/dev/null ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`(dirname "$file") 2>/dev/null ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    { if $as_mkdir_p; then
+    mkdir -p $dirpart/$fdir
+  else
+    as_dir=$dirpart/$fdir
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+  esac
+done
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+
+# 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 || { (exit 1); exit 1; }
+fi
+
diff --git a/app/x11perf/configure.ac b/app/x11perf/configure.ac
new file mode 100644
index 000000000..28f742376
--- /dev/null
+++ b/app/x11perf/configure.ac
@@ -0,0 +1,83 @@
+
+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT(x11perf,[1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x11perf)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+AC_PATH_PROG(SED,sed)
+if [[ -z $SED ]] ; then
+   AC_MSG_ERROR([sed is needed to build x11perf])
+fi
+
+AC_TYPE_SIGNAL
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(X11PERF, x11 xmuu)
+AC_SUBST(X11PERF_CFLAGS)
+AC_SUBST(X11PERF_LIBS)
+
+# Check for Xrender library
+PKG_CHECK_MODULES(XRENDER, xrender, [xrender_found=yes], [xrender_found=no])
+AC_SUBST(XRENDER_CFLAGS)
+AC_SUBST(XRENDER_LIBS)
+case "$xrender_found" in
+yes)
+	AC_DEFINE(XRENDER,1,[Xrender library available])
+	;;
+esac
+
+# Check for Xft library
+PKG_CHECK_MODULES(XFT, xft, [xft_found=yes], [xft_found=no])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
+case "$xft_found" in
+yes)
+	AC_DEFINE(XFT,1,[Xft library available])
+	;;
+esac
+
+# Check for MIT-SHM extension
+PKG_CHECK_MODULES(XEXT, xext, [xext_found=yes], [xext_found=no])
+AC_SUBST(XEXT_CFLAGS)
+AC_SUBST(XEXT_LIBS)
+case "$xext_found" in
+yes)
+	save_LIBS="$LIBS"
+	LIBS="$XEXT_LIBS $LIBS"
+	AC_CHECK_FUNCS([XShmQueryExtension], 
+		       AC_DEFINE(MITSHM, 1, [MIT-SHM extension available]))
+	LIBS="$save_LIBS"
+	;;
+esac
+
+XORG_MANPAGE_SECTIONS
+XORG_RELEASE_VERSION
+
+AC_OUTPUT([Makefile])
diff --git a/app/x11perf/depcomp b/app/x11perf/depcomp
new file mode 100644
index 000000000..edb5d38ef
--- /dev/null
+++ b/app/x11perf/depcomp
@@ -0,0 +1,479 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+if test -z "$depfile"; then
+   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+   dir=`echo "$object" | sed 's,/.*$,/,'`
+   if test "$dir" = "$object"; then
+      dir=
+   fi
+   # FIXME: should be _deps on DOS.
+   depfile="$dir.deps/$base"
+fi
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
diff --git a/app/x11perf/do_arcs.c b/app/x11perf/do_arcs.c
new file mode 100644
index 000000000..c01085f67
--- /dev/null
+++ b/app/x11perf/do_arcs.c
@@ -0,0 +1,499 @@
+/* $Xorg: do_arcs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
+
+#include "x11perf.h"
+
+static XArc *arcs;
+static GC   pgc;
+
+#define DegreesToX(degrees) (degrees * 64)
+
+static void 
+GenerateCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
+{
+    int     i;
+    int     rows;       /* Number of rows filled in current column	    */
+    int     x, y;       /* base of square to draw the circle in		    */
+    int     xorg, yorg; /* Used to get from column to column or row to row  */
+    int     size;
+    int     half;
+    int     startAngle, arcAngle;
+
+    if(ddashed)
+	pgc = xp->ddfggc;
+    else
+	pgc = xp->fggc;
+
+    size = p->special;
+    half = (size + 19) / 20;
+    arcs = (XArc *)malloc((p->objects) * sizeof(XArc));
+    x = xorg = half; y = yorg = half;
+    rows = 0;
+    startAngle = DegreesToX(0);
+    arcAngle = DegreesToX(360);
+
+    for (i = 0; i != p->objects; i++) {    
+	arcs[i].x = x;
+	arcs[i].y = y;
+	arcs[i].width = size;
+	arcs[i].height = size;
+	arcs[i].angle1 = startAngle;
+	arcs[i].angle2 = arcAngle;
+
+	if (partialArcs) {
+	    startAngle += DegreesToX(30);
+	    if (startAngle >= DegreesToX(360)) startAngle -= DegreesToX(360);
+	    arcAngle -= DegreesToX(20);
+	    if (arcAngle <= DegreesToX(0)) arcAngle += DegreesToX(360);
+	}
+
+	y += size + 1;
+	rows++;
+	if (y >= HEIGHT - size  - half || rows == MAXROWS) {
+	    /* Go to next column */
+	    rows = 0;
+	    x += size + 1;
+	    if (x >= WIDTH - size) {
+		yorg++;
+		if (yorg >= size + half || yorg >= HEIGHT - size - half) {
+		    yorg = half;
+		    xorg++;
+		    if (xorg >= size + half || xorg >= WIDTH - size - half) {
+			xorg = half;
+		    }
+		}
+		x = xorg;
+	    }
+	    y = yorg;
+	}
+    }
+}
+
+int 
+InitCircles(XParms xp, Parms p, int reps)
+{
+    GenerateCircles(xp, p, False, False);
+    return reps;
+}
+
+int 
+InitPartCircles(XParms xp, Parms p, int reps)
+{
+    GenerateCircles(xp, p, True, False);
+    return reps;
+}
+
+
+int 
+InitChordPartCircles(XParms xp, Parms p, int reps)
+{
+    GenerateCircles(xp, p, True, False);
+    XSetArcMode(xp->d, xp->bggc, ArcChord);
+    XSetArcMode(xp->d, xp->fggc, ArcChord);
+    return reps;
+}
+
+
+int 
+InitSlicePartCircles(XParms xp, Parms p, int reps)
+{
+    GenerateCircles(xp, p, True, False);
+    XSetArcMode(xp->d, xp->bggc, ArcPieSlice);
+    XSetArcMode(xp->d, xp->fggc, ArcPieSlice);
+    return reps;
+}
+
+static void
+GenerateWideCircles(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
+{
+    int	    size;
+
+    GenerateCircles(xp, p, partialArcs, ddashed);
+
+    size = p->special;
+    if(ddashed) {
+	XSetLineAttributes(xp->d, xp->ddbggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->ddfggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+    else {
+	XSetLineAttributes(xp->d, xp->bggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->fggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+}
+
+int 
+InitWideCircles(XParms xp, Parms p, int reps)
+{
+    GenerateWideCircles (xp, p, False, False);
+    return reps;
+}
+ 
+int 
+InitPartWideCircles(XParms xp, Parms p, int reps)
+{
+    GenerateWideCircles (xp, p, True, False);
+    return reps;
+}
+ 
+int 
+InitDashedCircles(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateCircles(xp, p, False, False);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->bggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->fggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDashedCircles(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    GenerateWideCircles(xp, p, False, False);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineOnOffDash;
+    XChangeGC(xp->d, xp->fggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitDoubleDashedCircles(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateCircles(xp, p, False, True);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->ddbggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->ddfggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDoubleDashedCircles(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    GenerateWideCircles(xp, p, False, True);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineDoubleDash;
+    XChangeGC(xp->d, xp->ddfggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->ddbggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+static void 
+GenerateEllipses(XParms xp, Parms p, int partialArcs, Bool ddashed)
+{
+    int     size;
+    int     half;
+    int     rows;       /* Number of rows filled in current column	    */
+    int     i;
+    int     x, y;	    /* base of square to draw ellipse in	    */
+    int     vsize, vsizeinc;
+    int     dir;
+    int     startAngle, arcAngle;
+
+    if(ddashed)
+	pgc = xp->ddfggc;
+    else
+	pgc = xp->fggc;
+
+    size = p->special;
+    half = (size + 19) / 20;
+    arcs = (XArc *)malloc((p->objects) * sizeof(XArc));
+    vsize = 1;
+    vsizeinc = (size - 1) / (p->objects - 1);
+    if (vsizeinc == 0) vsizeinc = 1;
+
+    x = half; y = half;
+    dir = 0;
+    rows = 0;
+    startAngle = DegreesToX(0);
+    arcAngle = DegreesToX(360);
+
+    for (i = 0; i != p->objects; i++) {    
+	arcs[i].x = x;
+	arcs[i].y = y;
+	if ((i & 1) ^ dir) {
+	    /* Make vertical axis longer */
+	    arcs[i].width = vsize;
+	    arcs[i].height = size;
+	} else {
+	    /* Make horizontal axis longer */
+	    arcs[i].width = size;
+	    arcs[i].height = vsize;
+	}
+	arcs[i].angle1 = startAngle;
+	arcs[i].angle2 = arcAngle;
+
+	if (partialArcs) {
+	    startAngle += DegreesToX(30);
+	    if (startAngle >= DegreesToX(360)) startAngle -= DegreesToX(360);
+	    arcAngle -= DegreesToX(20);
+	    if (arcAngle <= DegreesToX(0)) arcAngle += DegreesToX(360);
+	}
+
+	y += size + 1;
+	rows++;
+	if (y >= HEIGHT - size - half || rows == MAXROWS) {
+	    /* Go to next column */
+	    rows = 0;
+	    y = half;
+	    x += size + 1;
+	    if (x >= WIDTH - size - half) {
+		x = half;
+	    }
+	}
+	
+	vsize += vsizeinc;
+	if (vsize > size) {
+	    vsize -= size;
+	    dir = 1 - dir;
+	}
+    }
+}
+
+int 
+InitEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateEllipses(xp, p, False, False);
+    return reps;
+}
+
+
+int 
+InitPartEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateEllipses(xp, p, True, False);
+    return reps;
+}
+
+
+int 
+InitChordPartEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateEllipses(xp, p, True, False);
+    XSetArcMode(xp->d, xp->bggc, ArcChord);
+    XSetArcMode(xp->d, xp->fggc, ArcChord);
+    return reps;
+}
+
+
+int 
+InitSlicePartEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateEllipses(xp, p, True, False);
+    XSetArcMode(xp->d, xp->bggc, ArcPieSlice);
+    XSetArcMode(xp->d, xp->fggc, ArcPieSlice);
+    return reps;
+}
+
+
+static void
+GenerateWideEllipses(XParms xp, Parms p, Bool partialArcs, Bool ddashed)
+{
+    int size;
+
+    GenerateEllipses (xp, p, partialArcs, ddashed);
+    size = p->special;
+    if(ddashed) {
+	XSetLineAttributes(xp->d, xp->ddbggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->ddfggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+    else {
+	XSetLineAttributes(xp->d, xp->bggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->fggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+
+}
+
+int 
+InitWideEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateWideEllipses(xp, p, False, False);
+    return reps;
+}
+ 
+int 
+InitPartWideEllipses(XParms xp, Parms p, int reps)
+{
+    GenerateWideEllipses(xp, p, True, False);
+    return reps;
+}
+ 
+int 
+InitDashedEllipses(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateEllipses(xp, p, False, False);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->bggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->fggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDashedEllipses(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    GenerateWideEllipses(xp, p, False, False);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineOnOffDash;
+    XChangeGC(xp->d, xp->fggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitDoubleDashedEllipses(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateEllipses(xp, p, False, True);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->ddbggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->ddfggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDoubleDashedEllipses(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    GenerateWideEllipses(xp, p, False, True);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineDoubleDash;
+    XChangeGC(xp->d, xp->ddfggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->ddbggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+void 
+DoArcs(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != reps; i++) {
+        XDrawArcs(xp->d, xp->w, pgc, arcs, p->objects);
+        if (pgc == xp->ddbggc)
+            pgc = xp->ddfggc;
+        else if(pgc == xp->ddfggc)
+            pgc = xp->ddbggc;
+        else if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+DoFilledArcs(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != reps; i++) {
+        XFillArcs(xp->d, xp->w, pgc, arcs, p->objects);
+        if (pgc == xp->ddbggc)
+            pgc = xp->ddfggc;
+        else if(pgc == xp->ddfggc)
+            pgc = xp->ddbggc;
+        else if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndArcs(XParms xp, Parms p)
+{
+    free(arcs);
+}
+
diff --git a/app/x11perf/do_blt.c b/app/x11perf/do_blt.c
new file mode 100644
index 000000000..2d932552d
--- /dev/null
+++ b/app/x11perf/do_blt.c
@@ -0,0 +1,566 @@
+/* $Xorg: do_blt.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.8 2001/05/01 16:19:16 alanh Exp $ */
+
+#include "x11perf.h"
+#include <stdio.h>
+
+#define NUMPOINTS 100
+
+static Pixmap   pix;
+static XImage   *image;
+static XPoint   points[NUMPOINTS];
+static XSegment *segsa, *segsb;
+
+#define NegMod(x, y) ((y) - (((-x)-1) % (7)) - 1)
+
+static void 
+InitBltLines(void)
+{
+    int i, x, y;
+
+    points[0].x = points[0].y = y = 0;
+    for (i = 1; i != NUMPOINTS/2; i++) {    
+	if (i & 1) {
+	    points[i].x = WIDTH-1;
+	} else {
+	    points[i].x = 0;
+	}
+	y += HEIGHT / (NUMPOINTS/2);
+	points[i].y = y;
+    }
+    
+    x = 0;
+    for (i = NUMPOINTS/2; i!= NUMPOINTS; i++) {
+	if (i & 1) {
+	    points[i].y = HEIGHT-1;
+	} else {
+	    points[i].y = 0;
+	}
+	x += WIDTH / (NUMPOINTS/2);
+	points[i].x = x;
+    }
+}
+
+int 
+InitScroll(XParms xp, Parms p, int reps)
+{
+    InitBltLines();
+    XDrawLines(xp->d, xp->w, xp->fggc, points, NUMPOINTS, CoordModeOrigin);
+    return reps;
+}
+
+void 
+DoScroll(XParms xp, Parms p, int reps)
+{
+    int i, size, x, y, xorg, yorg, delta;
+
+    size = p->special;
+    xorg = 0;   yorg = 0;
+    x    = 0;   y    = 0;
+    if (xp->version == VERSION1_2) {
+	delta = 1;
+    } else {
+	/* Version 1.2 only scrolled up by 1 scanline, which made hardware
+	   using page-mode access to VRAM look better on paper than it would
+	   perform in a more realistic scroll.  So we've changed to scroll by
+	   the height of the 6x13 fonts. */
+	delta = 13;
+    }
+
+    for (i = 0; i != reps; i++) {
+	XCopyArea(xp->d, xp->w, xp->w, xp->fggc, x, y + delta,
+	    size, size, x, y);
+	y += size;
+	if (y + size + delta > HEIGHT) {
+	    yorg += delta;
+	    if (yorg >= size || yorg + size + delta > HEIGHT) {
+		yorg = 0;
+		xorg++;
+		if (xorg >= size || xorg + size > WIDTH) {
+		    xorg = 0;
+		}
+	    }
+	    y = yorg;
+	    x += size;
+	    if (x + size > WIDTH) {
+		x = xorg;
+	    }
+	}
+	CheckAbort ();
+    }
+}
+
+void 
+MidScroll(XParms xp, Parms p)
+{
+    XClearWindow(xp->d, xp->w);
+    XDrawLines(xp->d, xp->w, xp->fggc, points, NUMPOINTS, CoordModeOrigin);
+}
+
+void 
+EndScroll(XParms xp, Parms p)
+{
+}
+
+static void 
+InitCopyLocations(XParms xp, Parms p, int reps)
+{
+    int x1, y1, x2, y2, size, i;
+    int xinc, yinc;
+    int width, height;
+
+    /* Try to exercise all alignments of src and destination equally, as well
+       as all 4 top-to-bottom/bottom-to-top, left-to-right, right-to-left
+       copying directions.  Computation done here just to make sure slow
+       machines aren't measuring anything but the XCopyArea calls.
+    */
+    size = p->special;
+    xinc = (size & ~3) + 1;
+    yinc = xinc + 3;
+
+    width = (WIDTH - size) & ~31;
+    height = (HEIGHT - size) & ~31;
+    
+    x1 = 0;
+    y1 = 0;
+    x2 = width;
+    y2 = height;
+    
+    segsa = (XSegment *)malloc(reps * sizeof(XSegment));
+    segsb = (XSegment *)malloc(reps * sizeof(XSegment));
+    for (i = 0; i != reps; i++) {
+	segsa[i].x1 = x1;
+	segsa[i].y1 = y1;
+	segsa[i].x2 = x2;
+	segsa[i].y2 = y2;
+
+	/* Move x2, y2, location backward */
+	x2 -= xinc;
+	if (x2 < 0) {
+	    x2 = NegMod(x2, width);
+	    y2 -= yinc;
+	    if (y2 < 0) {
+		y2 = NegMod(y2, height);
+	    }
+	}
+
+	segsb[i].x1 = x1;
+	segsb[i].y1 = y1;
+	segsb[i].x2 = x2;
+	segsb[i].y2 = y2;
+
+	/* Move x1, y1 location forward */
+	x1 += xinc;
+	if (x1 > width) {
+	    x1 %= 32;
+	    y1 += yinc;
+	    if (y1 > height) {
+		y1 %= 32;
+	    }
+	}
+    } /* end for */
+}
+
+
+int 
+InitCopyWin(XParms xp, Parms p, int reps)
+{
+    (void) InitScroll(xp, p, reps);
+    InitCopyLocations(xp, p, reps);
+    return reps;
+}
+
+int 
+InitCopyPix(XParms xp, Parms p, int reps)
+{
+    GC		pixgc;
+    (void) InitCopyWin(xp, p, reps);
+
+    /* Create pixmap to write stuff into, and initialize it */
+    pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, xp->vinfo.depth);
+    pixgc = XCreateGC(xp->d, pix, 0, 0);
+    /* need a gc with GXcopy cos pixmaps contain junk on creation. mmm */
+    XCopyArea(xp->d, xp->w, pix, pixgc, 0, 0, WIDTH, HEIGHT, 0, 0);
+    XFreeGC(xp->d, pixgc);
+    return reps;
+}
+
+int 
+InitGetImage(XParms xp, Parms p, int reps)
+{
+    (void) InitCopyWin(xp, p, reps);
+
+    /* Create image to stuff bits into */
+    image = XGetImage(xp->d, xp->w, 0, 0, WIDTH, HEIGHT, xp->planemask,
+		      p->font==0?ZPixmap:XYPixmap);
+    if(image==0){
+	printf("XGetImage failed\n");
+	return False;
+    }	
+    return reps;
+}
+
+int 
+InitPutImage(XParms xp, Parms p, int reps)
+{
+    if(!InitGetImage(xp, p, reps))return False;
+    XClearWindow(xp->d, xp->w);
+    return reps;
+}
+
+static void 
+CopyArea(XParms xp, Parms p, int reps, Drawable src, Drawable dst)
+{
+    int i, size;
+    XSegment *sa, *sb;
+
+    size = p->special;
+    for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
+	XCopyArea(xp->d, src, dst, xp->fggc,
+	    sa->x1, sa->y1, size, size, sa->x2, sa->y2);
+	XCopyArea(xp->d, src, dst, xp->fggc,
+	    sa->x2, sa->y2, size, size, sa->x1, sa->y1);
+	XCopyArea(xp->d, src, dst, xp->fggc,
+	    sb->x2, sb->y2, size, size, sb->x1, sb->y1);
+	XCopyArea(xp->d, src, dst, xp->fggc,
+	    sb->x1, sb->y1, size, size, sb->x2, sb->y2);
+	CheckAbort ();
+    }
+}
+
+void 
+DoCopyWinWin(XParms xp, Parms p, int reps)
+{
+    CopyArea(xp, p, reps, xp->w, xp->w);
+}
+
+void 
+DoCopyPixWin(XParms xp, Parms p, int reps)
+{
+    CopyArea(xp, p, reps, pix, xp->w);
+}
+
+void 
+DoCopyWinPix(XParms xp, Parms p, int reps)
+{
+    CopyArea(xp, p, reps, xp->w, pix);
+    xp->p = pix;	/* HardwareSync will now sync on pixmap */
+}
+
+void 
+DoCopyPixPix(XParms xp, Parms p, int reps)
+{
+    CopyArea(xp, p, reps, pix, pix);
+    xp->p = pix;	/* HardwareSync will now sync on pixmap */
+}
+
+void 
+DoGetImage(XParms xp, Parms p, int reps)
+{
+    int i, size;
+    XSegment *sa, *sb;
+    int format;
+
+    size = p->special;
+    format = (p->font == 0) ? ZPixmap : XYPixmap;
+    for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
+	XDestroyImage(image);
+	image = XGetImage(xp->d, xp->w, sa->x1, sa->y1, size, size,
+	    xp->planemask, format);
+	if (image) XDestroyImage(image);
+	image = XGetImage(xp->d, xp->w, sa->x2, sa->y2, size, size,
+	    xp->planemask, format);
+	if (image) XDestroyImage(image);
+	image = XGetImage(xp->d, xp->w, sb->x2, sb->y2, size, size,
+	    xp->planemask, format);
+	if (image) XDestroyImage(image);
+	image = XGetImage(xp->d, xp->w, sb->x1, sb->y1, size, size,
+	    xp->planemask, format);
+/*
+
+One might expect XGetSubImage to be slightly faster than XGetImage.  Go look
+at the code in Xlib.  MIT X11R3 ran approximately 30 times slower for a 500x500
+rectangle.
+
+	(void) XGetSubImage(xp->d, xp->w, sa->x1, sa->y1, size, size,
+	    xp->planemask, ZPixmap, image, sa->x2, sa->y2);
+	(void) XGetSubImage(xp->d, xp->w, sa->x2, sa->y2, size, size,
+	    xp->planemask, ZPixmap, image, sa->x1, sa->y1);
+	(void) XGetSubImage(xp->d, xp->w, sb->x2, sb->y2, size, size,
+	    xp->planemask, ZPixmap, image, sb->x2, sb->y2);
+	(void) XGetSubImage(xp->d, xp->w, sb->x1, sb->y1, size, size,
+	    xp->planemask, ZPixmap, image, sb->x2, sb->y2);
+*/
+	CheckAbort ();
+    }
+}
+
+void 
+DoPutImage(XParms xp, Parms p, int reps)
+{
+    int i, size;
+    XSegment *sa, *sb;
+
+    size = p->special;
+    for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
+	XPutImage(xp->d, xp->w, xp->fggc, image,
+	    sa->x1, sa->y1, sa->x2, sa->y2, size, size);
+	XPutImage(xp->d, xp->w, xp->fggc, image,
+	    sa->x2, sa->y2, sa->x1, sa->y1, size, size);
+	XPutImage(xp->d, xp->w, xp->fggc, image,
+	    sb->x2, sb->y2, sb->x2, sb->y2, size, size);
+	XPutImage(xp->d, xp->w, xp->fggc, image,
+	    sb->x1, sb->y1, sb->x2, sb->y2, size, size);
+	CheckAbort ();
+    }
+}
+
+#ifdef MITSHM
+
+#include <sys/types.h>
+#ifndef Lynx
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#else
+#include <ipc.h>
+#include <shm.h>
+#endif
+#include <X11/extensions/XShm.h>
+
+static XImage		shm_image;
+static XShmSegmentInfo	shm_info;
+
+static int haderror;
+static int (*origerrorhandler)(Display *, XErrorEvent *);
+
+static int 
+shmerrorhandler(Display *d, XErrorEvent *e)
+{
+    haderror++;
+    if(e->error_code==BadAccess) {
+	fprintf(stderr,"failed to attach shared memory\n");
+	return 0;
+    } else 
+	return (*origerrorhandler)(d,e);
+}
+
+int 
+InitShmPutImage(XParms xp, Parms p, int reps)
+{
+    int	image_size;
+
+    if(!InitGetImage(xp, p, reps))return False;
+    if (!XShmQueryExtension(xp->d)) {
+	/*
+ 	 * Clean up here because cleanup function is not called if this
+	 * function fails
+	 */
+       	if (image)
+      	    XDestroyImage(image);
+    	image = NULL;
+    	free(segsa);
+    	free(segsb);
+    	return False;
+    }	
+    XClearWindow(xp->d, xp->w);
+    shm_image = *image;
+    image_size = image->bytes_per_line * image->height;
+    /* allow XYPixmap choice: */
+    if(p->font)image_size *= xp->vinfo.depth;
+    shm_info.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT|0777);
+    if (shm_info.shmid < 0)
+    {
+	/*
+	 * Clean up here because cleanup function is not called if this
+	 * function fails
+	 */
+	if (image)
+	    XDestroyImage(image);
+	image = NULL;
+	free(segsa);
+	free(segsb);
+	perror ("shmget");
+	return False;
+    }
+    shm_info.shmaddr = (char *) shmat(shm_info.shmid, 0, 0);
+    if (shm_info.shmaddr == ((char *) -1))
+    {
+	/*
+	 * Clean up here because cleanup function is not called if this
+	 * function fails
+	 */
+	if (image)
+	    XDestroyImage(image);
+	image = NULL;
+	free(segsa);
+	free(segsb);
+	perror ("shmat");
+	shmctl (shm_info.shmid, IPC_RMID, 0);
+	return False;
+    }
+    shm_info.readOnly = True;
+    XSync(xp->d,True);
+    haderror = False;
+    origerrorhandler = XSetErrorHandler(shmerrorhandler);
+    XShmAttach (xp->d, &shm_info);
+    XSync(xp->d,True);	/* wait for error or ok */
+    XSetErrorHandler(origerrorhandler);
+    if(haderror){
+	/*
+	 * Clean up here because cleanup function is not called if this
+	 * function fails
+	 */
+	if (image)
+	    XDestroyImage(image);
+	image = NULL;
+	free(segsa);
+	free(segsb);
+	if(shmdt (shm_info.shmaddr)==-1)
+	    perror("shmdt:");
+	if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1)
+	    perror("shmctl rmid:");
+	return False;
+    }
+    shm_image.data = shm_info.shmaddr;
+    memmove( shm_image.data, image->data, image_size);
+    shm_image.obdata = (char *) &shm_info;
+    return reps;
+}
+
+void 
+DoShmPutImage(XParms xp, Parms p, int reps)
+{
+    int i, size;
+    XSegment *sa, *sb;
+
+    size = p->special;
+    for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
+	XShmPutImage(xp->d, xp->w, xp->fggc, &shm_image,
+	    sa->x1, sa->y1, sa->x2, sa->y2, size, size, False);
+	XShmPutImage(xp->d, xp->w, xp->fggc, &shm_image,
+	    sa->x2, sa->y2, sa->x1, sa->y1, size, size, False);
+	XShmPutImage(xp->d, xp->w, xp->fggc, &shm_image,
+	    sb->x2, sb->y2, sb->x2, sb->y2, size, size, False);
+	XShmPutImage(xp->d, xp->w, xp->fggc, &shm_image,
+	    sb->x1, sb->y1, sb->x2, sb->y2, size, size, False);
+	CheckAbort ();
+    }
+}
+
+void 
+EndShmPutImage(XParms xp, Parms p)
+{
+
+    EndGetImage (xp, p);
+    XShmDetach (xp->d, &shm_info);
+    XSync(xp->d, False);	/* need server to detach so can remove id */
+    if(shmdt (shm_info.shmaddr)==-1)
+	perror("shmdt:");
+    if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1)
+	perror("shmctl rmid:");
+}
+
+#endif
+
+
+void 
+MidCopyPix(XParms xp, Parms p)
+{
+    XClearWindow(xp->d, xp->w);
+}
+
+void 
+EndCopyWin(XParms xp, Parms p)
+{
+    EndScroll(xp, p);
+    free(segsa);
+    free(segsb);
+}
+
+void 
+EndCopyPix(XParms xp, Parms p)
+{
+    EndCopyWin(xp, p);
+    XFreePixmap(xp->d, pix);
+    /*
+     * Ensure that the next test doesn't try and sync on the pixmap
+     */
+    xp->p = (Pixmap)0;
+}
+
+void 
+EndGetImage(XParms xp, Parms p)
+{
+    EndCopyWin(xp, p);
+    if (image) XDestroyImage(image);
+}
+
+int
+InitCopyPlane(XParms xp, Parms p, int reps)
+{
+    XGCValues   gcv;
+    GC		pixgc;
+
+    InitBltLines();
+    InitCopyLocations(xp, p, reps);
+
+    /* Create pixmap to write stuff into, and initialize it */
+    pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, 
+	    p->font==0 ? 1 : xp->vinfo.depth);
+    gcv.graphics_exposures = False;
+    gcv.foreground = 0;
+    gcv.background = 1;
+    pixgc = XCreateGC(xp->d, pix, 
+		GCForeground | GCBackground | GCGraphicsExposures, &gcv);
+    XFillRectangle(xp->d, pix, pixgc, 0, 0, WIDTH, HEIGHT);
+    gcv.foreground = 1;
+    gcv.background = 0;
+    XChangeGC(xp->d, pixgc, GCForeground | GCBackground, &gcv);
+    XDrawLines(xp->d, pix, pixgc, points, NUMPOINTS, CoordModeOrigin);
+    XFreeGC(xp->d, pixgc);
+
+    return reps;
+}
+
+void 
+DoCopyPlane(XParms xp, Parms p, int reps)
+{
+    int		i, size;
+    XSegment    *sa, *sb;
+
+    size = p->special;
+    for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
+	XCopyPlane(xp->d, pix, xp->w, xp->fggc,
+	    sa->x1, sa->y1, size, size, sa->x2, sa->y2, 1);
+	XCopyPlane(xp->d, pix, xp->w, xp->fggc,
+	    sa->x2, sa->y2, size, size, sa->x1, sa->y1, 1);
+	XCopyPlane(xp->d, pix, xp->w, xp->fggc,
+	    sb->x2, sb->y2, size, size, sb->x1, sb->y1, 1);
+	XCopyPlane(xp->d, pix, xp->w, xp->fggc,
+	    sb->x1, sb->y1, size, size, sb->x2, sb->y2, 1);
+	CheckAbort ();
+    }
+}
+
diff --git a/app/x11perf/do_complex.c b/app/x11perf/do_complex.c
new file mode 100644
index 000000000..1886da966
--- /dev/null
+++ b/app/x11perf/do_complex.c
@@ -0,0 +1,196 @@
+/* $Xorg: do_complex.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.8 2001/07/25 15:05:16 dawes Exp $ */
+
+#include "x11perf.h"
+
+#define NUM_POINTS 4    /* 4 points to an arrowhead */
+#define NUM_ANGLES 3    /* But mostly it looks like a triangle */
+static XPoint   *points;
+static GC       pgc;
+
+#include <math.h>
+#if defined(QNX4) || defined(__CYGWIN__) || defined(__UNIXOS2__)
+#define PI 3.14159265358979323846
+#else
+#define PI M_PI
+#endif /* QNX4 */
+
+int 
+InitComplexPoly(XParms xp, Parms p, int reps)
+{
+    int     i, j, numPoints;
+    int     x, y;
+    int     size, iradius;
+    double  phi, phiinc, radius, delta, phi2;
+    XPoint  *curPoint;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    phi = 0.0;
+    delta = 2.0 * PI / ((double) NUM_ANGLES);
+    if (xp->version == VERSION1_2) {
+	radius = ((double) size) * sqrt(3.0)/2.0;
+	phiinc = delta/10.0;
+    } else {
+	/* Version 1.2's radius computation was completely bogus, and resulted
+	   in triangles with sides about 50% longer than advertised.  Since
+	   in version 1.3 triangles are scaled to cover size^2 pixels, we do
+	   the same computation here.  The arrowheads are a little larger than
+	   simple triangles, because they lose 1/3 of their area due to the
+	   notch cut out from them, so radius has to be sqrt(3/2) larger than
+	   for simple triangles.
+	 */
+	radius = ((double) size) * sqrt(sqrt(4.0/3.0));
+	phiinc = 1.75*PI / ((double) p->objects);
+    }
+    iradius = (int) radius + 1;
+
+    numPoints = (p->objects) * NUM_POINTS;  
+    points = (XPoint *)malloc(numPoints * sizeof(XPoint));
+    curPoint = points;
+    x = iradius;
+    y = iradius;
+    for (i = 0; i != p->objects; i++) {
+	for (j = 0; j != NUM_ANGLES; j++) {
+	    phi2 = phi + ((double) j) * delta;
+	    curPoint->x = (int) ((double)x + (radius * cos(phi2)) + 0.5);
+	    curPoint->y = (int) ((double)y + (radius * sin(phi2)) + 0.5);
+	    curPoint++;
+	}
+	curPoint->x = x;
+	curPoint->y = y;
+	curPoint++;
+
+	phi += phiinc;
+	y += 2 * iradius;
+	if (y + iradius >= HEIGHT) {
+	    y = iradius;
+	    x += 2 * iradius;
+	    if (x + iradius >= WIDTH) {
+		x = iradius;
+	    }
+	}
+    }
+    return reps;
+}
+
+void 
+DoComplexPoly(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    XPoint  *curPoint;
+
+    for (i = 0; i != reps; i++) {
+        curPoint = points;
+        for (j = 0; j != p->objects; j++) {
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Complex, 
+			 CoordModeOrigin);
+            curPoint += NUM_POINTS;
+	  }
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndComplexPoly(XParms xp, Parms p)
+{
+    free(points);
+}
+
+int 
+InitGeneralPoly(XParms xp, Parms p, int reps)
+{
+    int     i, j, numPoints;
+    int	    nsides;
+    int	    x, y;
+    int     size, iradius;
+    double  phi, phiinc, inner_radius, outer_radius, delta, phi2;
+    XPoint  *curPoint;
+
+    pgc = xp->fggc;
+    size = p->special;
+    nsides = (long) p->font;
+    phi = 0.0;
+    delta = 2.0 * PI / ((double) nsides);
+    phiinc = delta / 10.0;
+
+    inner_radius = size / sqrt (nsides * tan (PI / nsides));
+    outer_radius = inner_radius / cos (PI / (2 * nsides));
+    numPoints = p->objects * nsides;
+    points = (XPoint *) malloc (numPoints * sizeof (XPoint));
+    curPoint = points;
+    iradius = outer_radius + 1;
+    x = iradius;
+    y = iradius;
+    for (i = 0; i < p->objects; i++) {
+	phi2 = phi;
+	for (j = 0; j < nsides; j++) {
+	    curPoint->x = x + (outer_radius * cos(phi2) + 0.5);
+	    curPoint->y = y + (outer_radius * sin(phi2) + 0.5);
+	    curPoint++;
+	    phi2 += delta;
+	}
+	phi += phiinc;
+	y += 2 * iradius;
+	if (y + iradius >= HEIGHT) {
+	    y = iradius;
+	    x += 2 * iradius;
+	    if (x + iradius >= WIDTH) {
+		x = iradius;
+	    }
+	}
+    }
+    return reps;
+}
+
+void 
+DoGeneralPoly(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    int	    nsides;
+    int	    mode;
+    XPoint  *curPoint;
+
+    nsides = (long) p->font;
+    mode = (long) p->bfont;
+    for (i = 0; i != reps; i++) {
+        curPoint = points;
+        for (j = 0; j != p->objects; j++) {
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, nsides, mode, 
+			 CoordModeOrigin);
+            curPoint += nsides;
+	  }
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
diff --git a/app/x11perf/do_dots.c b/app/x11perf/do_dots.c
new file mode 100644
index 000000000..26a429dcb
--- /dev/null
+++ b/app/x11perf/do_dots.c
@@ -0,0 +1,67 @@
+/* $Xorg: do_dots.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
+
+#include "x11perf.h"
+
+static XPoint   *points;
+static GC       pgc;
+
+int 
+InitDots(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    pgc = xp->fggc;
+
+    points = (XPoint *)malloc(p->objects * sizeof(XPoint));
+
+    for (i = 0; i != p->objects; i++) {
+	points[i].x = 2 * (i/MAXROWS);
+	points[i].y = 2 * (i%MAXROWS);
+    }
+    return reps;
+}
+
+void 
+DoDots(XParms xp, Parms p, int reps)
+{
+    int     i;
+
+    for (i = 0; i != reps; i++) {
+        XDrawPoints(xp->d, xp->w, pgc, points, p->objects, CoordModeOrigin);
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndDots(XParms xp, Parms p)
+{
+    free(points);
+}
+
diff --git a/app/x11perf/do_lines.c b/app/x11perf/do_lines.c
new file mode 100644
index 000000000..1469a0fc4
--- /dev/null
+++ b/app/x11perf/do_lines.c
@@ -0,0 +1,302 @@
+/* $Xorg: do_lines.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
+
+#include "x11perf.h"
+
+static XPoint   *points;
+static GC       pgc;
+
+static void 
+GenerateLines(XParms xp, Parms p, Bool ddashed)
+{
+    int size;
+    int half;		/* Half of width if wide line		        */
+    int i;
+    int     rows;       /* Number of rows filled in current column      */
+    int x, y;		/* Next point					*/
+    int xdir, ydir;	/* Which direction x, y are going		*/
+    int bigxdir;	
+    int x1 = 0, y1 = 0;	/* offsets to compute next point from current	*/
+    int phase;		/* how far into 0..4*(size_1) we are		*/
+    float phasef;       /* how far we are in real numbers		*/
+    float phaseinc;     /* how much to increment phasef at each segment */
+    int size4;		/* 4 * size					*/
+
+    if(ddashed)
+	pgc = xp->ddfggc;
+    else
+	pgc = xp->fggc;
+
+    size = p->special;
+    size4 = 4 * (size+1);
+    half = (size + 19) / 20;
+
+    points = (XPoint *)malloc((p->objects+1) * sizeof(XPoint));
+
+    /* All this x, x1, x1inc, etc. stuff is to create a pattern that
+	(1) scans down the screen vertically
+
+	(2) rotates the endpoints through all possible orientations
+
+	(3) bounces off bottom and top of window as needed
+
+	(4) moves left or right at each bounce to make things less boring
+    */
+
+    x     = half;
+    y     = half;
+    xdir  = 1;
+    ydir  = 1;
+    bigxdir = 1;
+    phasef = 0.0;
+    phaseinc = ((float)size4) / ((float)p->objects);
+    if (phaseinc < 1.0) phaseinc = 1.0;
+    rows = 0;
+
+    points[0].x = x;
+    points[0].y = y;
+
+    for (i = 1; i != (p->objects+1); i++) {    
+	phase = phasef;
+	switch (phase / (size+1)) {
+	case 0:
+	    x1 = size;			
+	    y1 = phase;
+	    break;
+
+	case 1:
+	    x1 = size - phase % (size+1);
+	    y1 = size;
+	    break;
+
+	case 2:
+	    x1 = phase % (size+1);
+	    y1 = size;
+	    break;
+
+	case 3:
+	    x1 = size;
+	    y1 = size - phase % (size+1);
+	    break;
+	} /* end switch */
+
+	/* Move down or up the screen */
+	y += (ydir * y1);
+
+	/* If off either top or bottom, backtrack to previous position and go
+	   the other way instead.  Also move in bigxdir if not already. */
+	rows++;
+	if (y < half || y >= (HEIGHT-half) || rows > MAXROWS) {
+	    rows = 0;
+	    if (bigxdir > 0) {
+		if (x + size < WIDTH - half) {
+		    xdir = 1;
+		} else {
+		    bigxdir = -1;
+		}
+	    } else {
+		if (x - size > half) {
+		    xdir = -1;
+		} else {
+		    bigxdir = 1;
+		}
+	    }
+	    ydir = -ydir;
+	    y += (2 * ydir * y1);
+	    /* If still off top or bottom, we can't do the line we want.
+	       This will happen infrequently if the window is not twice the
+	       length of the line.  So instead, let's draw a line that puts
+	       the line after this approximately through the center of the
+	       window.   Since it is very unlikely that both x and y will
+	       need such adjustment, line length (in pixels) should not
+	       change...we just can't get the slope we want for this line. */
+	    if (y < half) {
+		y = (HEIGHT - y1)/2;
+		ydir = 1;
+	    } else if (y > (HEIGHT - half)) {
+		y = (HEIGHT + y1)/2;
+		ydir = -1;
+	    }
+	}
+
+	/* Move x left or right by x1 */
+	x += (xdir * x1);
+	xdir = -xdir;
+	/* Again, if we are off the bottom then we can't really draw the line
+	   we want.  */
+	if (x < half) {
+	    x = (WIDTH - x1)/2;
+	    xdir = 1;
+	} else if (x > (WIDTH - half)) {
+	    x = (WIDTH + x1)/2;
+	    xdir = -1;
+	}
+	points[i].x = x;
+	points[i].y = y;
+
+	/* Increment phasef */
+	phasef += phaseinc;
+	if (phasef >= size4) phasef -= size4;
+
+    }
+}
+ 
+int 
+InitLines(XParms xp, Parms p, int reps)
+{
+    GenerateLines(xp, p, False);
+	return reps;
+}
+
+static int 
+GenerateWideLines(XParms xp, Parms p, int reps, Bool ddashed)
+{
+    int size;
+
+    GenerateLines(xp, p, ddashed);
+
+    size = p->special;
+    if(ddashed) {
+	XSetLineAttributes(xp->d, xp->ddbggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->ddfggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+    else {
+	XSetLineAttributes(xp->d, xp->bggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+	XSetLineAttributes(xp->d, xp->fggc, (int) ((size + 9) / 10),
+	    LineSolid, CapRound, JoinRound);
+    }
+
+    return reps;
+}
+
+int 
+InitWideLines(XParms xp, Parms p, int reps)
+{
+    return GenerateWideLines(xp, p, reps, False);
+}
+ 
+int 
+InitDashedLines(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateLines(xp, p, False);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->bggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->fggc, 0, LineOnOffDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDashedLines(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    (void)GenerateWideLines(xp, p, reps, False);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineOnOffDash;
+    XChangeGC(xp->d, xp->fggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitDoubleDashedLines(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateLines(xp, p, True);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes(xp->d, xp->ddbggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    XSetLineAttributes(xp->d, xp->ddfggc, 0, LineDoubleDash, CapButt, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitWideDoubleDashedLines(XParms xp, Parms p, int reps)
+{
+    int		size;
+    XGCValues   gcv;
+    char	dashes[2];
+
+    (void)GenerateWideLines(xp, p, reps, True);
+    size = p->special;
+    size = (size + 9) / 10;
+
+    /* Modify GCs to draw dashed */
+    dashes[0] = 2*size;   dashes[1] = 2*size;
+    gcv.line_style = LineDoubleDash;
+    XChangeGC(xp->d, xp->ddfggc, GCLineStyle, &gcv);
+    XChangeGC(xp->d, xp->ddbggc, GCLineStyle, &gcv);
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+void 
+DoLines(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != reps; i++)
+    {
+        XDrawLines(xp->d, xp->w, pgc, points, p->objects+1, CoordModeOrigin);
+        if (pgc == xp->ddbggc)
+            pgc = xp->ddfggc;
+        else if(pgc == xp->ddfggc)
+            pgc = xp->ddbggc;
+        else if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndLines(XParms xp, Parms p)
+{
+    free(points);
+}
+
diff --git a/app/x11perf/do_movewin.c b/app/x11perf/do_movewin.c
new file mode 100644
index 000000000..ed25d7f08
--- /dev/null
+++ b/app/x11perf/do_movewin.c
@@ -0,0 +1,207 @@
+/* $Xorg: do_movewin.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
+
+#include "x11perf.h"
+
+static Window *children;
+static XPoint *positions;
+static Window cover;
+static int rows;
+static int x_offset, y_offset;  /* Private global data for DoMoveWindows */
+static int xmax, ymax;
+static int delta1;		/* Private global data for DoResizeWindows */
+
+#define STACK (4*(HEIGHT-10)/CHILDSIZE)
+
+int 
+InitMoveWindows(XParms xp, Parms p, int reps)
+{
+    int     i = 0;
+
+    rows = (p->objects + MAXCOLS - 1) / MAXCOLS;
+    
+    x_offset = 0;
+    y_offset = 0;
+    delta1   = 1;
+
+    children = (Window *) malloc (p->objects*sizeof (Window));
+    positions = (XPoint *) malloc(p->objects*sizeof(XPoint));
+
+    xmax = (CHILDSIZE+CHILDSPACE) * (rows > 1 ? MAXCOLS : p->objects);
+    ymax = rows * (CHILDSIZE+CHILDSPACE);
+
+    for (i = 0; i != p->objects; i++) {
+	positions[i].x = (CHILDSIZE+CHILDSPACE) * (i/rows) + CHILDSPACE/2;
+	positions[i].y = (CHILDSIZE+CHILDSPACE) * (i%rows) + CHILDSPACE/2;
+	children[i] = XCreateSimpleWindow(xp->d, xp->w,
+	    positions[i].x, positions[i].y,
+	    CHILDSIZE, CHILDSIZE, 0, xp->foreground, xp->foreground);
+    }
+    if (p->special)
+	XMapSubwindows (xp->d, xp->w);
+    return reps;
+}
+
+void 
+DoMoveWindows(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+
+    for (i = 0; i != reps; i++) {
+	x_offset += 1;
+	y_offset += 3;
+	if (y_offset + ymax > HEIGHT)
+	    y_offset = 0;
+	if (x_offset + xmax > WIDTH)
+	    x_offset = 0;
+	for (j = 0; j != p->objects; j++) {
+	    XMoveWindow(xp->d, children[j],
+	    positions[j].x + x_offset, positions[j].y + y_offset);
+	}
+	CheckAbort ();
+    }
+}
+
+void 
+EndMoveWindows(XParms xp, Parms p)
+{
+    free(children);
+    free(positions);
+}
+
+void 
+DoResizeWindows(XParms xp, Parms p, int reps)
+{
+    int     i, j, delta2;
+
+    for (i = 0; i != reps; i++) {
+	delta1 = -delta1;
+	delta2 = delta1;
+	for (j = 0; j != p->objects; j++) {
+	    delta2 = -delta2;
+	    XResizeWindow(xp->d, children[j],
+		CHILDSIZE+delta2, CHILDSIZE-delta2);
+	}
+	CheckAbort ();
+    }
+}
+
+int
+InitCircWindows(XParms xp, Parms p, int reps)
+{
+    int     i;
+    int     pos;
+    int     color;
+
+    children = (Window *) malloc (p->objects * sizeof (Window));
+    for (i = 0; i != p->objects; i++) {
+	pos = i % STACK;
+	color = (i & 1 ? xp->foreground : xp->background);
+	children[i] = XCreateSimpleWindow (xp->d, xp->w, 
+	    pos*CHILDSIZE/4 + (i/STACK)*2*CHILDSIZE, pos*CHILDSIZE/4,
+	    CHILDSIZE, CHILDSIZE, 0, color, color);
+    }
+    if (p->special)
+	XMapSubwindows (xp->d, xp->w);
+    return reps;
+}
+
+void 
+DoCircWindows(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+
+    for (i = 0; i != reps; i++)
+    {
+	for (j = 0; j != p->objects; j++)
+	    XCirculateSubwindows (xp->d, xp->w, RaiseLowest);
+	CheckAbort ();
+    }
+}
+
+void 
+EndCircWindows(XParms xp, Parms p)
+{
+    free(children);
+}
+
+
+int 
+InitMoveTree(XParms xp, Parms p, int reps)
+{
+    int     i = 0;
+
+    rows = (p->objects + MAXCOLS - 1) / MAXCOLS;
+    
+    x_offset = 0;
+    y_offset = 0;
+    delta1   = 1;
+
+    children = (Window *) malloc (p->objects*sizeof (Window));
+    positions = (XPoint *) malloc(p->objects*sizeof(XPoint));
+
+    xmax = (CHILDSIZE+CHILDSPACE) * (rows > 1 ? MAXCOLS : p->objects);
+    ymax = rows * (CHILDSIZE+CHILDSPACE);
+
+    cover = XCreateSimpleWindow(xp->d, xp->w,
+				0, 0, xmax, ymax, 0,
+				xp->background, xp->background);
+				
+    for (i = 0; i != p->objects; i++) {
+	positions[i].x = (CHILDSIZE+CHILDSPACE) * (i/rows) + CHILDSPACE/2;
+	positions[i].y = (CHILDSIZE+CHILDSPACE) * (i%rows) + CHILDSPACE/2;
+	children[i] = XCreateSimpleWindow(xp->d, cover,
+	    positions[i].x, positions[i].y,
+	    CHILDSIZE, CHILDSIZE, 0, xp->foreground, xp->foreground);
+    }
+    XMapSubwindows (xp->d, cover);
+    XMapWindow (xp->d, cover);
+    return reps;
+}
+
+void 
+DoMoveTree(XParms xp, Parms p, int reps)
+{
+    int     i;
+
+    for (i = 0; i != reps; i++) {
+	x_offset += 1;
+	y_offset += 3;
+	if (y_offset + ymax > HEIGHT)
+	    y_offset = 0;
+	if (x_offset + xmax > WIDTH)
+	    x_offset = 0;
+	XMoveWindow(xp->d, cover, x_offset, y_offset);
+	CheckAbort ();
+    }
+}
+
+void 
+EndMoveTree(XParms xp, Parms p)
+{
+    XDestroyWindow(xp->d, cover);
+    free(children);
+    free(positions);
+}
diff --git a/app/x11perf/do_rects.c b/app/x11perf/do_rects.c
new file mode 100644
index 000000000..65b8acbef
--- /dev/null
+++ b/app/x11perf/do_rects.c
@@ -0,0 +1,123 @@
+/* $Xorg: do_rects.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.4 2000/11/29 08:58:19 keithp Exp $ */
+
+#include "x11perf.h"
+#include "bitmaps.h"
+
+static XRectangle   *rects;
+static GC	    pgc;
+
+int 
+InitRectangles(XParms xp, Parms p, int reps)
+{
+    int i;
+    int size = p->special;
+    int step;
+    int x, y;
+    int rows;
+    int	lw = 0;
+
+    pgc = xp->fggc;
+
+    if (p->bfont)
+    {
+	lw = atoi (p->bfont);
+
+	XSetLineAttributes(xp->d, xp->bggc, lw, LineSolid, CapButt, JoinMiter);
+	XSetLineAttributes(xp->d, xp->fggc, lw, LineSolid, CapButt, JoinMiter);
+	lw = (lw >> 1) + 1;
+    }
+
+    rects = (XRectangle *)malloc(p->objects * sizeof(XRectangle));
+    x = lw;
+    y = lw;
+    rows = 0;
+    if (xp->pack) {
+	/* Pack rectangles as close as possible, mainly for debugging faster
+	   tiling, stippling routines in a server */
+	step = size;
+    } else {
+	/* Try to exercise all alignments...any odd number is okay */
+	step = size + 1 + (size % 2);
+    }
+
+    for (i = 0; i != p->objects; i++) {
+	rects[i].x = x;
+        rects[i].y = y;
+	rects[i].width = rects[i].height = size;
+
+	y += step;
+	rows++;
+	if (y + size > HEIGHT || rows == MAXROWS) {
+	    rows = 0;
+	    y = lw;
+	    x += step;
+	    if (x + size > WIDTH) {
+		x = lw;
+	    }
+	}
+    }
+
+    SetFillStyle(xp, p);
+
+    return reps;
+}
+
+void 
+DoRectangles(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != reps; i++) {
+        XFillRectangles(xp->d, xp->w, pgc, rects, p->objects);
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+DoOutlineRectangles(XParms xp, Parms  p, int reps)
+{
+    int	i;
+
+    for (i = 0; i != reps; i++) {
+	XDrawRectangles (xp->d, xp->w, pgc, rects, p->objects);
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndRectangles(XParms xp, Parms p)
+{
+    free(rects);
+}
+
diff --git a/app/x11perf/do_segs.c b/app/x11perf/do_segs.c
new file mode 100644
index 000000000..a1352d74e
--- /dev/null
+++ b/app/x11perf/do_segs.c
@@ -0,0 +1,385 @@
+/* $Xorg: do_segs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
+
+#include "x11perf.h"
+
+static XSegment *segments;
+static GC       pgc;
+
+static void 
+GenerateSegments(XParms xp, Parms p, Bool ddashed)
+{
+    int     size;
+    int     half;
+    int     i;
+    int     rows;	    /* Number of rows filled in current column      */
+    int     x, y;	    /* base of square to draw in		    */
+    int     x1=0, y1=0, x2=0, y2=0; /* offsets into square		    */
+    int     phase;	    /* how far into 0..8*size we are		    */
+    int     phaseinc;       /* how much to increment phase at each segment  */
+    int     size8;	    /* 8 * size					    */
+    XGCValues   gcv;
+
+    if(ddashed)
+	pgc = xp->ddfggc;
+    else
+	pgc = xp->fggc;
+
+
+    size = p->special;
+    size8 = 8 * size;
+    half = (size + 19) / 20;
+
+    segments = (XSegment *)malloc((p->objects) * sizeof(XSegment));
+
+    /* All this x, x1, etc. stuff is to create a pattern that
+	(1) scans down the screen vertically, with each new segment going
+	    into a square of size^2.
+
+	(2) rotates the endpoints clockwise around the square
+
+	(3) rotates by ``large'' steps if we aren't going to paint enough
+	    segments to get full coverage
+
+	(4) uses CapNotLast so we can create segments of length 1 that
+	    nonetheless have a distinct direction
+    */
+
+    x     = half;  y     = half;
+    phase = 0;
+    phaseinc = size8 / p->objects;
+    if (phaseinc == 0) phaseinc = 1;
+    rows = 0;
+
+    for (i = 0; i != p->objects; i++) {    
+	switch (phase / size) {
+	case 0:
+	    x1 = 0;
+	    y1 = 0;
+	    x2 = size;
+	    y2 = phase;
+	    break;
+
+	case 1:
+	    x1 = phase % size;    
+	    y1 = 0;
+	    x2 = size;
+	    y2 = size;
+	    break;
+
+	case 2:
+	    x1 = size;
+	    y1 = 0;
+	    x2 = size - phase % size;
+	    y2 = size;
+	    break;
+
+	case 3:
+	    x1 = size;
+	    y1 = phase % size;
+	    x2 = 0;
+	    y2 = size;
+	    break;
+
+	case 4:
+	    x1 = size;
+	    y1 = size;
+	    x2 = 0;
+	    y2 = size - phase % size;
+	    break;
+
+	case 5:
+	    x1 = size - phase % size;
+	    y1 = size;
+	    x2 = 0;
+	    y2 = 0;
+	    break;
+
+	case 6:
+	    x1 = 0;
+	    y1 = size;
+	    x2 = phase % size;
+	    y2 = 0;
+	    break;
+
+	case 7:
+	    x1 = 0;
+	    y1 = size - phase % size;
+	    x2 = size;
+	    y2 = 0;
+	    break;
+	} /* end switch */
+
+	segments[i].x1 = x + x1;
+	segments[i].y1 = y + y1;
+	segments[i].x2 = x + x2;
+	segments[i].y2 = y + y2;
+
+	/* Change square to draw segment in */
+	rows++;
+	y += size;
+	if (y >= HEIGHT - size - half || rows == MAXROWS) {
+	    /* Go to next column */
+	    rows = 0;
+	    y = half;
+	    x += size;
+	    if (x >= WIDTH - size - half) {
+		x = half;
+	    }
+	}
+
+	/* Increment phase */
+	phase += phaseinc;
+	if (phase >= size8) phase -= size8;
+
+    }
+
+    gcv.cap_style = CapNotLast;
+
+    if(ddashed) {
+	XChangeGC(xp->d, xp->ddfggc, GCCapStyle, &gcv);
+	XChangeGC(xp->d, xp->ddbggc, GCCapStyle, &gcv);
+    } else {
+	XChangeGC(xp->d, xp->fggc, GCCapStyle, &gcv);
+	XChangeGC(xp->d, xp->bggc, GCCapStyle, &gcv);
+    }
+}
+   
+int 
+InitSegments(XParms xp, Parms p, int reps)
+{
+    GenerateSegments(xp, p, False);
+    return reps;
+}
+
+int 
+InitDashedSegments(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateSegments(xp, p, False);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes
+	(xp->d, xp->bggc, 0, LineOnOffDash, CapNotLast, JoinMiter);
+    XSetLineAttributes
+	(xp->d, xp->fggc, 0, LineOnOffDash, CapNotLast, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->fggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->bggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitDoubleDashedSegments(XParms xp, Parms p, int reps)
+{
+    char dashes[2];
+
+    GenerateSegments(xp, p, True);
+
+    /* Modify GCs to draw dashed */
+    XSetLineAttributes
+	(xp->d, xp->ddbggc, 0, LineDoubleDash, CapNotLast, JoinMiter);
+    XSetLineAttributes
+	(xp->d, xp->ddfggc, 0, LineDoubleDash, CapNotLast, JoinMiter);
+    dashes[0] = 3;   dashes[1] = 2;
+    XSetDashes(xp->d, xp->ddfggc, 0, dashes, 2);
+    XSetDashes(xp->d, xp->ddbggc, 0, dashes, 2);
+    return reps;
+}
+
+int 
+InitHorizSegments(XParms xp, Parms p, int reps)
+{
+    int     size;
+    int     half;
+    int     i;
+    int     rows;       /* Number of rows filled in current column      */
+    int     x, y;	/* base of square to draw in			*/
+    int     y1;		/* y position inside square			*/
+    int     inc;
+    XGCValues   gcv;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    half = (size + 19) / 20;
+
+    segments = (XSegment *)malloc((p->objects) * sizeof(XSegment));
+
+    x = half;
+    y = half;
+    y1 = 0;
+    rows = 0;
+    inc = size / p->objects;
+    if (inc == 0) inc = 1;
+
+    for (i = 0; i != p->objects; i++) {
+	if (i % 2) {
+	    segments[i].x1 = x + size;
+	    segments[i].x2 = x;
+	    segments[i].y1 = y + size - y1;
+	    segments[i].y2 = y + size - y1;
+	    y1 += inc;
+	    if (y1 >= size) y1 -= size;
+	} else {
+	    segments[i].x1 = x;
+	    segments[i].x2 = x + size;
+	    segments[i].y1 = y + y1;
+	    segments[i].y2 = y + y1;
+	}
+	rows++;
+	y += size;
+	if (y >= HEIGHT - size - half || rows == MAXROWS) {
+	    rows = 0;
+	    y = half;
+	    x += size;
+	    if (x >= WIDTH - size - half)
+		x = half;
+	}
+    }
+    gcv.cap_style = CapNotLast;
+    XChangeGC(xp->d, xp->fggc, GCCapStyle, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCCapStyle, &gcv);
+    return reps;
+}
+
+int 
+InitWideHorizSegments(XParms xp, Parms p, int reps)
+{
+    int size;
+
+    (void)InitHorizSegments(xp, p, reps);
+
+    size = p->special;
+    XSetLineAttributes(xp->d, xp->bggc, (int) ((size + 9) / 10),
+	LineSolid, CapRound, JoinRound);
+    XSetLineAttributes(xp->d, xp->fggc, (int) ((size + 9) / 10),
+	LineSolid, CapRound, JoinRound);
+
+    return reps;
+}
+ 
+
+int 
+InitVertSegments(XParms xp, Parms p, int reps)
+{
+    int     size;
+    int     half;
+    int     i;
+    int     rows;       /* Number of rows filled in current column      */
+    int     x, y;	/* base of square to draw in			*/
+    int     x1;		/* x position inside square			*/
+    int     inc;
+    XGCValues   gcv;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    half = (size + 19) / 20;
+
+    segments = (XSegment *)malloc((p->objects) * sizeof(XSegment));
+
+    x = half;
+    y = half;
+    x1 = 0;
+    rows = 0;
+    inc = size / p->objects;
+    if (inc == 0) inc = 1;
+
+    for (i = 0; i != p->objects; i++) {
+	if (i % 2) {
+	    segments[i].x1 = x + size - x1;
+	    segments[i].x2 = x + size - x1;
+	    segments[i].y1 = y + size;
+	    segments[i].y2 = y;
+	    x1 += inc;
+	    if (x1 >= size) x1 -= size;
+	} else {
+	    segments[i].x1 = x + x1;
+	    segments[i].x2 = x + x1;
+	    segments[i].y1 = y;
+	    segments[i].y2 = y + size;
+	}
+	rows++;
+	y += size;
+	if (y >= HEIGHT - size - half || rows == MAXROWS) {
+	    /* Go to next column */
+	    rows = 0;
+	    y = half;
+	    x += size;
+	    if (x >= WIDTH - size - half) {
+		x = half;
+	    }
+	}
+    }
+    gcv.cap_style = CapNotLast;
+    XChangeGC(xp->d, xp->fggc, GCCapStyle, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCCapStyle, &gcv);
+    return reps;
+}
+
+int 
+InitWideVertSegments(XParms xp, Parms p, int reps)
+{
+    int size;
+
+    (void)InitVertSegments(xp, p, reps);
+
+    size = p->special;
+    XSetLineAttributes(xp->d, xp->bggc, (int) ((size + 9) / 10),
+	LineSolid, CapRound, JoinRound);
+    XSetLineAttributes(xp->d, xp->fggc, (int) ((size + 9) / 10),
+	LineSolid, CapRound, JoinRound);
+
+    return reps;
+}
+ 
+
+void 
+DoSegments(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != reps; i++) {
+        XDrawSegments(xp->d, xp->w, pgc, segments, p->objects);
+        if (pgc == xp->ddbggc)
+            pgc = xp->ddfggc;
+        else if(pgc == xp->ddfggc)
+            pgc = xp->ddbggc;
+        else if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndSegments(XParms xp, Parms p)
+{
+    free(segments);
+}
+
diff --git a/app/x11perf/do_simple.c b/app/x11perf/do_simple.c
new file mode 100644
index 000000000..2852f7a74
--- /dev/null
+++ b/app/x11perf/do_simple.c
@@ -0,0 +1,109 @@
+/* $Xorg: do_simple.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.6tsi Exp $ */
+
+#ifndef VMS
+#include <X11/Xatom.h>
+#else
+#include <decw$include/Xatom.h>
+#endif
+
+#include "x11perf.h"
+
+static Atom XA_PK_TEMP;
+
+void 
+DoNoOp(XParms xp, Parms p, int reps)
+{
+    int     i;
+
+    for (i = 0; i != reps; i++) {
+	XNoOp(xp->d);
+	CheckAbort ();
+    }
+}
+
+
+void 
+DoGetAtom(XParms xp, Parms p, int reps)
+{
+    char    *atom;
+    int     i;
+
+    for (i = 0; i != reps; i++) {
+	atom = XGetAtomName (xp->d, 1);
+ 	XFree(atom); /* fix XBUG 6480 */
+	CheckAbort ();
+    }
+}
+
+void 
+DoQueryPointer(XParms xp, Parms p, int reps)
+{
+    int     i;
+    Window  w;
+    int     x;
+    unsigned int m;
+
+    for (i = 0; i != reps; i++) {
+	XQueryPointer (xp->d, xp->w, &w, &w, &x, &x, &x, &x, &m);
+	CheckAbort ();
+    }
+}
+
+int 
+InitGetProperty(XParms xp, Parms p, int reps)
+{
+    long foo[4];
+
+    foo[0] = 41;
+    foo[1] = 14;
+    foo[2] = 37;
+    foo[3] = 73;
+    XA_PK_TEMP = XInternAtom (xp->d, "_PK_TEMP", False);
+    XChangeProperty (
+	    xp->d, xp->w, XA_PK_TEMP, XA_INTEGER, 32,
+	    PropModeReplace, (unsigned char *)foo, 4);
+    return reps;
+}
+
+void 
+DoGetProperty(XParms xp, Parms p, int reps)
+{
+    int     i;
+    int     actual_format;
+    unsigned long actual_length, bytes_remaining;
+    unsigned char *prop;
+    
+    Atom actual_type;
+
+    for (i = 0; i != reps; i++) {
+	XGetWindowProperty (
+		xp->d, xp->w, XA_PK_TEMP, 0, 4,
+		False, AnyPropertyType, &actual_type, &actual_format,
+		&actual_length, &bytes_remaining, &prop);
+	CheckAbort ();
+	XFree(prop);
+    }
+}
diff --git a/app/x11perf/do_tests.c b/app/x11perf/do_tests.c
new file mode 100644
index 000000000..378ea838a
--- /dev/null
+++ b/app/x11perf/do_tests.c
@@ -0,0 +1,1316 @@
+/* $Xorg: do_tests.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.9 2002/05/13 05:27:37 keithp Exp $ */
+
+#include "x11perf.h"
+
+/*
+ * some test must be done a certain multiple of times. That multiple is
+ * in the second half of the products below. You can edit the multiplier,
+ * just not the multiplicand.
+ */
+
+Test test[] = {
+  {"-dot",      "Dot", NULL,
+		InitDots, DoDots, NullProc, EndDots,
+		V1_2FEATURE, ROP, 0,
+		{POLY}},
+  {"-rect1",    "1x1 rectangle", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillSolid}},
+  {"-rect10",   "10x10 rectangle", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillSolid}},
+  {"-rect100",  "100x100 rectangle", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{36, 100, NULL, NULL, FillSolid}},
+  {"-rect500",  "500x500 rectangle", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{1, 500, NULL, NULL, FillSolid}},
+  {"-srect1",  "1x1 stippled rectangle",
+		"1x1 stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillStippled}},
+  {"-srect10", "10x10 stippled rectangle",
+		"10x10 stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillStippled}},
+  {"-srect100", "100x100 stippled rectangle",
+		"100x100 stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{36, 100, NULL, NULL, FillStippled}},
+  {"-srect500", "500x500 stippled rectangle",
+		"500x500 stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{1, 500, NULL, NULL, FillStippled}},
+  {"-osrect1",  "1x1 opaque stippled rectangle",
+		"1x1 opaque stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillOpaqueStippled}},
+  {"-osrect10", "10x10 opaque stippled rectangle",
+		"10x10 opaque stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillOpaqueStippled}},
+  {"-osrect100", "100x100 opaque stippled rectangle",
+		"100x100 opaque stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{36, 100, NULL, NULL, FillOpaqueStippled}},
+  {"-osrect500", "500x500 opaque stippled rectangle",
+		"500x500 opaque stippled rectangle (8x8 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{1, 500, NULL, NULL, FillOpaqueStippled}},
+  {"-tilerect1", "1x1 4x4 tiled rectangle",
+		"1x1 tiled rectangle (4x4 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillTiled}},
+  {"-tilerect10", "10x10 4x4 tiled rectangle",
+		"10x10 tiled rectangle (4x4 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillTiled}},
+  {"-tilerect100", "100x100 4x4 tiled rectangle",
+		"100x100 tiled rectangle (4x4 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{36, 100, NULL, NULL, FillTiled}},
+  {"-tilerect500", "500x500 4x4 tiled rectangle",
+		"500x500 tiled rectangle (4x4 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{1, 500, NULL, NULL, FillTiled}},
+  {"-oddsrect1",  "1x1 stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillStippled}},
+  {"-oddsrect10", "10x10 stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillStippled}},
+  {"-oddsrect100", "100x100 stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{36, 100, "OddTile", NULL, FillStippled}},
+  {"-oddsrect500", "500x500 stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{1, 500, "OddTile", NULL, FillStippled}},
+  {"-oddosrect1",  "1x1 opaque stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddosrect10", "10x10 opaque stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddosrect100", "100x100 opaque stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{36, 100, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddosrect500", "500x500 opaque stippled rectangle (17x15 stipple)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{1, 500, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddtilerect1", "1x1 tiled rectangle (17x15 tile)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillTiled}},
+  {"-oddtilerect10", "10x10 tiled rectangle (17x15 tile)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillTiled}},
+  {"-oddtilerect100", "100x100 tiled rectangle (17x15 tile)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{36, 100, "OddTile", NULL, FillTiled}},
+  {"-oddtilerect500", "500x500 tiled rectangle (17x15 tile)", NULL,
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_4FEATURE, ROP, 0,
+		{1, 500, "OddTile", NULL, FillTiled}},
+  {"-bigsrect1",  "1x1 161x145 stippled rectangle",
+		"1x1 stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillStippled}},
+  {"-bigsrect10", "10x10 161x145 stippled rectangle",
+		"10x10 stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillStippled}},
+  {"-bigsrect100", "100x100 161x145 stippled rectangle",
+		"100x100 stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, "mensetmanus", NULL, FillStippled}},
+  {"-bigsrect500", "500x500 161x145 stippled rectangle",
+		"500x500 stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{1, 500, "mensetmanus", NULL, FillStippled}},
+  {"-bigosrect1",  "1x1 161x145 opaque stippled rectangle",
+		"1x1 opaque stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigosrect10", "10x10 161x145 opaque stippled rectangle",
+		"10x10 opaque stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigosrect100", "100x100 161x145 opaque stippled rectangle",
+		"100x100 opaque stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigosrect500", "500x500 161x145 opaque stippled rectangle",
+		"500x500 opaque stippled rectangle (161x145 stipple)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{1, 500, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigtilerect1", "1x1 161x145 tiled rectangle",
+		"1x1 tiled rectangle (161x145 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillTiled}},
+  {"-bigtilerect10", "10x10 161x145 tiled rectangle",
+		"10x10 tiled rectangle (161x145 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillTiled}},
+  {"-bigtilerect100", "100x100 161x145 tiled rectangle",
+		"100x100 tiled rectangle (161x145 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{36, 100, "mensetmanus", NULL, FillTiled}},
+  {"-bigtilerect500", "500x500 161x145 tiled rectangle",
+		"500x500 tiled rectangle (161x145 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_2FEATURE, ROP, 0,
+		{1, 500, "mensetmanus", NULL, FillTiled}},
+  {"-eschertilerect1", "1x1 216x208 tiled rectangle",
+		"1x1 tiled rectangle (216x208 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 1, "escherknot", NULL, FillTiled}},
+  {"-eschertilerect10", "10x10 216x208 tiled rectangle",
+		"10x10 tiled rectangle (216x208 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "escherknot", NULL, FillTiled}},
+  {"-eschertilerect100", "100x100 216x208 tiled rectangle",
+		"100x100 tiled rectangle (216x208 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, "escherknot", NULL, FillTiled}},
+  {"-eschertilerect500", "500x500 216x208 tiled rectangle",
+		"500x500 tiled rectangle (216x208 tile)",
+		InitRectangles, DoRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{1, 500, "escherknot", NULL, FillTiled}},
+  {"-seg1",     "1-pixel line segment", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-seg10",    "10-pixel line segment", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-seg100",   "100-pixel line segment", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-seg500",   "500-pixel line segment", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 500}},
+  {"-seg100c1", "100-pixel line segment (1 kid)", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 1,
+		{POLY, 100}},
+  {"-seg100c2", "100-pixel line segment (2 kids)", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 2,
+		{POLY, 100}},
+  {"-seg100c3", "100-pixel line segment (3 kids)", NULL,
+		InitSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 3,
+		{POLY, 100}},
+  {"-dseg10",   "10-pixel dashed segment", NULL,
+		InitDashedSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-dseg100", "100-pixel dashed segment", NULL,
+		InitDashedSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-ddseg100", "100-pixel double-dashed segment", NULL,
+		InitDoubleDashedSegments, DoSegments, NullProc, EndSegments,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-hseg10",   "10-pixel horizontal line segment", NULL,
+		InitHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-hseg100",  "100-pixel horizontal line segment", NULL,
+		InitHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-hseg500",  "500-pixel horizontal line segment", NULL,
+		InitHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 500}},
+  {"-vseg10",   "10-pixel vertical line segment", NULL,
+		InitVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-vseg100",  "100-pixel vertical line segment", NULL,
+		InitVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-vseg500",  "500-pixel vertical line segment", NULL,
+		InitVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 500}},
+  {"-whseg10",  "10x1 wide horizontal line segment", NULL,
+		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{200, 10}},
+  {"-whseg100", "100x10 wide horizontal line segment", NULL,
+		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{100, 100}},
+  {"-whseg500", "500x50 wide horizontal line segment", NULL,
+		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{50, 500}},
+  {"-wvseg10",  "10x1 wide vertical line segment", NULL,
+		InitWideVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{200, 10}},
+  {"-wvseg100", "100x10 wide vertical line segment", NULL,
+		InitWideVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wvseg500", "500x50 wide vertical line segment", NULL,
+		InitWideVertSegments, DoSegments, NullProc, EndSegments,
+		V1_3FEATURE, ROP, 0,
+		{50, 500}},
+  {"-line1",   "1-pixel line", NULL,
+		InitLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-line10",   "10-pixel line", NULL,
+		InitLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-line100",  "100-pixel line", NULL,
+		InitLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-line500", "500-pixel line", NULL,
+		InitLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 500}},
+  {"-dline10",  "10-pixel dashed line", NULL,
+		InitDashedLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-dline100", "100-pixel dashed line", NULL,
+		InitDashedLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-ddline100", "100-pixel double-dashed line", NULL,
+		InitDoubleDashedLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 100}},
+  {"-wline10",  "10x1 wide line", NULL,
+		InitWideLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{100, 10}},
+  {"-wline100", "100x10 wide line", NULL,
+		InitWideLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wline500", "500x50 wide line", NULL,
+		InitWideLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{50, 500}},
+  {"-wdline100", "100x10 wide dashed line", NULL,
+		InitWideDashedLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wddline100",  "100x10 wide double-dashed line", NULL,
+		InitWideDoubleDashedLines, DoLines, NullProc, EndLines,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-orect10",  "10x10 rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, NULL, "0", FillSolid}},
+  {"-orect100", "100x100 rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, NULL, "0", FillSolid}},
+  {"-orect500",	"500x500 rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{1, 500, NULL, "0", FillSolid}},
+  {"-worect10",	"10x10 wide rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, NULL, "1", FillSolid}},
+  {"-worect100", "100x100 wide rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, NULL, "10", FillSolid}},
+  {"-worect500", "500x500 wide rectangle outline", NULL,
+		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
+		V1_3FEATURE, ROP, 0,
+		{1, 500, NULL, "50", FillSolid}},
+  {"-circle1",  "1-pixel circle", NULL,
+		InitCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-circle10", "10-pixel circle", NULL,
+		InitCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-circle100", "100-pixel circle", NULL,
+		InitCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{200, 100}},
+  {"-circle500", "500-pixel circle", NULL,
+		InitCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{50, 500}},
+  {"-dcircle100", "100-pixel dashed circle", NULL,
+		InitDashedCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-ddcircle100", "100-pixel double-dashed circle", NULL,
+		InitDoubleDashedCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wcircle10", "10-pixel wide circle", NULL,
+		InitWideCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-wcircle100", "100-pixel wide circle", NULL,
+		InitWideCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wcircle500", "500-pixel wide circle", NULL,
+		InitWideCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 500}},
+  {"-wdcircle100", "100-pixel wide dashed circle", NULL,
+		InitWideDashedCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-wddcircle100", "100-pixel wide double-dashed circle", NULL,
+		InitWideDoubleDashedCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-pcircle10", "10-pixel partial circle", NULL,
+		InitPartCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-pcircle100", "100-pixel partial circle", NULL,
+		InitPartCircles, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{198, 100}},
+  {"-wpcircle10", "10-pixel wide partial circle", NULL,
+		InitPartWideCircles, DoArcs, NullProc, EndArcs,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-wpcircle100", "100-pixel wide partial circle", NULL,
+		InitPartWideCircles, DoArcs, NullProc, EndArcs,
+		V1_3FEATURE, ROP, 0,
+		{198, 100}},
+  {"-fcircle1",  "1-pixel solid circle", NULL,
+		InitCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-fcircle10", "10-pixel solid circle", NULL,
+		InitCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-fcircle100", "100-pixel solid circle", NULL,
+		InitCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 100}},
+  {"-fcircle500", "500-pixel solid circle", NULL,
+		InitCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{20, 500}},
+  {"-fcpcircle10", "10-pixel fill chord partial circle", NULL,
+		InitChordPartCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-fcpcircle100", "100-pixel fill chord partial circle", NULL,
+		InitChordPartCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{108, 100}},
+  {"-fspcircle10", "10-pixel fill slice partial circle", NULL,
+		InitSlicePartCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-fspcircle100", "100-pixel fill slice partial circle", NULL,
+		InitSlicePartCircles, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{108, 100}},
+  {"-ellipse10", "10-pixel ellipse", NULL,
+		InitEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{500, 10}},
+  {"-ellipse100", "100-pixel ellipse", NULL,
+		InitEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{300, 100}},
+  {"-ellipse500", "500-pixel ellipse", NULL,
+		InitEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{100, 500}},
+  {"-dellipse100", "100-pixel dashed ellipse", NULL,
+		InitDashedEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-ddellipse100", "100-pixel double-dashed ellipse", NULL,
+		InitDoubleDashedEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-wellipse10", "10-pixel wide ellipse", NULL,
+		InitWideEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{200, 10}},
+  {"-wellipse100", "100-pixel wide ellipse", NULL,
+		InitWideEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-wellipse500", "500-pixel wide ellipse", NULL,
+		InitWideEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{20, 500}},
+  {"-wdellipse100", "100-pixel wide dashed ellipse", NULL,
+		InitWideDashedEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-wddellipse100", "100-pixel wide double-dashed ellipse", NULL,
+		InitWideDoubleDashedEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-pellipse10", "10-pixel partial ellipse", NULL,
+		InitPartEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{540, 10}},
+  {"-pellipse100", "100-pixel partial ellipse", NULL,
+		InitPartEllipses, DoArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{360, 100}},
+  {"-wpellipse10", "10-pixel wide partial ellipse", NULL,
+		InitPartWideEllipses, DoArcs, NullProc, EndArcs,
+		V1_3FEATURE, ROP, 0,
+		{540, 10}},
+  {"-wpellipse100", "100-pixel wide partial ellipse", NULL,
+		InitPartWideEllipses, DoArcs, NullProc, EndArcs,
+		V1_3FEATURE, ROP, 0,
+		{360, 100}},
+  {"-fellipse10", "10-pixel filled ellipse", NULL,
+		InitEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{200, 10}},
+  {"-fellipse100", "100-pixel filled ellipse", NULL,
+		InitEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{25, 100}},
+  {"-fellipse500", "500-pixel filled ellipse", NULL,
+		InitEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{10, 500}},
+  {"-fcpellipse10", "10-pixel fill chord partial ellipse", NULL,
+		InitChordPartEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{270, 10}},
+  {"-fcpellipse100", "100-pixel fill chord partial ellipse", NULL,
+		InitChordPartEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{36, 100}},
+  {"-fspellipse10", "10-pixel fill slice partial ellipse", NULL,
+		InitSlicePartEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{270, 10}},
+  {"-fspellipse100", "100-pixel fill slice partial ellipse", NULL,
+		InitSlicePartEllipses, DoFilledArcs, NullProc, EndArcs,
+		V1_2FEATURE, ROP, 0,
+		{36, 100}},
+  {"-triangle1", "Fill 1-pixel/side triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_2ONLY, ROP, 0,
+		{POLY, 1}},
+  {"-triangle10", "Fill 10-pixel/side triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_2ONLY, ROP, 0,
+		{POLY, 10}},
+  {"-triangle100", "Fill 100-pixel/side triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_2ONLY, ROP, 0,
+		{100, 100}},
+  {"-triangle1", "Fill 1x1 equivalent triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-triangle10", "Fill 10x10 equivalent triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-triangle100", "Fill 100x100 equivalent triangle", NULL,
+		InitTriangles, DoTriangles, NullProc, EndTriangles,
+		V1_3FEATURE, ROP, 0,
+		{100, 100}},
+  {"-trap1", "Fill 1x1 trapezoid", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1}},
+  {"-trap10", "Fill 10x10 trapezoid", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-trap100", "Fill 100x100 trapezoid", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{POLY/10, 100}},
+  {"-trap300", "Fill 300x300 trapezoid", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300}},
+  {"-strap1", "Fill 1x1 stippled trapezoid (8x8 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillStippled}},
+  {"-strap10", "Fill 10x10 stippled trapezoid",
+		"Fill 10x10 stippled trapezoid (8x8 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillStippled}},
+  {"-strap100", "Fill 100x100 stippled trapezoid",
+		"Fill 100x100 stippled trapezoid (8x8 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{100, 100, NULL, NULL, FillStippled}},
+  {"-strap300", "Fill 300x300 stippled trapezoid (8x8 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, NULL, NULL, FillStippled}},
+  {"-ostrap1", "Fill 1x1 opaque stippled trapezoid (8x8 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillOpaqueStippled}},
+  {"-ostrap10", "Fill 10x10 opaque stippled trapezoid",
+		"Fill 10x10 opaque stippled trapezoid (8x8 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillOpaqueStippled}},
+  {"-ostrap100", "Fill 100x100 opaque stippled trapezoid",
+		"Fill 100x100 opaque stippled trapezoid (8x8 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{100, 100, NULL, NULL, FillOpaqueStippled}},
+  {"-ostrap300", "Fill 300x300 opaque stippled trapezoid (8x8 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, NULL, NULL, FillOpaqueStippled}},
+  {"-tiletrap1", "Fill 1x1 tiled trapezoid (4x4 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, NULL, NULL, FillTiled}},
+  {"-tiletrap10", "Fill 10x10 tiled trapezoid",
+		"Fill 10x10 tiled trapezoid (4x4 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{POLY, 10, NULL, NULL, FillTiled}},
+  {"-tiletrap100", "Fill 100x100 tiled trapezoid",
+		"Fill 100x100 tiled trapezoid (4x4 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_2FEATURE, ROP, 0,
+		{100, 100, NULL, NULL, FillTiled}},
+  {"-tiletrap300", "Fill 300x300 tiled trapezoid (4x4 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, NULL, NULL, FillTiled}},
+  {"-oddstrap1", "Fill 1x1 stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillStippled}},
+  {"-oddstrap10", "Fill 10x10 stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillStippled}},
+  {"-oddstrap100", "Fill 100x100 stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{100, 100, "OddTile", NULL, FillStippled}},
+  {"-oddstrap300", "Fill 300x300 stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "OddTile", NULL, FillStippled}},
+  {"-oddostrap1", "Fill 1x1 opaque stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddostrap10", "Fill 10x10 opaque stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddostrap100", "Fill 100x100 opaque stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{100, 100, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddostrap300", "Fill 300x300 opaque stippled trapezoid (17x15 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "OddTile", NULL, FillOpaqueStippled}},
+  {"-oddtiletrap1", "Fill 1x1 tiled trapezoid (17x15 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "OddTile", NULL, FillTiled}},
+  {"-oddtiletrap10", "Fill 10x10 tiled trapezoid (17x15 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, "OddTile", NULL, FillTiled}},
+  {"-oddtiletrap100", "Fill 100x100 tiled trapezoid (17x15 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{100, 100, "OddTile", NULL, FillTiled}},
+  {"-oddtiletrap300", "Fill 300x300 tiled trapezoid (17x15 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "OddTile", NULL, FillTiled}},
+  {"-bigstrap1", "Fill 1x1 stippled trapezoid (161x145 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillStippled}},
+  {"-bigstrap10", "Fill 10x10 161x145 stippled trapezoid",
+		"Fill 10x10 stippled trapezoid (161x145 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillStippled}},
+  {"-bigstrap100", "Fill 100x100 161x145 stippled trapezoid",
+		"Fill 100x100 stippled trapezoid (161x145 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{100, 100, "mensetmanus", NULL, FillStippled}},
+  {"-bigstrap300", "Fill 300x300 stippled trapezoid (161x145 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "mensetmanus", NULL, FillStippled}},
+  {"-bigostrap1", "Fill 1x1 opaque stippled trapezoid (161x145 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigostrap10", "Fill 10x10 161x145 opaque stippled trapezoid",
+		"Fill 10x10 opaque stippled trapezoid (161x145 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigostrap100", "Fill 100x100 161x145 opaque stippled trapezoid",
+		"Fill 100x100 opaque stippled trapezoid (161x145 stipple)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{100, 100, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigostrap300", "Fill 300x300 opaque stippled trapezoid (161x145 stipple)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "mensetmanus", NULL, FillOpaqueStippled}},
+  {"-bigtiletrap1", "Fill 1x1 tiled trapezoid (161x145 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "mensetmanus", NULL, FillTiled}},
+  {"-bigtiletrap10", "Fill 10x10 161x145 tiled trapezoid",
+		"Fill 10x10 tiled trapezoid (161x145 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "mensetmanus", NULL, FillTiled}},
+  {"-bigtiletrap100", "Fill 100x100 161x145 tiled trapezoid",
+		"Fill 100x100 tiled trapezoid (161x145 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{100, 100, "mensetmanus", NULL, FillTiled}},
+  {"-bigtiletrap300", "Fill 300x300 tiled trapezoid (161x145 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "mensetmanus", NULL, FillTiled}},
+  {"-eschertiletrap1", "Fill 1x1 tiled trapezoid (216x208 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 1, "escherknot", NULL, FillTiled}},
+  {"-eschertiletrap10", "Fill 10x10 216x208 tiled trapezoid",
+		"Fill 10x10 tiled trapezoid (216x208 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10, "escherknot", NULL, FillTiled}},
+  {"-eschertiletrap100", "Fill 100x100 216x208 tiled trapezoid",
+		"Fill 100x100 tiled trapezoid (216x208 tile)",
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_3FEATURE, ROP, 0,
+		{36, 100, "escherknot", NULL, FillTiled}},
+  {"-eschertiletrap300", "Fill 300x300 tiled trapezoid (216x208 tile)", NULL,
+		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
+		V1_4FEATURE, ROP, 0,
+		{2, 300, "escherknot", NULL, FillTiled}},
+#ifdef XRENDER
+  {"-aatrap1", "Fill 1x1 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1 }},
+  {"-aatrap10", "Fill 10x10 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10 }},
+  {"-aatrap100", "Fill 100x100 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100 }},
+  {"-aatrap300", "Fill 300x300 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300 }},
+  {"-aa4trap1", "Fill 1x1 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "4" }},
+  {"-aa4trap10", "Fill 10x10 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "4" }},
+  {"-aa4trap100", "Fill 100x100 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "4" }},
+  {"-aa4trap300", "Fill 300x300 aa trap with 4 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "4" }},
+  {"-aa1trap1", "Fill 1x1 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "1" }},
+  {"-aa1trap10", "Fill 10x10 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "1" }},
+  {"-aa1trap100", "Fill 100x100 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "1" }},
+  {"-aa1trap300", "Fill 300x300 aa trap with 1 bit alpha", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "1" }},
+
+  {"-aatrap2x1", "Fill 2x1 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "8,2" }},
+  {"-aatrap2x10", "Fill 2x10 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "8,2" }},
+  {"-aatrap2x100", "Fill 2x100 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "8,2" }},
+  {"-aatrap2x300", "Fill 2x300 aa trap", NULL,
+		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "8,2" }},
+
+  {"-aatrapezoid1", "Fill 1x1 aa trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1 }},
+  {"-aatrapezoid10", "Fill 10x10 aa trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10 }},
+  {"-aatrapezoid100", "Fill 100x100 aa trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100 }},
+  {"-aatrapezoid300", "Fill 300x300 aa trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300 }},
+  {"-addaatrapezoid1", "Fill 1x1 aa pre-added trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 1, "add" }},
+  {"-addaatrapezoid10", "Fill 10x10 aa pre-added trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 10, "add" }},
+  {"-addaatrapezoid100", "Fill 100x100 aa pre-added trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 100, "add" }},
+  {"-addaatrapezoid300", "Fill 300x300 aa pre-added trapezoid", NULL,
+		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
+		V1_5FEATURE, NONROP, 0,
+		{POLY, 300, "add" }},
+#endif
+  {"-complex10", "Fill 10-pixel/side complex polygon", NULL,
+		InitComplexPoly, DoComplexPoly, NullProc, EndComplexPoly,
+		V1_2ONLY, ROP, 0,
+		{POLY, 10}},
+  {"-complex100", "Fill 100-pixel/side complex polygons", NULL,
+		InitComplexPoly, DoComplexPoly, NullProc, EndComplexPoly,
+		V1_2ONLY, ROP, 0,
+		{POLY/10, 100}},
+  {"-complex10", "Fill 10x10 equivalent complex polygon", NULL,
+		InitComplexPoly, DoComplexPoly, NullProc, EndComplexPoly,
+		V1_3FEATURE, ROP, 0,
+		{POLY, 10}},
+  {"-complex100", "Fill 100x100 equivalent complex polygons", NULL,
+		InitComplexPoly, DoComplexPoly, NullProc, EndComplexPoly,
+		V1_3FEATURE, ROP, 0,
+		{POLY/10, 100}},
+  {"-64poly10convex", "Fill 10x10 64-gon (Convex)", NULL,
+		InitGeneralPoly, DoGeneralPoly, NullProc, EndComplexPoly,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, (char *) 64, (char *) Convex}},
+  {"-64poly100convex", "Fill 100x100 64-gon (Convex)", NULL,
+		InitGeneralPoly, DoGeneralPoly, NullProc, EndComplexPoly,
+		V1_4FEATURE, ROP, 0,
+		{POLY/10, 100, (char *) 64, (char *) Convex}},
+  {"-64poly10complex", "Fill 10x10 64-gon (Complex)", NULL,
+		InitGeneralPoly, DoGeneralPoly, NullProc, EndComplexPoly,
+		V1_4FEATURE, ROP, 0,
+		{POLY, 10, (char *) 64, (char *) Complex}},
+  {"-64poly100complex", "Fill 100x100 64-gon (Complex)", NULL,
+		InitGeneralPoly, DoGeneralPoly, NullProc, EndComplexPoly,
+		V1_4FEATURE, ROP, 0,
+		{POLY/10, 100, (char *) 64, (char *) Complex}},
+  {"-ftext",    "Char in 80-char line (6x13)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_2FEATURE, ROP, 0,
+		{80, False, "6x13", NULL}},
+  {"-f8text",    "Char in 70-char line (8x13)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_3FEATURE, ROP, 0,
+		{70, False, "8x13", NULL}},
+  {"-f9text",    "Char in 60-char line (9x15)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_3FEATURE, ROP, 0,
+		{60, False, "9x15", NULL}},
+  {"-f14text16",  "Char16 in 40-char line (k14)", NULL,
+		InitText16, DoText16, ClearTextWin, EndText16,
+		V1_3FEATURE, ROP, 0,
+		{40, False,
+	      "-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-*",
+		NULL}},
+  {"-f24text16",  "Char16 in 23-char line (k24)", NULL,
+		InitText16, DoText16, ClearTextWin, EndText16,
+		V1_3FEATURE, ROP, 0,
+		{23, False, 
+	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
+		NULL}},
+  {"-tr10text", "Char in 80-char line (TR 10)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_2FEATURE, ROP, 0,
+		{80, False, 
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		NULL}},
+  {"-tr24text", "Char in 30-char line (TR 24)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_2FEATURE, ROP, 0,
+		{30, False, 
+		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
+ 		NULL}},
+  {"-polytext", "Char in 20/40/20 line (6x13, TR 10)", NULL,
+		InitText, DoPolyText, ClearTextWin, EndText,
+		V1_2FEATURE, ROP, 0,
+		{80, True, "6x13", 
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1"}},
+  {"-polytext16", "Char16 in 7/14/7 line (k14, k24)", NULL,
+		InitText16, DoPolyText16, ClearTextWin, EndText16,
+		V1_3FEATURE, ROP, 0,
+		{28, True, 
+	     "-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-*",
+             "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*"}},
+  {"-fitext",   "Char in 80-char image line (6x13)", NULL,
+		InitText, DoImageText, ClearTextWin, EndText,
+		V1_2FEATURE, PLANEMASK, 0,
+		{80, False, "6x13", NULL}},
+  {"-f8itext",   "Char in 70-char image line (8x13)", NULL,
+		InitText, DoImageText, ClearTextWin, EndText,
+		V1_3FEATURE, PLANEMASK, 0,
+		{70, False, "8x13", NULL}},
+  {"-f9itext",   "Char in 60-char image line (9x15)", NULL,
+		InitText, DoImageText, ClearTextWin, EndText,
+		V1_3FEATURE, PLANEMASK, 0,
+		{60, False, "9x15", NULL}},
+  {"-f14itext16", "Char16 in 40-char image line (k14)", NULL,
+		InitText16, DoImageText16, ClearTextWin, EndText16,
+		V1_3FEATURE, PLANEMASK, 0,
+		{40, False,
+	      "-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-*",
+		NULL}},
+  {"-f24itext16", "Char16 in 23-char image line (k24)", NULL,
+		InitText16, DoImageText16, ClearTextWin, EndText16,
+		V1_3FEATURE, PLANEMASK, 0,
+		{23, False, 
+	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
+		NULL}},
+  {"-tr10itext", "Char in 80-char image line (TR 10)", NULL,
+		InitText, DoImageText, ClearTextWin, EndText,
+		V1_2FEATURE, PLANEMASK, 0,
+		{80, False, 
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		NULL}},
+  {"-tr24itext", "Char in 30-char image line (TR 24)", NULL,
+		InitText, DoImageText, ClearTextWin, EndText,
+		V1_2FEATURE, PLANEMASK, 0,
+		{30, False, 
+		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
+ 		NULL}},
+#ifdef XFT
+  {"-aa10text", "Char in 80-char aa line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=true:rgba=0:pixelsize=10", NULL}},
+  {"-aa24text", "Char in 30-char aa line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=true:rgba=0:pixelsize=24", NULL}},
+  {"-aaftext", "Char in 80-char aa line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=true:rgba=0:pixelsize=12", NULL}},
+  {"-a10text", "Char in 80-char a line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=false:rgba=0:pixelsize=10", NULL}},
+  {"-a24text", "Char in 30-char a line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=false:rgba=0:pixelsize=24", NULL}},
+  {"-aftext", "Char in 80-char a line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=false:rgba=0:pixelsize=12", NULL}},
+  {"-rgb10text", "Char in 80-char rgb line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=true:rgba=rgb:pixelsize=10", NULL}},
+  {"-rgb24text", "Char in 30-char rgb line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=true:rgba=rgb:pixelsize=24", NULL}},
+  {"-rgbftext", "Char in 80-char rgb line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=true:rgba=rgb:pixelsize=12", NULL}},
+  {"-caa10text", "Char in 80-char aa core line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=true:render=false:rgba=0:pixelsize=10", NULL}},
+  {"-caa24text", "Char in 30-char aa core line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=true:render=false:rgba=0:pixelsize=24", NULL}},
+  {"-caaftext", "Char in 80-char aa core line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=true:render=false:rgba=0:pixelsize=12", NULL}},
+  {"-ca10text", "Char in 80-char a core line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=false:render=false:rgba=0:pixelsize=10", NULL}},
+  {"-ca24text", "Char in 30-char a core line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=false:render=false:rgba=0:pixelsize=24", NULL}},
+  {"-caftext", "Char in 80-char a core line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=false:render=false:rgba=0:pixelsize=12", NULL}},
+  {"-rgb10text", "Char in 80-char rgb core line (Charter 10)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 10, "charter:antialias=true:render=false:rgba=rgb:pixelsize=10", NULL}},
+  {"-rgb24text", "Char in 30-char rgb core line (Charter 24)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{30, 24, "charter:antialias=true:render=false:rgba=rgb:pixelsize=24", NULL}},
+  {"-rgbftext", "Char in 80-char rgb core line (Courier 12)", NULL,
+	        InitAAText, DoAAText, ClearTextWin, EndAAText,
+		V1_5FEATURE, NONROP, 0,
+		{80, 12, "courier:antialias=true:render=false:rgba=rgb:pixelsize=12", NULL}},
+#endif
+  {"-scroll10", "Scroll 10x10 pixels", NULL,
+		InitScroll, DoScroll, MidScroll, EndScroll,
+		V1_2FEATURE, ROP, 0,
+		{1, 10}},
+  {"-scroll100", "Scroll 100x100 pixels", NULL,
+		InitScroll, DoScroll, MidScroll, EndScroll,
+		V1_2FEATURE, ROP, 0,
+		{1, 100}},
+  {"-scroll500", "Scroll 500x500 pixels", NULL,
+		InitScroll, DoScroll, MidScroll, EndScroll,
+		V1_2FEATURE, ROP, 0,
+		{1, 500}},
+  {"-copywinwin10", "Copy 10x10 from window to window", NULL,
+		InitCopyWin, DoCopyWinWin, MidScroll, EndCopyWin,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-copywinwin100", "Copy 100x100 from window to window", NULL,
+		InitCopyWin, DoCopyWinWin, MidScroll, EndCopyWin,
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-copywinwin500", "Copy 500x500 from window to window", NULL,
+		InitCopyWin, DoCopyWinWin, MidScroll, EndCopyWin,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-copypixwin10", "Copy 10x10 from pixmap to window", NULL,
+		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-copypixwin100", "Copy 100x100 from pixmap to window", NULL,
+		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix, 
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-copypixwin500", "Copy 500x500 from pixmap to window", NULL,
+		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-copywinpix10", "Copy 10x10 from window to pixmap", NULL,
+		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-copywinpix100", "Copy 100x100 from window to pixmap", NULL,
+		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix, 
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-copywinpix500", "Copy 500x500 from window to pixmap", NULL,
+		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-copypixpix10", "Copy 10x10 from pixmap to pixmap", NULL,
+		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-copypixpix100", "Copy 100x100 from pixmap to pixmap", NULL,
+		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix, 
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-copypixpix500", "Copy 500x500 from pixmap to pixmap", NULL,
+		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-copyplane10", "Copy 10x10 1-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-copyplane100", "Copy 100x100 1-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-copyplane500", "Copy 500x500 1-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-deepcopyplane10", "Copy 10x10 n-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_5FEATURE, ROP, 0,
+		{4, 10, "Deep"}},
+  {"-deepcopyplane100", "Copy 100x100 n-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_5FEATURE, ROP, 0,
+		{4, 100, "Deep"}},
+  {"-deepcopyplane500", "Copy 500x500 n-bit deep plane", NULL,
+		InitCopyPlane, DoCopyPlane, MidCopyPix, EndCopyPix,
+		V1_5FEATURE, ROP, 0,
+		{4, 500, "Deep"}},
+  {"-putimage10", "PutImage 10x10 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-putimage100", "PutImage 100x100 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-putimage500", "PutImage 500x500 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-putimagexy10", "PutImage XY 10x10 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 10, "XY"}},
+  {"-putimagexy100", "PutImage XY 100x100 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 100, "XY"}},
+  {"-putimagexy500", "PutImage XY 500x500 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 500, "XY"}},
+#ifdef MITSHM
+  {"-shmput10", "ShmPutImage 10x10 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 10}},
+  {"-shmput100", "ShmPutImage 100x100 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 100}},
+  {"-shmput500", "ShmPutImage 500x500 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_2FEATURE, ROP, 0,
+		{4, 500}},
+  {"-shmputxy10", "ShmPutImage XY 10x10 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 10, "XY"}},
+  {"-shmputxy100", "ShmPutImage XY 100x100 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 100, "XY"}},
+  {"-shmputxy500", "ShmPutImage XY 500x500 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_4FEATURE, ROP, 0,
+		{4, 500, "XY"}},
+#endif
+  {"-getimage10", "GetImage 10x10 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_2FEATURE, PLANEMASK, 0,
+		{4, 10}},
+  {"-getimage100", "GetImage 100x100 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_2FEATURE, PLANEMASK, 0,
+		{4, 100}},
+  {"-getimage500", "GetImage 500x500 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_2FEATURE, PLANEMASK, 0,
+		{4, 500}},
+  {"-getimagexy10", "GetImage XY 10x10 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_4FEATURE, PLANEMASK, 0,
+		{4, 10, "XY"}},
+  {"-getimagexy100", "GetImage XY 100x100 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_4FEATURE, PLANEMASK, 0,
+		{4, 100, "XY"}},
+  {"-getimagexy500", "GetImage XY 500x500 square", NULL,
+		InitGetImage, DoGetImage, NullProc, EndGetImage,
+		V1_4FEATURE, PLANEMASK, 0,
+		{4, 500, "XY"}},
+  {"-noop",     "X protocol NoOperation", NULL,
+		NullInitProc, DoNoOp, NullProc, NullProc,
+		V1_2FEATURE, PLANEMASK, 0,
+		{1}},
+  {"-atom",     "GetAtomName", NULL,
+		NullInitProc, DoGetAtom, NullProc, NullProc,
+		VERSION1_2 | VERSION1_3, NONROP, 0,
+		{1}},
+  {"-pointer",  "QueryPointer", NULL,
+		NullInitProc, DoQueryPointer, NullProc, NullProc,
+		V1_4FEATURE, NONROP, 0,
+		{1}},
+  {"-prop",     "GetProperty", NULL,
+		InitGetProperty, DoGetProperty, NullProc, NullProc,
+		V1_2FEATURE, NONROP, 0,
+		{1}},
+  {"-gc",       "Change graphics context", NULL,
+		InitGC, DoChangeGC, NullProc, EndGC,
+		V1_2FEATURE, NONROP, 0,
+		{4}},
+  {"-create",   "Create and map subwindows", NULL,
+		InitCreate, CreateChildren, DestroyChildren, EndCreate,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-ucreate",  "Create unmapped window", NULL,
+		InitCreate, CreateChildren, DestroyChildren, EndCreate,
+		V1_2FEATURE, WINDOW, 0,
+		{0, False}},
+  {"-map",      "Map window via parent", NULL,
+		InitMap, MapParents, UnmapParentsCleanup, EndCreate,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-unmap",    "Unmap window via parent", NULL,
+		InitDestroy, UnmapParents, MapParentsCleanup, EndCreate,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-destroy",  "Destroy window via parent", NULL,
+		InitDestroy, DestroyParents, RenewParents, EndCreate,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-popup",    "Hide/expose window via popup", NULL,
+		InitPopups, DoPopUps, NullProc, EndPopups,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-move",     "Move window", NULL,
+		InitMoveWindows, DoMoveWindows, NullProc, EndMoveWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{0, True}},
+  {"-umove",    "Moved unmapped window", NULL,
+		InitMoveWindows, DoMoveWindows, NullProc, EndMoveWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{0, False}},
+  {"-movetree", "Move window via parent", NULL,
+		InitMoveTree, DoMoveTree, NullProc, EndMoveTree,
+		V1_2FEATURE, WINDOW, 0,
+		{4, True}},
+  {"-resize",   "Resize window", NULL,
+		InitMoveWindows, DoResizeWindows, NullProc, EndMoveWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{4, True}},
+  {"-uresize",  "Resize unmapped window", NULL,
+		InitMoveWindows, DoResizeWindows, NullProc, EndMoveWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{4, False}},
+  {"-circulate", "Circulate window", NULL,
+		InitCircWindows, DoCircWindows, NullProc, EndCircWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{4, True}},
+  {"-ucirculate", "Circulate Unmapped window", NULL,
+		InitCircWindows, DoCircWindows, NullProc, EndCircWindows,
+		V1_2FEATURE, WINDOW, 0,
+		{4, False}},
+  { NULL, NULL, NULL,
+		NULL, NULL, NULL, NULL,
+		0, NONROP, 0,
+		{0, False}}
+};
diff --git a/app/x11perf/do_text.c b/app/x11perf/do_text.c
new file mode 100644
index 000000000..84763b26e
--- /dev/null
+++ b/app/x11perf/do_text.c
@@ -0,0 +1,514 @@
+/* $Xorg: do_text.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_text.c,v 1.7 2001/01/17 23:45:12 dawes Exp $ */
+
+#include "x11perf.h"
+#include <stdio.h>
+
+static char **charBuf;
+static XFontStruct *font, *bfont;
+static int height, ypos;
+static XTextItem *items;
+static int charsPerLine, totalLines;
+
+#define XPOS 20
+#define SEGS 3
+
+
+int 
+InitText(XParms xp, Parms p, int reps)
+{
+    int		i, j;
+    char	ch;
+    XGCValues   gcv;
+
+    font = XLoadQueryFont(xp->d, p->font);
+    if (font == NULL) {
+	printf("Could not load font '%s', benchmark omitted\n", p->font);
+	return 0;
+    }
+
+    bfont = NULL;
+    if (p->bfont != NULL) {
+	bfont = XLoadQueryFont(xp->d, p->bfont);
+	if (bfont == NULL) {
+	    printf("Could not load font '%s', benchmark omitted\n", p->bfont);
+	    return 0;
+	}
+    }
+
+    ypos = XPOS;
+    height = (font->max_bounds.ascent + font->max_bounds.descent) + 1;
+    if (bfont != NULL) {
+	int     h = (bfont->max_bounds.ascent + bfont->max_bounds.descent) + 1;
+	if (h > height)
+	    height = h;
+    }
+    gcv.font = font->fid;
+    XChangeGC(xp->d, xp->fggc, GCFont, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCFont, &gcv);
+
+    charsPerLine = p->objects;
+    charsPerLine = (charsPerLine + 3) & ~3;
+    p->objects = charsPerLine;
+
+    totalLines = '\177' - ' ' + 1;
+    if (totalLines > reps) totalLines = reps;
+
+    charBuf = (char **) malloc(totalLines*sizeof (char *));
+    if (p->special)
+	items = (XTextItem *) malloc(totalLines*SEGS*sizeof (XTextItem));
+
+    for (i = 0; i != totalLines; i++) {
+	charBuf[i] = (char *) malloc (sizeof (char)*charsPerLine);
+	ch = i + ' ';
+	for (j = 0; j != charsPerLine; j++) {
+	    charBuf[i][j] = ch;
+	    if (ch == '\177') ch = ' '; else ch++;
+	}
+	if (p->special) {
+	    items[i*SEGS+0].chars = &(charBuf[i][0]);
+	    items[i*SEGS+0].nchars = charsPerLine/4;
+	    items[i*SEGS+0].delta = 0;
+	    items[i*SEGS+0].font = font->fid;
+	    items[i*SEGS+1].chars = &(charBuf[i][charsPerLine/4]);
+	    items[i*SEGS+1].nchars = charsPerLine/2;
+	    items[i*SEGS+1].delta = 3;
+	    items[i*SEGS+1].font = bfont->fid;
+	    items[i*SEGS+2].chars = &(charBuf[i][3*charsPerLine/4]);
+	    items[i*SEGS+2].nchars = charsPerLine/4;
+	    items[i*SEGS+2].delta = 3;
+	    items[i*SEGS+2].font = font->fid;
+	}
+    }
+    return reps;
+}
+
+
+#define GetRealChar(font, totalChars, ch)				\
+{									\
+    XCharStruct *pci;							\
+    do {								\
+	ch--;								\
+	if (ch < 0) {							\
+	    ch = totalChars-1;						\
+	}								\
+	if (font->per_char == NULL) break;				\
+	pci = &(font->per_char[ch]);					\
+    } while ( (pci->lbearing | pci->rbearing | pci->width		\
+             | pci->ascent | pci->descent | pci->attributes) == 0);     \
+} /* GetRealChar */
+
+int 
+InitText16(XParms xp, Parms p, int reps)
+{
+    register int	i, j;
+    register char	*pbuf0, *pbuf1, *pbuf2;
+    XGCValues   	gcv;
+    int			rows, columns, totalChars, ch;
+    int			brows, bcolumns = 0, btotalChars = 0, bch = 0;
+
+    font = XLoadQueryFont(xp->d, p->font);
+    if (font == NULL) {
+	printf("Could not load font '%s', benchmark omitted\n", p->font);
+	return 0;
+    }
+    rows = font->max_byte1 - font->min_byte1 + 1;
+    columns = font->max_char_or_byte2 - font->min_char_or_byte2 + 1;
+    totalChars = rows * columns;
+    totalLines = rows;
+    ch = totalChars;
+
+    bfont = NULL;
+    if (p->bfont != NULL) {
+	bfont = XLoadQueryFont(xp->d, p->bfont);
+	if (bfont == NULL) {
+	    printf("Could not load font '%s', benchmark omitted\n", p->bfont);
+	    return 0;
+	}
+	brows = bfont->max_byte1 - bfont->min_byte1 + 1;
+	bcolumns = bfont->max_char_or_byte2 - bfont->min_char_or_byte2 + 1;
+	btotalChars = brows * bcolumns;
+	bch = btotalChars;
+	if (brows > totalLines) totalLines = brows;
+    }
+
+    ypos = XPOS;
+    height = (font->max_bounds.ascent + font->max_bounds.descent) + 1;
+    if (bfont != NULL) {
+	int     h = (bfont->max_bounds.ascent + bfont->max_bounds.descent) + 1;
+	if (h > height)
+	    height = h;
+    }
+    gcv.font = font->fid;
+    XChangeGC(xp->d, xp->fggc, GCFont, &gcv);
+    XChangeGC(xp->d, xp->bggc, GCFont, &gcv);
+
+    charsPerLine = p->objects;
+
+    if (totalLines > reps) totalLines = reps;
+
+    if (p->special) {
+	charsPerLine = (charsPerLine + 3) & ~3;	/* make a multiple of four */
+	p->objects = charsPerLine;
+
+	items = (XTextItem *) malloc(totalLines*SEGS*sizeof (XTextItem));
+
+	for (i = 0; i < totalLines; i++) {
+	    pbuf0 = items[i*SEGS+0].chars =
+			    (char *) malloc (sizeof (char)*charsPerLine/2);
+	    items[i*SEGS+0].nchars = charsPerLine/4;
+	    items[i*SEGS+0].delta = 0;
+	    items[i*SEGS+0].font = font->fid;
+	    pbuf1 = items[i*SEGS+1].chars =
+			    (char *) malloc (sizeof (char)*charsPerLine);
+	    items[i*SEGS+1].nchars = charsPerLine/2;
+	    items[i*SEGS+1].delta = 3;
+	    items[i*SEGS+1].font = bfont->fid;
+	    pbuf2 = items[i*SEGS+2].chars =
+			    (char *) malloc (sizeof (char)*charsPerLine/2);
+	    items[i*SEGS+2].nchars = charsPerLine/4;
+	    items[i*SEGS+2].delta = 3;
+	    items[i*SEGS+2].font = font->fid;
+	    for (j = 0; j < charsPerLine/4; j++) {
+		GetRealChar(font, totalChars, ch);
+		*pbuf0++ = ch / columns + font->min_byte1;
+		*pbuf0++ = ch % columns + font->min_char_or_byte2;
+		GetRealChar(font, totalChars, ch);
+		*pbuf2++ = ch / columns + font->min_byte1;
+		*pbuf2++ = ch % columns + font->min_char_or_byte2;
+	    }
+	    for (j = 0; j < charsPerLine/2; j++) {
+		GetRealChar(bfont, btotalChars, bch);
+		*pbuf1++ = bch / bcolumns + bfont->min_byte1;
+		*pbuf1++ = bch % bcolumns + bfont->min_char_or_byte2;
+	    }
+	}
+    } else {
+	charBuf = (char **) malloc(totalLines*sizeof (char *));
+	for (i = 0; i < totalLines; i++) {
+	    pbuf0 = charBuf[i] = (char *) malloc (sizeof (char)*charsPerLine*2);
+	    for (j = 0; j < charsPerLine; j++) {
+		GetRealChar(font, totalChars, ch);
+		*pbuf0++ = ch / columns + font->min_byte1;
+		*pbuf0++ = ch % columns + font->min_char_or_byte2;
+	    }
+	}
+    }
+    return reps;
+}
+
+void 
+DoText(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XDrawString(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, charBuf[line], charsPerLine);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    line = startLine;
+	    startLine = (startLine + 1) % totalLines;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+DoText16(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i < reps; i++) {
+	XDrawString16(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, (XChar2b *)charBuf[line], charsPerLine);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    line = startLine;
+	    startLine = (startLine + 1) % totalLines;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+DoPolyText(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XDrawText(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, &items[line*SEGS], SEGS);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    line = startLine;
+	    startLine = (startLine + 1) % totalLines;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+DoPolyText16(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XDrawText16(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, (XTextItem16 *)&items[line*SEGS], SEGS);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    line = startLine;
+	    startLine = (startLine + 1) % totalLines;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+DoImageText(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XDrawImageString(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, charBuf[line], charsPerLine);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    startLine = (startLine + 17) % totalLines;
+	    line = startLine;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+DoImageText16(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XDrawImageString16(
+	    xp->d, xp->w, xp->fggc, XPOS, ypos, (XChar2b *)charBuf[line], charsPerLine);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    startLine = (startLine + 17) % totalLines;
+	    line = startLine;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+ClearTextWin(XParms xp, Parms p)
+{
+    XClearWindow(xp->d, xp->w);
+}
+
+void 
+EndText(XParms xp, Parms p)
+{
+    int i;
+
+    if(font==NULL)return;
+    for (i = 0; i != totalLines; i++)
+	free(charBuf[i]);
+    free(charBuf);
+    if (p->special)
+	free(items);
+    XFreeFont(xp->d, font);
+    if (bfont != NULL)
+	XFreeFont(xp->d, bfont);
+}
+
+void 
+EndText16(XParms xp, Parms p)
+{
+    int i;
+
+    if(font==NULL)return;
+    if (p->special) {
+	for (i = 0; i < totalLines; i++) {
+	    free(items[i*SEGS+0].chars);
+	    free(items[i*SEGS+1].chars);
+	    free(items[i*SEGS+2].chars);
+	}
+	free(items);
+    } else {
+	for (i = 0; i < totalLines; i++) {
+	    free(charBuf[i]);
+	}
+	free(charBuf);
+    }
+    XFreeFont(xp->d, font);
+    if(bfont != NULL) {
+	XFreeFont(xp->d, bfont);
+    }
+}
+
+#ifdef XFT
+#include <X11/extensions/Xrender.h>
+#include <X11/Xft/Xft.h>
+
+static XftFont	*aafont;
+static XftDraw	*aadraw;
+static XftColor	aacolor;
+
+int 
+InitAAText(XParms xp, Parms p, int reps)
+{
+    int			i, j;
+    char		ch;
+    XRenderColor	color;
+
+    aafont = XftFontOpenName (xp->d, DefaultScreen (xp->d), p->font);
+    
+    if (aafont == NULL) 
+    {
+	printf("Could not load font '%s', benchmark omitted\n", 
+	       p->font);
+	return 0;
+    }
+
+    aadraw = XftDrawCreate (xp->d, xp->w, 
+			    xp->vinfo.visual, 
+			    xp->cmap);
+
+    if (!aadraw) 
+    {
+	printf ("Cannot create XftDraw object\n");
+	XftFontClose (xp->d, aafont);
+	return 0;
+    }
+    color.red = 0;
+    color.green = 0;
+    color.blue = 0;
+    color.alpha = 0xffff;
+    if (!XftColorAllocValue (xp->d,
+			     xp->vinfo.visual, 
+			     xp->cmap,
+			     &color, &aacolor))
+    {
+	printf ("Cannot allocate black\n");
+	XftFontClose (xp->d, aafont);
+	XftDrawDestroy (aadraw);
+	aafont = 0;
+	aadraw = 0;
+	return 0;
+    }
+    
+    ypos = XPOS;
+    height = aafont->height;
+    
+    charsPerLine = p->objects;
+    charsPerLine = (charsPerLine + 3) & ~3;
+    p->objects = charsPerLine;
+
+    totalLines = '\177' - ' ' + 1;
+    if (totalLines > reps) totalLines = reps;
+
+    charBuf = (char **) malloc(totalLines*sizeof (char *));
+
+    for (i = 0; i != totalLines; i++) {
+	charBuf[i] = (char *) malloc (sizeof (char)*charsPerLine);
+	ch = i + ' ';
+	for (j = 0; j != charsPerLine; j++) {
+	    charBuf[i][j] = ch;
+	    if (ch == '\177') ch = ' '; else ch++;
+	}
+    }
+    return reps;
+}
+
+void 
+DoAAText(XParms xp, Parms p, int reps)
+{
+    int     i, line, startLine;
+
+    startLine = 0;
+    line = 0;
+    for (i = 0; i != reps; i++) {
+	XftDrawString8 (aadraw, &aacolor, aafont, 
+		       XPOS, ypos, (unsigned char *) charBuf[line], charsPerLine);
+	ypos += height;
+	if (ypos > HEIGHT - height) {
+	    /* Wraparound to top of window */
+	    ypos = XPOS;
+	    line = startLine;
+	    startLine = (startLine + 1) % totalLines;
+	}
+	line = (line + 1) % totalLines;
+	CheckAbort ();
+    }
+}
+
+void 
+EndAAText(XParms xp, Parms p)
+{
+    int i;
+
+    if(!aadraw)return;
+    for (i = 0; i != totalLines; i++)
+	free(charBuf[i]);
+    free(charBuf);
+    XftDrawDestroy (aadraw);
+    XftFontClose (xp->d, aafont);
+    XftColorFree (xp->d,
+		  xp->vinfo.visual, 
+		  xp->cmap,
+		  &aacolor);
+}
+
+#endif
diff --git a/app/x11perf/do_traps.c b/app/x11perf/do_traps.c
new file mode 100644
index 000000000..01a64ed65
--- /dev/null
+++ b/app/x11perf/do_traps.c
@@ -0,0 +1,397 @@
+/* $Xorg: do_traps.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.9tsi Exp $ */
+
+#include "x11perf.h"
+#include "bitmaps.h"
+
+#define NUM_POINTS 4   /* 4 points to a trapezoid */
+static XPoint *points;
+static GC      pgc;
+
+int 
+InitTrapezoids(XParms xp, Parms p, int reps)
+{
+    int     i, numPoints;
+    int     rows;
+    int     x, y;
+    int     size, skew;
+    XPoint  *curPoint;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    numPoints = (p->objects) * NUM_POINTS;  
+    points = (XPoint *)malloc(numPoints * sizeof(XPoint));
+    curPoint = points;
+    x = size;
+    y = 0;
+    rows = 0;
+    skew = size;
+
+    for (i = 0; i != p->objects; i++, curPoint += NUM_POINTS) {
+	curPoint[0].x = x - skew;
+	curPoint[0].y = y;
+	curPoint[1].x = x - skew + size;
+	curPoint[1].y = y;
+	curPoint[2].x = x + skew;
+	curPoint[2].y = y + size;
+	curPoint[3].x = x + skew - size;
+	curPoint[3].y = y + size;
+
+	skew--;
+	if (skew < 0) skew = size;
+
+	y += size;
+	rows++;
+	if (y + size > HEIGHT || rows == MAXROWS) {
+	    rows = 0;
+	    y = 0;
+	    x += 2 * size;
+	    if (x + size > WIDTH) {
+		x = size;
+	    }
+	}
+    }
+
+    SetFillStyle(xp, p);
+    return reps;
+}
+
+void 
+DoTrapezoids(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    XPoint  *curPoint;
+
+    for (i = 0; i != reps; i++) {
+        curPoint = points;
+        for (j = 0; j != p->objects; j++) {
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex, 
+			 CoordModeOrigin);
+            curPoint += NUM_POINTS;
+	}
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+void 
+EndTrapezoids(XParms xp, Parms p)
+{
+    free(points);
+}
+
+#ifdef XRENDER
+#include <X11/extensions/Xrender.h>
+#include <X11/Xft/Xft.h>
+
+static XTrap		    *traps;
+static XTrapezoid	    *trapezoids;
+static XftDraw		    *aadraw;
+static XftColor		    aablack, aawhite;
+static XRenderColor	    transparent = { 0, 0, 0, 0 };
+static XRenderPictFormat    *maskFormat;
+static Pixmap		    maskPixmap;
+static Picture		    mask;
+
+int
+InitFixedTraps(XParms xp, Parms p, int reps)
+{
+    int     i, numTraps;
+    int     rows;
+    int     x, y;
+    int     size, skew;
+    XTrap	*curTrap;
+    XRenderColor	color;
+    int			major, minor;
+    int		depth;
+    int		width;
+    int		std_fmt;
+
+    XRenderQueryVersion (xp->d, &major, &minor);
+    if (major == 0 && minor < 9)
+	return 0;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    numTraps = p->objects;
+    traps = (XTrap *)malloc(numTraps * sizeof(XTrap));
+    curTrap = traps;
+    x = size;
+    y = 0;
+    rows = 0;
+    skew = size;
+    aadraw = XftDrawCreate (xp->d, xp->w, 
+			    xp->vinfo.visual, 
+			    xp->cmap);
+    
+    depth = 0;
+    width = 0;
+    if (p->font)
+	sscanf (p->font, "%d,%d", &depth, &width);
+
+    switch (depth) {
+    case 8:
+    default:
+	depth = 8;
+	std_fmt = PictStandardA8;
+	break;
+    case 4:
+	std_fmt = PictStandardA4;
+	break;
+    case 1:
+	std_fmt = PictStandardA1;
+	break;
+    }
+    maskFormat = XRenderFindStandardFormat (xp->d, std_fmt);
+    
+    maskPixmap = XCreatePixmap (xp->d, xp->w, WIDTH, HEIGHT, depth);
+    
+    mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, 0);
+    
+    color.red = 0;
+    color.green = 0;
+    color.blue = 0;
+    color.alpha = 0xffff;
+    if (!XftColorAllocValue (xp->d,
+			     xp->vinfo.visual, 
+			     xp->cmap,
+			     &color, &aablack))
+    {
+	XftDrawDestroy (aadraw);
+	aadraw = 0;
+	return 0;
+    }
+    color.red = 0xffff;
+    color.green = 0xffff;
+    color.blue = 0xffff;
+    color.alpha = 0xffff;
+    if (!XftColorAllocValue (xp->d,
+			     xp->vinfo.visual, 
+			     xp->cmap,
+			     &color, &aawhite))
+    {
+	XftDrawDestroy (aadraw);
+	aadraw = 0;
+	return 0;
+    }
+
+    if (width == 0)
+	width = size;
+    for (i = 0; i != p->objects; i++, curTrap ++) {
+	curTrap->top.y = XDoubleToFixed (y);
+	curTrap->top.left = XDoubleToFixed (x - skew);
+	curTrap->top.right = XDoubleToFixed (x - skew + width);
+	curTrap->bottom.y = XDoubleToFixed (y + size);
+	curTrap->bottom.left = XDoubleToFixed (x + skew - width);
+	curTrap->bottom.right = XDoubleToFixed (x + skew);
+	
+	skew--;
+	if (skew < 0) skew = size;
+
+	y += size;
+	rows++;
+	if (y + size > HEIGHT || rows == MAXROWS) {
+	    rows = 0;
+	    y = 0;
+	    x += 2 * size;
+	    if (x + size > WIDTH) {
+		x = size;
+	    }
+	}
+    }
+    
+    SetFillStyle(xp, p);
+    return reps;
+}
+
+void 
+DoFixedTraps(XParms xp, Parms p, int reps)
+{
+    int		i;
+    Picture	white, black, src, dst;
+
+    white = XftDrawSrcPicture (aadraw, &aawhite);
+    black = XftDrawSrcPicture (aadraw, &aablack);
+    dst = XftDrawPicture (aadraw);
+
+    src = black;
+    for (i = 0; i != reps; i++) {
+	XRenderFillRectangle (xp->d, PictOpSrc, mask, &transparent,
+			      0, 0, WIDTH, HEIGHT);
+	XRenderAddTraps (xp->d, mask, 0, 0, traps, p->objects);
+	XRenderComposite (xp->d, PictOpOver, src, mask, dst,
+			  0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);
+        if (src == black)
+	    src = white;
+        else
+            src = black;
+	CheckAbort ();
+    }
+}
+
+void
+EndFixedTraps (XParms xp, Parms p)
+{
+    free (traps);
+    XftDrawDestroy (aadraw);
+    XRenderFreePicture (xp->d, mask);
+    XFreePixmap (xp->d, maskPixmap);
+}
+
+int
+InitFixedTrapezoids(XParms xp, Parms p, int reps)
+{
+    int     i, numTraps;
+    int     rows;
+    int     x, y;
+    int     size, skew;
+    XTrapezoid	*curTrap;
+    XRenderColor	color;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    numTraps = p->objects;
+    trapezoids = (XTrapezoid *)malloc(numTraps * sizeof(XTrapezoid));
+    curTrap = trapezoids;
+    x = size;
+    y = 0;
+    rows = 0;
+    skew = size;
+    aadraw = XftDrawCreate (xp->d, xp->w, 
+			    xp->vinfo.visual, 
+			    xp->cmap);
+    if (p->font && !strcmp (p->font, "add"))
+    {
+	XRenderPictFormat   templ;
+	templ.type = PictTypeDirect;
+	templ.depth = 8;
+	templ.direct.alpha = 0;
+	templ.direct.alphaMask = 0xff;
+	maskFormat = XRenderFindFormat (xp->d, 
+					PictFormatType |
+					PictFormatDepth |
+					PictFormatAlpha |
+					PictFormatAlphaMask,
+					&templ,
+					0);
+    }
+    else
+	maskFormat = 0;
+    color.red = 0;
+    color.green = 0;
+    color.blue = 0;
+    color.alpha = 0xffff;
+    if (!XftColorAllocValue (xp->d,
+			     xp->vinfo.visual, 
+			     xp->cmap,
+			     &color, &aablack))
+    {
+	XftDrawDestroy (aadraw);
+	aadraw = 0;
+	return 0;
+    }
+    color.red = 0xffff;
+    color.green = 0xffff;
+    color.blue = 0xffff;
+    color.alpha = 0xffff;
+    if (!XftColorAllocValue (xp->d,
+			     xp->vinfo.visual, 
+			     xp->cmap,
+			     &color, &aawhite))
+    {
+	XftDrawDestroy (aadraw);
+	aadraw = 0;
+	return 0;
+    }
+
+    for (i = 0; i != p->objects; i++, curTrap ++) {
+	curTrap->top = XDoubleToFixed (y);
+	curTrap->bottom = XDoubleToFixed (y + size);
+	curTrap->left.p1.x = XDoubleToFixed (x - skew);
+	curTrap->left.p1.y = XDoubleToFixed (y);
+	curTrap->left.p2.x = XDoubleToFixed (x + skew - size);
+	curTrap->left.p2.y = XDoubleToFixed (y + size);
+	
+	curTrap->right.p1.x = XDoubleToFixed (x - skew + size);
+	curTrap->right.p1.y = XDoubleToFixed (y);
+	curTrap->right.p2.x = XDoubleToFixed (x + skew);
+	curTrap->right.p2.y = XDoubleToFixed (y + size);
+	
+	skew--;
+	if (skew < 0) skew = size;
+
+	y += size;
+	rows++;
+	if (y + size > HEIGHT || rows == MAXROWS) {
+	    rows = 0;
+	    y = 0;
+	    x += 2 * size;
+	    if (x + size > WIDTH) {
+		x = size;
+	    }
+	}
+    }
+
+    
+    SetFillStyle(xp, p);
+    return reps;
+}
+
+void 
+DoFixedTrapezoids(XParms xp, Parms p, int reps)
+{
+    int		i;
+    Picture	white, black, src, dst;
+
+    white = XftDrawSrcPicture (aadraw, &aawhite);
+    black = XftDrawSrcPicture (aadraw, &aablack);
+    dst = XftDrawPicture (aadraw);
+
+    src = black;
+    for (i = 0; i != reps; i++) {
+	XRenderCompositeTrapezoids (xp->d, PictOpOver, src, dst, maskFormat,
+				    0, 0, trapezoids, p->objects);
+        if (src == black)
+	    src = white;
+        else
+            src = black;
+	CheckAbort ();
+    }
+}
+
+void
+EndFixedTrapezoids (XParms xp, Parms p)
+{
+    free (trapezoids);
+    XftDrawDestroy (aadraw);
+}
+
+#endif /* XRENDER */
diff --git a/app/x11perf/do_tris.c b/app/x11perf/do_tris.c
new file mode 100644
index 000000000..5507b6c8a
--- /dev/null
+++ b/app/x11perf/do_tris.c
@@ -0,0 +1,234 @@
+/* $Xorg: do_tris.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
+
+
+#undef POLYTRIANGLE_HACK    /* don't use this code */
+#ifdef POLYTRIANGLE_HACK
+#include <X11/Xlibint.h>
+#endif
+
+#include "x11perf.h"
+#include "bitmaps.h"
+#include <stdio.h>
+#include <math.h>
+
+#define NUM_POINTS 3   /* 3 points to a triangle */
+static XPoint *points;
+static GC     pgc;
+
+#ifndef PI
+#define PI  3.14159265357989
+#endif
+
+static double 
+Area(XPoint p1, XPoint p2, XPoint p3)
+{
+    return
+      (p1.x*p2.y - p1.x*p3.y + p2.x*p3.y - p2.x*p1.y + p3.x*p1.y - p3.x*p2.y)/2;
+}
+
+/*
+static double 
+Distance(XPoint p1, XPoint p2)
+{
+    return sqrt((float) ((p1.x-p2.x)*(p1.x-p2.x) + (p1.y-p2.y)*(p1.y-p2.y)));
+}
+*/
+    
+int 
+InitTriangles(XParms xp, Parms p, int reps)
+{
+    int     i, j, numPoints;
+    int     rows;
+    int     x, y;
+    int     size, iradius;
+    double  phi, phiinc, radius, delta, phi2, area, aarea;
+    XPoint  *curPoint;
+
+    pgc = xp->fggc;
+
+    size = p->special;
+    phi = 0.0;
+    delta = 2.0 * PI / ((double) NUM_POINTS);
+    if (xp->version == VERSION1_2) {
+	radius = ((double) size) * sqrt(3.0)/2.0;
+	phiinc = delta/10.0;
+    } else {
+	/* Version 1.2's radius computation was completely bogus, and resulted
+	   in triangles with sides about 50% longer than advertised.  However,
+	   this inadvertently resulted in triangles with areas just a little bit
+	   smaller than the triangle that covers size^2 pixels, which would
+	   make the area directly comparable to 10x10 rectangles and 10x10
+	   trapezoids.  So here's the new computation so -triangleN has the same
+	   area as -rectN.
+	 */
+	radius = ((double) size) * sqrt(sqrt(16.0/27.0));
+	phiinc = 1.75*PI / ((double) p->objects);
+    }
+    iradius = (int) (radius + 0.5);
+
+    numPoints = (p->objects) * NUM_POINTS;  
+    points = (XPoint *)malloc(numPoints * sizeof(XPoint));
+    curPoint = points;
+    x = iradius;
+    y = iradius;
+    rows = 0;
+    aarea = 0.0;
+
+    for (i = 0; i != p->objects; i++) {
+	for (j = 0; j != NUM_POINTS; j++) {
+	    phi2 = phi + ((double) j) * delta;
+	    curPoint->x = (int) ((double)x + (radius * cos(phi2)) + 0.5);
+	    curPoint->y = (int) ((double)y + (radius * sin(phi2)) + 0.5);
+	    curPoint++;
+	}
+	area = Area(curPoint[-1], curPoint[-2], curPoint[-3]);
+	aarea += area;
+/*	printf("%6.1lf %6.1lf %6.1lf   %6.1lf\n",
+	    Distance(curPoint[-1], curPoint[-2]),
+	    Distance(curPoint[-1], curPoint[-3]),
+	    Distance(curPoint[-2], curPoint[-3]),
+	    area);
+*/	
+	phi += phiinc;
+	y += 2 * iradius;
+	rows++;
+	if (y + iradius > HEIGHT || rows == MAXROWS) {
+	    rows = 0;
+	    y = iradius;
+	    x += 2 * iradius;
+	    if (x + iradius > WIDTH) {
+		x = iradius;
+	    }
+	}
+    }
+/*    printf("Average area = %6.2lf\n", aarea/p->objects); */
+
+    SetFillStyle(xp, p);
+
+    return reps;
+}
+
+#ifndef POLYTRIANGLE_HACK
+
+void 
+DoTriangles(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    XPoint  *curPoint;
+
+    for (i = 0; i != reps; i++) {
+        curPoint = points;
+        for (j = 0; j != p->objects; j++) {
+            XFillPolygon(xp->d, xp->w, pgc, curPoint, NUM_POINTS, Convex, 
+			 CoordModeOrigin);
+            curPoint += NUM_POINTS;
+	}
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+
+#else
+
+static xReq _dummy_request = {
+	0, 0, 0
+};
+
+static void
+XPolyTriangle(register Display *dpy, 
+	      Drawable d, GC gc, XPoint *points, 
+	      int n_triangles, int shape, int mode)
+{
+    register xFillPolyReq *req;
+    register long nbytes;
+    int		max_triangles;
+    int		n_this_time;
+    int		*buf, *pts;
+    int		gcid;
+    int		last;
+
+    max_triangles = (dpy->bufmax - dpy->buffer) / 28;
+    LockDisplay(dpy);
+    FlushGC(dpy, gc);
+    dpy->request += n_triangles;
+    pts = (int *) points;
+    gcid = gc->gid;
+    last = shape | (mode << 8);
+    while (n_triangles)
+    {
+	if ((n_this_time = max_triangles) > n_triangles)
+	    n_this_time = n_triangles;
+	n_triangles -= n_this_time;
+	GetReqExtra(FillPoly, 
+	    (SIZEOF(xFillPolyReq) + 12) * n_this_time - SIZEOF(xFillPolyReq), req);
+	--dpy->request;
+
+	buf = req;
+        while (n_this_time--)
+	{
+	    buf[0] = X_FillPoly | (7 << 16);
+	    buf[1] = d;
+	    buf[2] = gcid;
+	    buf[3] = last;
+	    buf[4] = pts[0];
+	    buf[5] = pts[1];
+	    buf[6] = pts[2];
+	    buf += 7;
+	    pts += 3;
+	}
+    }
+    dpy->last_req = &_dummy_request;
+    UnlockDisplay(dpy);
+    SyncHandle();
+}
+
+void 
+DoTriangles(XParms xp, Parms p, int reps)
+{
+    int     i, j;
+    XPoint  *curPoint;
+
+    for (i = 0; i != reps; i++) {
+        XPolyTriangle (xp->d, xp->w, pgc, points, p->objects, Convex, 
+			 CoordModeOrigin);
+        if (pgc == xp->bggc)
+            pgc = xp->fggc;
+        else
+            pgc = xp->bggc;
+	CheckAbort ();
+    }
+}
+#endif
+
+void 
+EndTriangles(XParms xp, Parms p)
+{
+    free(points);
+}
+
diff --git a/app/x11perf/do_valgc.c b/app/x11perf/do_valgc.c
new file mode 100644
index 000000000..533d3e295
--- /dev/null
+++ b/app/x11perf/do_valgc.c
@@ -0,0 +1,78 @@
+/* $Xorg: do_valgc.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
+
+#ifndef VMS
+#include <X11/Xatom.h>
+#else
+#include <decw$include/Xatom.h>
+#endif
+#include "x11perf.h"
+
+static Window win[2];
+
+int 
+InitGC(XParms xp, Parms p, int reps)
+{
+    win[0] = XCreateSimpleWindow(
+	xp->d, xp->w, 10, 10, 10, 10, 1, xp->foreground, xp->background);
+    win[1] = XCreateSimpleWindow(
+	xp->d, xp->w, 30, 30, 10, 10, 1, xp->foreground, xp->background);
+    XMapSubwindows(xp->d, xp->w);
+    return reps;
+}
+
+void 
+DoChangeGC(XParms xp, Parms p, int reps)
+{
+    int		i;
+    XGCValues   gcv;
+
+    for (i = 0; i != reps; i++) {
+        gcv.foreground = xp->foreground;
+        XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
+        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);       
+
+        gcv.foreground = xp->background;
+        XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
+        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);       
+
+        gcv.foreground = xp->background;
+        XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
+        XDrawPoint(xp->d, win[0], xp->fggc, 5, 5);       
+
+        gcv.foreground = xp->foreground;
+        XChangeGC(xp->d, xp->fggc, GCForeground , &gcv);
+        XDrawPoint(xp->d, win[1], xp->fggc, 5, 5);       
+	CheckAbort ();
+    }
+}
+
+void 
+EndGC(XParms xp, Parms p)
+{
+    XDestroyWindow(xp->d, win[0]);
+    XDestroyWindow(xp->d, win[1]);
+}
+
diff --git a/app/x11perf/do_windows.c b/app/x11perf/do_windows.c
new file mode 100644
index 000000000..f60806309
--- /dev/null
+++ b/app/x11perf/do_windows.c
@@ -0,0 +1,283 @@
+/* $Xorg: do_windows.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.4 2000/11/29 08:58:20 keithp Exp $ */
+
+#include "x11perf.h"
+
+static Window *parents;
+static Window *isolates;
+static int childrows, childcolumns, childwindows;
+static int parentrows, parentcolumns, parentwindows;
+static int parentwidth, parentheight;
+static Window popup;
+
+static void 
+ComputeSizes(XParms xp, Parms p)
+{
+    childwindows = p->objects;
+    childrows = (childwindows + MAXCOLS - 1) / MAXCOLS;
+    childcolumns = (childrows > 1 ? MAXCOLS : childwindows);
+
+    parentwidth = (CHILDSIZE+CHILDSPACE) * childcolumns;
+    parentheight = (CHILDSIZE+CHILDSPACE) * childrows;
+}
+
+int 
+CreateParents(XParms xp, Parms p, int reps)
+{
+    int     i;
+
+    ComputeSizes(xp, p);
+
+    parentcolumns = WIDTH / parentwidth;
+    parentrows = HEIGHT / parentheight;
+    parentwindows = parentcolumns * parentrows; /* Max reps we can fit */
+
+    if (parentwindows > reps) {
+	parentwindows = reps;
+    }
+
+    /* We will do parentwindows sets of childwindows, in order to get better
+       timing accuracy.  Creating 4 windows at a millisecond apiece or so
+       is a bit faster than the 60 Hz clock. */
+    isolates = (Window *)malloc(parentwindows * sizeof(Window));
+    parents = (Window *)malloc(parentwindows * sizeof(Window));
+
+    /*
+     *  Create isolation windows for the parents, and then the parents
+     *  themselves.  These isolation windows ensure that parent and children
+     *  windows created/mapped in DoWins and DoWin2 all see the same local
+     *  environment...the parent is an only child, and each parent contains
+     *  the number of children we are trying to get benchmarks on.
+     */
+
+    for (i = 0; i != parentwindows; i++) {
+	isolates[i] = XCreateSimpleWindow(xp->d, xp->w,
+	    (i/parentrows)*parentwidth, (i%parentrows)*parentheight,
+	    parentwidth, parentheight, 0, xp->background, xp->background);
+	parents[i] = XCreateSimpleWindow(xp->d, isolates[i],
+	    0, 0, parentwidth, parentheight, 0, xp->background, xp->background);
+    }
+
+    XMapSubwindows(xp->d, xp->w);
+    return parentwindows;
+} /* CreateParents */
+
+
+void 
+MapParents(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XMapWindow(xp->d, parents[i]);
+    }
+}
+
+void 
+MapParentsCleanup(XParms xp, Parms p)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XMapWindow(xp->d, parents[i]);
+    }
+}
+
+
+int 
+InitCreate(XParms xp, Parms p, int reps)
+{
+    reps = CreateParents(xp, p, reps);
+    MapParents(xp, p, reps);
+    return reps;
+}
+
+static void 
+CreateChildGroup(XParms xp, Parms p, Window parent)
+{
+    int j;
+
+    for (j = 0; j != childwindows; j++) {
+	(void) XCreateSimpleWindow (xp->d, parent,
+		(CHILDSIZE+CHILDSPACE) * (j/childrows) + CHILDSPACE/2,
+		(CHILDSIZE+CHILDSPACE) * (j%childrows) + CHILDSPACE/2,
+		CHILDSIZE, CHILDSIZE, 0, xp->background, xp->foreground);
+    }
+
+    if (p->special)
+	XMapSubwindows (xp->d, parent);
+}
+
+void 
+CreateChildren(XParms xp, Parms p, int reps)
+{
+    int     i;
+
+    for (i = 0; i != parentwindows; i++) {
+	CreateChildGroup(xp, p, parents[i]);
+    } /* end i */
+}
+
+void 
+DestroyChildren(XParms xp, Parms p)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XDestroySubwindows(xp->d, parents[i]);
+    }
+}
+
+void 
+EndCreate(XParms xp, Parms p)
+{
+    XDestroySubwindows(xp->d, xp->w);
+    free(parents);
+    free(isolates);
+}
+
+
+int 
+InitMap(XParms xp, Parms p, int reps)
+{
+    reps = CreateParents(xp, p, reps);
+    CreateChildren(xp, p, reps);
+    return reps;
+}
+
+void 
+UnmapParents(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XUnmapWindow(xp->d, parents[i]);
+    }
+}
+
+void 
+UnmapParentsCleanup(XParms xp, Parms p)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XUnmapWindow(xp->d, parents[i]);
+    }
+}
+
+int 
+InitDestroy(XParms xp, Parms p, int reps)
+{
+    reps = CreateParents(xp, p, reps);
+    CreateChildren(xp, p, reps);
+    MapParents(xp, p, reps);
+    return reps;
+}
+
+void 
+DestroyParents(XParms xp, Parms p, int reps)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	XDestroyWindow(xp->d, parents[i]);
+    }
+}
+
+
+void 
+RenewParents(XParms xp, Parms p)
+{
+    int i;
+
+    for (i = 0; i != parentwindows; i++) {
+	parents[i] = XCreateSimpleWindow(xp->d, isolates[i],
+	    0, 0, parentwidth, parentheight, 0, xp->background, xp->background);
+    }
+    CreateChildren(xp, p, parentwindows);
+    MapParents(xp, p, parentwindows);
+}
+
+int 
+InitPopups(XParms xp, Parms p, int reps)
+{
+#ifdef CHILDROOT
+    XWindowAttributes    xwa;
+#endif
+    XSetWindowAttributes xswa;
+    Window isolate;
+
+#ifdef CHILDROOT
+    ComputeSizes(xp, p);
+    CreateChildGroup(xp, p, xp->w);
+
+    /* Now create simple window to pop up over children */
+    (void) XGetWindowAttributes(xp->d, xp->w, &xwa);
+    xswa.override_redirect = True;
+    popup =  XCreateSimpleWindow (
+	    xp->d, DefaultRootWindow(xp->d), 
+	    xwa.x + xwa.border_width, xwa.y + xwa.border_width,
+	    parentwidth, parentheight,
+	    0, xp->foreground, xp->foreground);
+#else   
+    isolate = XCreateSimpleWindow(
+	    xp->d, xp->w, 0, 0, WIDTH, HEIGHT,
+	    0, xp->background, xp->background);
+
+    ComputeSizes(xp, p);
+    CreateChildGroup(xp, p, isolate);
+    XMapWindow(xp->d, isolate);
+
+    /* Now create simple window to pop up over children */
+    xswa.override_redirect = True;
+    popup =  XCreateSimpleWindow (
+	    xp->d, xp->w, 0, 0,
+	    parentwidth, parentheight,
+	    0, xp->foreground, xp->foreground);
+#endif
+    XChangeWindowAttributes (xp->d, popup, CWOverrideRedirect, &xswa);
+    return reps;
+}
+
+void 
+DoPopUps(XParms xp, Parms p, int reps)
+{
+    int i;
+    for (i = 0; i != reps; i++) {
+        XMapWindow(xp->d, popup);
+	XUnmapWindow(xp->d, popup);
+	CheckAbort ();
+    }
+}
+
+void 
+EndPopups(XParms xp, Parms p)
+{
+    XDestroySubwindows(xp->d, xp->w);
+#ifdef CHILDROOT
+    XDestroyWindow(xp->d, popup);
+#endif
+}
+
diff --git a/app/x11perf/fillblnk b/app/x11perf/fillblnk
new file mode 100644
index 000000000..dbd2ec142
--- /dev/null
+++ b/app/x11perf/fillblnk
@@ -0,0 +1,15 @@
+#!/bin/sh
+echo '#####EOF#####' | cat $2 - $1 |
+awk -F: '\
+$1 == "#####EOF#####"	{ filling = 1; currentItem = 1; lastItem = NR; next; }
+filling != "1"	{ itemOrder[" " $1] = NR; name[NR] = $1; }
+filling == "1"	{ rate[itemOrder[$2]] = $1; }
+END	{
+	for (i = 1; i < lastItem; i++) {
+		if (rate[i] != "") {
+			printf ("%s: %s\n", rate[i], name[i]);
+		} else {
+			printf (" 0 trep @ 0.0 msec (0.0/sec): %s\n", name[i]);
+		}
+	}
+	}'
diff --git a/app/x11perf/install-sh b/app/x11perf/install-sh
new file mode 100644
index 000000000..6ce63b9f7
--- /dev/null
+++ b/app/x11perf/install-sh
@@ -0,0 +1,294 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+#
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd=$cpprog
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd=$stripprog
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "$0: no input file specified" >&2
+	exit 1
+else
+	:
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+
+	if [ -d "$dst" ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=$mkdirprog
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f "$src" ] || [ -d "$src" ]
+	then
+		:
+	else
+		echo "$0: $src does not exist" >&2
+		exit 1
+	fi
+
+	if [ x"$dst" = x ]
+	then
+		echo "$0: no destination specified" >&2
+		exit 1
+	else
+		:
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d "$dst" ]
+	then
+		dst=$dst/`basename "$src"`
+	else
+		:
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+	'
+IFS="${IFS-$defaultIFS}"
+
+oIFS=$IFS
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp=$pathcomp$1
+	shift
+
+	if [ ! -d "$pathcomp" ] ;
+        then
+		$mkdirprog "$pathcomp"
+	else
+		:
+	fi
+
+	pathcomp=$pathcomp/
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd "$dst" &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		dstfile=`basename "$dst" $transformbasename |
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		:
+	fi
+
+# Make a couple of temp file names in the proper directory.
+
+	dsttmp=$dstdir/_inst.$$_
+	rmtmp=$dstdir/_rm.$$_
+
+# Trap to clean up temp files at exit.
+
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
+
+# Now rename the file to the real destination.
+
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+fi &&
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+
+{
+	(exit 0); exit
+}
diff --git a/app/x11perf/missing b/app/x11perf/missing
new file mode 100644
index 000000000..fc54c64ec
--- /dev/null
+++ b/app/x11perf/missing
@@ -0,0 +1,336 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing 0.4 - GNU automake"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/app/x11perf/mkinstalldirs b/app/x11perf/mkinstalldirs
new file mode 100644
index 000000000..d2d5f21b6
--- /dev/null
+++ b/app/x11perf/mkinstalldirs
@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage" 1>&2
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+case $dirmode in
+  '')
+    if mkdir -p -- . 2>/dev/null; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    fi
+    ;;
+esac
+
+for file
+do
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
+
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+  	errstatus=$lasterr
+      else
+  	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+    	  lasterr=""
+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
+      fi
+    fi
+
+    pathcomp="$pathcomp/"
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here
diff --git a/app/x11perf/perfboth b/app/x11perf/perfboth
new file mode 100644
index 000000000..f529841fe
--- /dev/null
+++ b/app/x11perf/perfboth
@@ -0,0 +1,40 @@
+#!/bin/sh
+awk '
+/^     1/ && READY == 0 {	printf ("    1   ");
+		for (i = 2; i < NF; i++)
+			printf ("          %2d        ", i);
+		printf ("   Operation\n");
+		next;
+	}
+/^---/	{ 	printf ("--------");
+		for (i = 2; i <= NF; i++)
+			printf ("   -----------------");
+		printf ("\n");
+		READY=1; next;
+ 	}
+READY==1 {
+		base=$1;
+		printf ("%8.1f", base);
+		for (i = 2; i < '$1'; i++) {
+			if (base == 0)
+				printf ("   %8.1f         ", $i);
+			else {
+				rate=$i/base;
+				if (rate < .1)
+					printf ("   %8.1f (%6.3f)", $i, rate);
+				else if (rate < 1000)
+					printf ("   %8.1f (%6.2f)", $i, rate);
+				else
+					printf ("   %8.1f (%6.0f)", $i, rate);
+			}
+		}
+		printf ("   ");
+		for (; i <= NF; i++)
+		{
+			printf ("%s ", $i);
+		}
+		printf ("\n");
+		next;
+	   }
+	   { print $0; }
+'
diff --git a/app/x11perf/perfratio b/app/x11perf/perfratio
new file mode 100644
index 000000000..6ff3a12c9
--- /dev/null
+++ b/app/x11perf/perfratio
@@ -0,0 +1,40 @@
+#!/bin/sh
+awk '
+/^     1/ && READY == 0 {	printf ("     1  ");
+		for (i = 2; i < NF; i++)
+			printf ("     %2d ", i);
+		printf ("   Operation\n");
+		next;
+	}
+/^---/	{ 	printf ("--------");
+		for (i = 2; i < NF; i++)
+			printf ("  ------");
+		printf ("   ---------\n");
+		READY=1; next;
+ 	}
+READY==1 {
+		base=$1;
+		printf ("%8.1f", base);
+		for (i = 2; i < '$1'; i++) {
+			if (base == 0)
+				printf ("   lots ", $i);
+			else {
+				rate=$i/base;
+				if (rate < .1)
+					printf ("  %6.3f", rate);
+				else if (rate < 1000)
+					printf ("  %6.2f", rate);
+				else
+					printf ("  %6.0f", rate);
+			}
+		}
+		printf ("   ");
+		for (; i <= NF; i++)
+		{
+			printf ("%s ", $i);
+		}
+		printf ("\n");
+		next;
+	   }
+	   { print $0; }
+'
diff --git a/app/x11perf/x11pcomp.cpp b/app/x11perf/x11pcomp.cpp
new file mode 100644
index 000000000..dd0309eed
--- /dev/null
+++ b/app/x11perf/x11pcomp.cpp
@@ -0,0 +1,104 @@
+XCOMM! /bin/sh
+XCOMM
+XCOMM $XFree86$
+XCOMM
+XCOMM Collects multiple outputs of x11perf.  Just feed it a list of files, each
+XCOMM containing the output from an x11perf run, and this shell will extract the
+XCOMM object/second information and show it in tabular form.  An 80-column line
+XCOMM is big enough to compare 4 different servers.
+XCOMM
+XCOMM This script normally uses the results from $1 to extract the test label
+XCOMM descriptions, so you can run x11perf on a subset of the test and then
+XCOMM compare the results.  But note that x11perffill requires the labels file
+XCOMM to be a superset of the x11perf results file.  If you run into an ugly
+XCOMM situation in which none of the servers completes the desired tests 
+XCOMM (quite possible on non-DEC servers :), you can use -l <filename> as $1 and
+XCOMM $2 to force x11perfcomp to use the labels stored in file $2.  (You can run
+XCOMM x11perf with the -labels option to generate such a file.)
+XCOMM
+XCOMM Mark Moraes, University of Toronto <moraes@csri.toronto.edu>
+XCOMM Joel McCormack, DEC Western Research Lab <joel@decwrl.dec.com>
+XCOMM
+XCOMM $Xorg: x11pcomp.cpp,v 1.3 2000/08/17 19:54:10 cpqbld Exp $
+
+PATH=LIBPATH:.:$PATH
+export PATH
+
+set -e
+tmp=${TMPDIR-/tmp}/rates.$$
+trap "rm -rf $tmp" 0 1 2 15
+mkdir $tmp || exit 1
+mkdir $tmp/rates
+ratio=
+allfiles=
+XCOMM Include relative rates in output?  Report only relative rates?
+case $1 in
+-r|-a)
+	ratio=1
+	shift;
+	;;
+-ro)
+	ratio=2
+	shift;
+	;;
+esac
+XCOMM Get either the provided label file, or construct one from all the
+XCOMM files given.
+case $1 in
+-l)	cp $2 $tmp/labels
+	shift; shift
+	;;
+*)	for file in "$@"; do
+		awk '$2 == "reps" || $2 == "trep" { print $0; next; }' $file |
+ 		sed 's/^.*: //' |
+ 		sed 's/ /_/g' |
+ 		awk 'NR > 1 	{ printf ("%s %s\n", prev, $0); } \
+				{ prev = $0; }'
+	done | tsort 2>/dev/null | sed 's/_/ /g' > $tmp/labels
+	;;
+esac
+XCOMM Go through all files, and create a corresponding rate file for each
+n=1
+for i
+do
+XCOMM Get lines with average numbers, fill in any tests that may be missing
+XCOMM then extract the rate field
+	base=`basename $i`
+	(echo "     $n  "
+	 echo '--------'
+	 awk '$2 == "reps" || $2 == "trep" { \
+		line = $0; \
+		next; \
+	    } \
+	    NF == 0 && line != "" { \
+		print line; \
+		line=""; \
+		next; \
+	    } \
+	 ' $i > $tmp/$n.avg
+	 fillblnk $tmp/$n.avg $tmp/labels |
+	 sed 's/( *\([0-9]*\)/(\1/'   |
+	 awk '$2 == "reps" || $2 == "trep" { \
+	 					n = substr($6,2,length($6)-7); \
+						printf "%8s\n", n; \
+    	 				   }'
+	) > $tmp/rates/$n
+	echo "$n: $i"
+	allfiles="$allfiles$tmp/rates/$n "
+	n=`expr $n + 1`
+done
+case x$ratio in
+x)
+	ratio=/bin/cat
+	;;
+x1)
+	ratio="perfboth $n"
+	;;
+*)
+	ratio="perfratio $n"
+	;;
+esac
+echo ''
+(echo Operation; echo '---------'; cat $tmp/labels) |
+paste $allfiles - | sed 's/	/  /g' | $ratio
+rm -rf $tmp
diff --git a/app/x11perf/x11perf.c b/app/x11perf/x11perf.c
new file mode 100644
index 000000000..f3e588855
--- /dev/null
+++ b/app/x11perf/x11perf.c
@@ -0,0 +1,1424 @@
+/* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */
+/* $XdotOrg: app/x11perf/x11perf.c,v 1.4 2006/02/14 02:48:22 anholt Exp $ */
+/****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+****************************************************************************/
+/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.6 2001/11/03 21:59:20 dawes Exp $ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include <signal.h>
+
+#ifndef VMS
+#include <X11/Xatom.h>
+#include <X11/Xos.h>
+#else
+#include <decw$include/Xatom.h>
+#endif
+#include "x11perf.h"
+#include <X11/Xmu/SysUtil.h>
+
+#include <time.h>
+#define Time_t time_t
+#include <stdlib.h>
+
+/* Only for working on ``fake'' servers, for hardware that doesn't exist */
+static Bool     drawToFakeServer = False;
+static Pixmap   tileToQuery     = None;
+static char *displayName;
+int	abortTest;
+
+typedef struct _RopNames { char	*name; int  rop; } RopNameRec, *RopNamePtr;
+
+RopNameRec ropNames[] = {
+	{ "clear",    	  GXclear },		/* 0 */
+	{ "and",	  GXand },		/* src AND dst */
+	{ "andReverse",	  GXandReverse }, 	/* src AND NOT dst */
+	{ "copy",	  GXcopy },		/* src */
+	{ "andInverted",  GXandInverted },	/* NOT src AND dst */
+	{ "noop",	  GXnoop },		/* dst */
+	{ "xor",	  GXxor },		/* src XOR dst */
+	{ "or",		  GXor },		/* src OR dst */
+	{ "nor",	  GXnor },		/* NOT src AND NOT dst */
+	{ "equiv",	  GXequiv },		/* NOT src XOR dst */
+	{ "invert",	  GXinvert },		/* NOT dst */
+	{ "orReverse",	  GXorReverse },	/* src OR NOT dst */
+	{ "copyInverted", GXcopyInverted },	/* NOT src */
+	{ "orInverted",	  GXorInverted },	/* NOT src OR dst */
+	{ "nand",	  GXnand },		/* NOT src OR NOT dst */
+	{ "set",	  GXset }		/* 1 */
+};
+
+char *(visualClassNames)[] = {
+    "StaticGray",
+    "GrayScale",
+    "StaticColor",
+    "PseudoColor",
+    "TrueColor",
+    "DirectColor"
+};
+
+static Bool     labels		= False;
+static int      repeat		= 5;
+static int	seconds		= 5;
+
+static Window   status;     /* Status window and GC */
+static GC       tgc;
+static int	HSx, HSy;
+
+static double syncTime = 0.0;
+
+static int saveargc;
+static char **saveargv;
+
+static int  numRops = 1;
+static int  rops[16] = { GXcopy };
+static int  numPlanemasks = 1;
+static unsigned long planemasks[256] = { (unsigned long)~0 };
+
+static char *foreground = NULL;
+static char *background = NULL;
+static char *ddbackground = NULL;
+static int clips = 0;
+
+static int numSubWindows = 7;
+static unsigned long subWindows[] = {4, 16, 25, 50, 75, 100, 200, 0};
+
+static int  fixedReps = 0;
+
+static Bool *doit;
+
+static XRectangle ws[] = {  /* Clip rectangles */
+    {195, 195, 120, 120},
+    { 45, 145, 120, 120},
+    {345, 245, 120, 120},
+    { 45, 275, 120, 120},
+    {345, 115, 120, 120},
+    {195, 325, 120, 120}
+
+};
+#define MAXCLIP     (sizeof(ws) / sizeof(ws[0]))
+static Window clipWindows[MAXCLIP];
+static Colormap cmap;
+static int depth = -1;  /* -1 means use default depth */
+static int vclass = -1; /* -1 means use CopyFromParent */
+
+/* ScreenSaver state */
+static XParmRec    xparms;
+static int ssTimeout, ssInterval, ssPreferBlanking, ssAllowExposures;
+
+/* Static functions */
+static int GetWords(int argi, int argc, char **argv, char **wordsp, int *nump);
+static int GetNumbers(int argi, int argc, char **argv, unsigned long *intsp, 
+		      int *nump);
+static int GetRops(int argi, int argc, char **argv, int *ropsp, int *nump);
+
+/************************************************
+*	    time related stuff			*
+************************************************/
+
+#ifdef VMS
+
+typedef struct _vms_time {
+    unsigned long low;
+    unsigned long high;
+}vms_time;
+
+struct timeval {
+    long tv_sec;        /* seconds since Jan. 1, 1970 */
+    long tv_usec;  /* and microseconds */
+};
+
+struct timezone {
+    int  tz_minuteswest;     /* of Greenwich */
+    int  tz_dsttime;    /* type of dst correction to apply */
+};
+
+
+static int firsttime = True;
+static vms_time basetime;
+
+int gettimeofday(tp)
+    struct timeval *tp;
+{
+    vms_time current_time, resultant;
+    unsigned long mumble, foo;
+    int status;
+
+    if (firsttime) {
+        sys$gettim(&basetime);
+        firsttime = False;
+    }
+    sys$gettim(&current_time);
+    resultant.high = current_time.high - basetime.high;
+    resultant.low = current_time.low - basetime.low;
+    if (current_time.low < basetime.low) {
+        resultant.high -= 1;
+    }
+    status = lib$ediv( &(10000000), &resultant, &tp->tv_sec, &tp->tv_usec);
+    tp->tv_usec /= 10;
+    return 0;
+}
+
+#endif
+
+static struct  timeval start;
+
+static void 
+PrintTime(void)
+{
+    Time_t t;
+
+    t = time((Time_t *)NULL);
+    printf("%s\n", ctime(&t));
+}
+
+static void 
+InitTimes(void)
+{
+    X_GETTIMEOFDAY(&start);
+}
+
+static double 
+ElapsedTime(double correction)
+{
+    struct timeval stop;
+
+    X_GETTIMEOFDAY(&stop);
+    if (stop.tv_usec < start.tv_usec) {
+        stop.tv_usec += 1000000;
+	stop.tv_sec -= 1;
+    }
+    return  (double)(stop.tv_usec - start.tv_usec) +
+            (1000000.0 * (double)(stop.tv_sec - start.tv_sec)) - correction;
+}
+
+static double 
+RoundTo3Digits(double d)
+{
+    /* It's kind of silly to print out things like ``193658.4/sec'' so just
+       junk all but 3 most significant digits. */
+
+    double exponent, sign;
+
+    exponent = 1.0;
+    /* the code below won't work if d should happen to be non-positive. */
+    if (d < 0.0) {
+	d = -d;
+	sign = -1.0;
+    } else
+	sign = 1.0;
+    if (d >= 1000.0) {
+	do {
+	    exponent *= 10.0;
+	} while (d/exponent >= 1000.0);
+	d = (double)((int) (d/exponent + 0.5));
+	d *= exponent;
+    } else {
+	if (d != 0.0) {
+	    while (d*exponent < 100.0) {
+	        exponent *= 10.0;
+	    }
+	}
+	d = (double)((int) (d*exponent + 0.5));
+	d /= exponent;
+    }
+    return d * sign;
+}
+
+
+static void 
+ReportTimes(double usecs, int n, char *str, int average)
+{
+    double msecsperobj, objspersec;
+
+    if(usecs != 0.0)
+    {
+        msecsperobj = usecs / (1000.0 * (double)n);
+        objspersec = (double) n * 1000000.0 / usecs;
+
+        /* Round obj/sec to 3 significant digits.  Leave msec untouched, to
+	   allow averaging results from several repetitions. */
+        objspersec =  RoundTo3Digits(objspersec);
+
+        if (average) {
+	    printf("%7d trep @ %8.4f msec (%8.1f/sec): %s\n", 
+		    n, msecsperobj, objspersec, str);
+	} else {
+	    printf("%7d reps @ %8.4f msec (%8.1f/sec): %s\n", 
+	        n, msecsperobj, objspersec, str);
+	}
+    } else {
+	printf("%6d %sreps @ 0.0 msec (unmeasurably fast): %s\n",
+	    n, average ? "t" : "", str);
+    }
+
+}
+
+
+
+/************************************************
+*		Generic X stuff			*
+************************************************/
+
+static char *program_name;
+static void usage(void);
+
+/*
+ * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
+ * If found, remove it from command line.  Don't go past a lone -.
+ */
+static char *
+Get_Display_Name(int *pargc, /* MODIFIED */
+		 char **argv) /* MODIFIED */
+{
+    int     argc = *pargc;
+    char    **pargv = argv+1;
+    char    *displayname = NULL;
+    int     i;
+
+    for (i = 1; i != argc; i++) {
+	char *arg = argv[i];
+
+	if (!strcmp (arg, "-display") || !strcmp (arg, "-d")) {
+	    if (++i >= argc) usage ();
+
+	    displayname = argv[i];
+	    *pargc -= 2;
+	    continue;
+	}
+	if (!strcmp(arg,"-")) {
+	    while (i<argc)  *pargv++ = argv[i++];
+	    break;
+	}
+	*pargv++ = arg;
+    }
+
+    *pargv = NULL;
+    return (displayname);
+}
+
+
+/*
+ * GetVersion (argc, argv) Look for -v1.2, -v1.3, or -v1.4.
+ * If found remove it from command line.  Don't go past a lone -.
+ */
+
+static Version 
+GetVersion(int *pargc, /* MODIFIED */
+	   char **argv)  /* MODIFIED */
+{
+    int     argc = *pargc;
+    char    **pargv = argv+1;
+    Version version = VERSION1_5;
+    int     i;
+    Bool    found = False;
+
+    for (i = 1; i != argc; i++) {
+	char *arg = argv[i];
+
+	if (!strcmp (arg, "-v1.2")) {
+	    version = VERSION1_2;
+	    *pargc -= 1;
+	    if (found) {
+		fprintf(stderr, "Warning: multiple version specifications\n");
+	    }
+	    found = True;
+	    continue;
+	}
+	if (!strcmp (arg, "-v1.3")) {
+	    version = VERSION1_3;
+	    *pargc -= 1;
+	    if (found) {
+		fprintf(stderr, "Warning: multiple version specifications\n");
+	    }
+	    found = True;
+	    continue;
+	}
+	if (!strcmp (arg, "-v1.4")) {
+	    version = VERSION1_4;
+	    *pargc -= 1;
+	    if (found) {
+		fprintf(stderr, "Warning: multiple version specifications\n");
+	    }
+	    found = True;
+	    continue;
+	}
+	if (!strcmp(arg,"-")) {
+	    while (i<argc)  *pargv++ = argv[i++];
+	    break;
+	}
+	*pargv++ = arg;
+    }
+
+    *pargv = NULL;
+    return (version);
+}
+
+
+
+/*
+ * Open_Display: Routine to open a display with correct error handling.
+ */
+static Display *
+Open_Display(char *display_name)
+{
+    Display *d;
+
+    d = XOpenDisplay(display_name);
+    if (d == NULL) {
+	fprintf (stderr, "%s:  unable to open display '%s'\n",
+		 program_name, XDisplayName (display_name));
+	exit(1);
+    }
+
+    return(d);
+}
+
+
+/* defined by autoconf AC_TYPE_SIGNAL, need to define for Imake */
+#ifndef RETSIGTYPE 
+# ifdef SIGNALRETURNSINT
+#  define RETSIGTYPE int
+# else
+#  define RETSIGTYPE void
+# endif
+#endif
+
+static RETSIGTYPE
+Cleanup(int sig)
+{
+    abortTest = sig;
+}
+
+void
+AbortTest(void)
+{
+    fflush(stdout);
+    
+    XSetScreenSaver(xparms.d, ssTimeout, ssInterval, ssPreferBlanking,
+	ssAllowExposures);
+    XFlush(xparms.d);
+    exit (abortTest);
+}
+
+/************************************************
+*		Performance stuff		*
+************************************************/
+
+
+static void 
+usage(void)
+{
+    char    **cpp;
+    int     i = 0;
+    static char *help_message[] = {
+"where options include:",
+"    -display <host:display>   the X server to contact",
+"    -sync                     do the tests in synchronous mode",
+"    -pack                     pack rectangles right next to each other",
+"    -repeat <n>               do tests <n> times (default = 5)",
+"    -time <s>                 do tests for <s> seconds each (default = 5)",
+/*
+"    -draw                     draw after each test -- pmax only",
+*/
+"    -all                      do all tests",
+"    -range <test1>[,<test2>]  like all, but do <test1> to <test2>",
+"    -labels                   generate test labels for use by fillblnk",
+"    -fg                       the foreground color to use",
+"    -bg                       the background color to use",
+"    -clips <default>          default number of clip windows per test",
+"    -ddbg                     the background color to use for DoubleDash",
+"    -rop <rop0 rop1 ...>      use the given rops to draw (default = GXcopy)",
+"    -pm <pm0 pm1 ...>         use the given planemasks to draw (default = ~0)",
+"    -depth <depth>            use a visual with <depth> planes per pixel",
+"    -vclass <class>           the visual class to use (default = root)",
+"    -reps <n>                 fix the rep count (default = auto scale)",
+"    -subs <s0 s1 ...>         a list of the number of sub-windows to use",
+"    -v1.2                     perform only v1.2 tests using old semantics",
+"    -v1.3                     perform only v1.3 tests using old semantics",
+"    -su                       request save unders on windows",
+"    -bs <backing_store_hint>  WhenMapped or Always (default = NotUseful)",
+NULL};
+
+    fflush(stdout);
+    fprintf(stderr, "usage: %s [-options ...]\n", program_name);
+    for (cpp = help_message; *cpp; cpp++) {
+	fprintf(stderr, "%s\n", *cpp);
+    }
+    while (test[i].option != NULL) {
+	if (test[i].versions & xparms.version ) {
+	    fprintf(stderr, "    %-24s   %s\n",
+		test[i].option,
+		test[i].label14 ? test[i].label14 : test[i].label);
+	}
+        i++;
+    }
+    fprintf(stderr, "\n");
+    
+    /* Print out original command line as the above usage message is so long */
+    for (i = 0; i != saveargc; i++) {
+	fprintf(stderr, "%s ", saveargv[i]);
+    }
+    fprintf(stderr, "\n\n");
+    exit (1);
+}
+
+void 
+NullProc(XParms xp, Parms p)
+{
+}
+
+int 
+NullInitProc(XParms xp, Parms p, int reps)
+{
+    return reps;
+}
+
+static void 
+HardwareSync(XParms xp)
+{
+    /*
+     * Some graphics hardware allows the server to claim it is done,
+     * while in reality the hardware is busily working away.  So fetch
+     * a pixel from the drawable that was drawn to, which should be
+     * enough to make the server wait for the graphics hardware.
+     */
+    XImage *image;
+
+    image = XGetImage(xp->d, xp->p ? xp->p : xp->w, HSx, HSy, 
+		      1, 1, ~0, ZPixmap);
+    if (image) XDestroyImage(image);
+}
+
+static void 
+DoHardwareSync(XParms xp, Parms p, int reps)    
+{
+    int i;
+    
+    for (i = 0; i != reps; i++) {
+	HardwareSync(xp);
+	CheckAbort ();
+    }
+}
+
+static Test syncTest = {
+    "syncTime", "Internal test for finding how long HardwareSync takes", NULL,
+    NullInitProc, DoHardwareSync, NullProc, NullProc, 
+    V1_2FEATURE, NONROP, 0,
+    {1}
+};
+
+
+static Window 
+CreatePerfWindow(XParms xp, int x, int y, int width, int height)
+{
+    XSetWindowAttributes xswa;
+    Window w;
+/*
+    Screen *s;
+    int su;
+
+    s = DefaultScreenOfDisplay(xp->d);
+    su = XDoesBackingStore(s);
+    printf("Backing store of screen returns %d\n", su);
+    su = XDoesSaveUnders(s);
+    printf("Save unders of screen returns %d\n", su);
+    su = XPlanesOfScreen(s);
+    printf("Planes of screen returns %d\n", su);
+*/
+    xswa.background_pixel = xp->background;
+    xswa.border_pixel = xp->foreground;
+    xswa.colormap = cmap;
+    xswa.override_redirect = True;
+    xswa.backing_store = xp->backing_store;
+    xswa.save_under = xp->save_under;
+    w = XCreateWindow(xp->d, DefaultRootWindow(xp->d), x, y, width, height, 1,
+        xp->vinfo.depth, CopyFromParent, xp->vinfo.visual,
+	CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect 
+	| CWBackingStore | CWSaveUnder, &xswa);
+    XMapWindow (xp->d, w);
+    return w;
+}
+
+
+static void 
+CreateClipWindows(XParms xp, int clips)
+{
+    int j;
+    XWindowAttributes    xwa;
+
+    (void) XGetWindowAttributes(xp->d, xp->w, &xwa);
+    if (clips > MAXCLIP) clips = MAXCLIP;
+    for (j = 0; j != clips; j++) {
+	clipWindows[j] = CreatePerfWindow(xp,
+	    xwa.x + ws[j].x, xwa.y + ws[j].y, ws[j].width, ws[j].height);
+    }
+} /* CreateClipWindows */
+
+
+static void 
+DestroyClipWindows(XParms xp, int clips)
+{
+    int j;
+
+    if (clips > MAXCLIP) clips = MAXCLIP;
+    for (j = 0; j != clips; j++) {
+	XDestroyWindow(xp->d, clipWindows[j]);
+    }
+} /* DestroyClipWindows */
+
+
+static double 
+DoTest(XParms xp, Test *test, int reps)
+{
+    double  time;
+    unsigned int ret_width, ret_height;
+
+    /* Tell screen-saver to restart counting again.  See comments below for the
+       XSetScreenSaver call. */
+    XForceScreenSaver(xp->d, ScreenSaverReset);
+    HardwareSync (xp); 
+    InitTimes ();
+    (*test->proc) (xp, &test->parms, reps);
+    HardwareSync(xp);
+
+    time = ElapsedTime(syncTime);
+    CheckAbort ();
+    if (drawToFakeServer)
+        XQueryBestSize(xp->d, TileShape, tileToQuery,
+		       32, 32, &ret_width, &ret_height);
+    (*test->passCleanup) (xp, &test->parms);
+    return time;
+}
+
+
+static int 
+CalibrateTest(XParms xp, Test *test, int seconds, double *usecperobj)
+{
+#define goal    2500000.0   /* Try to get up to 2.5 seconds		    */
+#define enough  2000000.0   /* But settle for 2.0 seconds		    */
+#define tick      10000.0   /* Assume clock not faster than .01 seconds     */
+
+    double  usecs;
+    int     reps, didreps;  /* Reps desired, reps performed		    */
+    int     exponent;
+
+    /* Attempt to get an idea how long each rep lasts by getting enough
+       reps to last more tan enough.  Then scale that up to the number of
+       seconds desired.
+
+       If init call to test ever fails, return False and test will be skipped.
+    */
+
+    if (fixedReps != 0) {
+	return fixedReps;
+    }
+    reps = 1;
+    for (;;) {
+	XDestroySubwindows(xp->d, xp->w);
+	XClearWindow(xp->d, xp->w);
+	didreps = (*test->init) (xp, &test->parms, reps);
+	CheckAbort ();
+	if (didreps == 0) {
+	    return 0;
+	}
+	if ( test->clips < clips )
+	  test->clips = clips ;
+	/* Create clip windows if requested */
+	CreateClipWindows(xp, test->clips);
+	HardwareSync(xp);
+	InitTimes();
+	(*test->proc) (xp, &test->parms, reps);
+	HardwareSync(xp);
+	usecs = ElapsedTime(syncTime);
+	(*test->passCleanup) (xp, &test->parms);
+	(*test->cleanup) (xp, &test->parms);
+	DestroyClipWindows(xp, test->clips);
+	CheckAbort ();
+
+	if (didreps != reps) {
+	    /* The test can't do the number of reps as we asked for.  
+	       Give up */
+	    *usecperobj = 
+		usecs / (double)(didreps * test->parms.objects);
+	    return didreps;
+	}
+	/* Did we go long enough? */
+	if (usecs >= enough) break;
+
+	/* Don't let too short a clock make new reps wildly high */
+	if (usecs <= tick)reps = reps*10;
+	else{
+	    /* Try to get up to goal seconds. */
+	    reps = (int) (goal * (double)reps / usecs) + 1;
+	}
+    }
+
+    *usecperobj = usecs / (double) (reps * test->parms.objects);
+    reps = (int) ((double)seconds * 1000000.0 * (double)reps / usecs) + 1;
+
+    /* Now round reps up to 1 digit accuracy, so we don't get stupid-looking
+       numbers of repetitions. */
+    reps--;
+    exponent = 1;
+    while (reps > 9) {
+	reps /= 10;
+	exponent *= 10;
+    }
+    reps = (reps + 1) * exponent;
+    return reps;
+} /* CalibrateTest */
+
+static void 
+CreatePerfGCs(XParms xp, int func, unsigned long pm)
+{
+    XGCValues gcvfg, gcvbg, gcvddbg,gcvddfg;
+    unsigned long	fg, bg, ddbg;
+
+    fg = xp->foreground;
+    bg = xp->background;
+    ddbg = xp->ddbackground;
+    gcvfg.graphics_exposures = False;
+    gcvbg.graphics_exposures = False;
+    gcvddfg.graphics_exposures = False;
+    gcvddbg.graphics_exposures = False;
+    gcvfg.plane_mask = pm;
+    gcvbg.plane_mask = pm;
+    gcvddfg.plane_mask = pm;
+    gcvddbg.plane_mask = pm;
+    gcvfg.function = func;
+    gcvbg.function = func;
+    gcvddfg.function = func;
+    gcvddbg.function = func;
+    
+    if (func == GXxor) {
+	/* Make test look good visually if possible */
+	gcvbg.foreground = gcvfg.foreground = bg ^ fg;
+	gcvbg.background = gcvfg.background = bg;
+	/* Double Dash GCs (This doesn't make a huge amount of sense) */
+	gcvddbg.foreground = gcvddfg.foreground = bg ^ fg;
+	gcvddbg.background = gcvddfg.foreground = bg ^ ddbg;
+    } else {
+	gcvfg.foreground = fg;
+	gcvfg.background = bg;
+	gcvbg.foreground = bg;
+	gcvbg.background = fg;
+	gcvddfg.foreground = fg;
+	gcvddfg.background = ddbg;
+	gcvddbg.foreground = ddbg;
+	gcvddbg.background = fg;
+    }
+    xp->fggc = XCreateGC(xp->d, xp->w,
+	GCForeground | GCBackground | GCGraphicsExposures
+      | GCFunction | GCPlaneMask, &gcvfg);
+    xp->bggc = XCreateGC(xp->d, xp->w, 
+	GCForeground | GCBackground | GCGraphicsExposures
+      | GCFunction | GCPlaneMask, &gcvbg);
+    xp->ddfggc = XCreateGC(xp->d, xp->w,
+	GCForeground | GCBackground | GCGraphicsExposures
+      | GCFunction | GCPlaneMask, &gcvddfg);
+    xp->ddbggc = XCreateGC(xp->d, xp->w, 
+	GCForeground | GCBackground | GCGraphicsExposures
+      | GCFunction | GCPlaneMask, &gcvddbg);
+}
+
+
+static void 
+DestroyPerfGCs(XParms xp)
+{
+    XFreeGC(xp->d, xp->fggc);
+    XFreeGC(xp->d, xp->bggc);
+    XFreeGC(xp->d, xp->ddfggc);
+    XFreeGC(xp->d, xp->ddbggc);
+}
+
+static unsigned long 
+AllocateColor(Display *display, char *name, unsigned long pixel)
+{
+    XColor      color;
+
+    if (name != NULL) {
+	/* Try to parse color name */
+	if (XParseColor(display, cmap, name, &color)) {
+	    if (XAllocColor(display, cmap, &color)) {
+		pixel = color.pixel;
+	    } else {
+		(void) fprintf(stderr,
+		    "Can't allocate colormap entry for color %s\n", name);
+	    }
+	} else {
+	    if(*name >= '0' && *name <= '9')
+		pixel = atoi(name);
+	    else
+		(void) fprintf(stderr, "Can't parse color name %s\n", name);
+	}
+    }
+    return pixel;
+} /* AllocateColor */
+
+
+static void 
+DisplayStatus(Display *d, char *message, char *test, int try)
+{
+    char    s[500];
+
+    XClearWindow(d, status);
+    sprintf(s, "%d %s %s", try, message, test);
+    /* We should really look at the height, descent of the font, etc. but
+       who cares.  This works. */
+    XDrawString(d, status, tgc, 10, 13, s, strlen(s));
+}
+
+
+static void 
+ProcessTest(XParms xp, Test *test, int func, unsigned long pm, char *label)
+{
+    double  time, totalTime;
+    int     reps;
+    int     j;
+
+    xp->planemask = pm;
+    CreatePerfGCs(xp, func, pm);
+    DisplayStatus(xp->d, "Calibrating", label, 0);
+    reps = CalibrateTest(xp, test, seconds, &time);
+    if (reps != 0) {
+	srand(1);	/* allow reproducible results */
+	XDestroySubwindows(xp->d, xp->w);
+	XClearWindow(xp->d, xp->w);
+	reps = (*test->init) (xp, &test->parms, reps);
+	if (abortTest)
+	    AbortTest ();
+	/*
+	 * if using fixedReps then will not have done CalibrateTest so must
+	 * check result of init for 0 here
+	 */
+	if(reps == 0){
+	    DestroyPerfGCs(xp);
+	    return;
+	}
+	/* Create clip windows if requested */
+	CreateClipWindows(xp, test->clips);
+
+	totalTime = 0.0;
+	for (j = 0; j != repeat; j++) {
+	    DisplayStatus(xp->d, "Testing", label, j+1);
+	    time = DoTest(xp, test, reps);
+	    if (abortTest)
+		AbortTest ();
+	    totalTime += time;
+	    ReportTimes (time, reps * test->parms.objects,
+		    label, False);
+	}
+	if (repeat > 1) {
+	    ReportTimes(totalTime,
+		repeat * reps * test->parms.objects,
+		label, True);
+	}
+	(*test->cleanup) (xp, &test->parms);
+	DestroyClipWindows(xp, test->clips);
+    } else {
+	/* Test failed to initialize properly */
+    }
+    printf ("\n");
+    fflush(stdout);
+    DestroyPerfGCs(xp);
+} /* ProcessTest */
+
+#define Strstr strstr
+
+#define LABELP(i) (test[i].label14 && (xparms.version >= VERSION1_4) \
+		        ? test[i].label14 : test[i].label)
+
+int
+main(int argc, char *argv[])
+{
+    int		i, j, n, skip;
+    int		numTests;       /* Even though the linker knows, we don't. */
+    char	hostname[100];
+    Bool	foundOne = False;
+    Bool	synchronous = False;
+    XGCValues	tgcv;
+    int		screen;
+    int		rop, pm;
+    int		window_y, window_x;
+    XVisualInfo *vinfolist, vinfotempl;
+    unsigned long vmask;
+
+    /* Save away argv, argc, for usage to print out */
+    saveargc = argc;
+    saveargv = (char **) malloc(argc * sizeof(char *));
+    for (i = 0; i != argc; i++) {
+	saveargv[i] = argv[i];
+    }
+
+    xparms.pack = False;
+    xparms.save_under = False;
+    xparms.backing_store = NotUseful;
+
+    /* Count number of tests */
+    ForEachTest(numTests);
+    doit = (Bool *)calloc(numTests, sizeof(Bool));
+
+    /* Parse arguments */
+    program_name = argv[0];
+    displayName = Get_Display_Name (&argc, argv);
+    xparms.version = GetVersion(&argc, argv);
+    for (i = 1; i != argc; i++) {
+	if (strcmp (argv[i], "-all") == 0) {
+	    ForEachTest (j)
+		doit[j] = test[j].versions & xparms.version;
+	    foundOne = True;
+	} else if (strcmp (argv[i], "-labels") == 0) {
+	    labels = True;
+	} else if (strcmp(argv[i], "-range") == 0) {
+	    char *cp1;
+	    char *cp2;
+	    
+	    if (argc <= ++i)
+		usage();
+	    cp1 = argv[i];
+	    if (*cp1 == '-')
+		cp1++;
+	    for (cp2 = cp1; *cp2 != '\0' && *cp2 != ','; cp2++) {};
+	    if (*cp2 == ',') {
+		*cp2++ = '\0';
+		if (*cp2 == '-')
+		    cp2++;
+	    } else {
+		cp2 = "-";
+	    }
+	    ForEachTest (j) {
+		if (strcmp (cp1, (test[j].option) + 1) == 0 &&
+		    (test[j].versions & xparms.version)) {
+		    int k = j;
+		    do {
+			doit[k] = test[j].versions & xparms.version;
+		    } while (!(strcmp(cp2, (test[k].option + 1)) == 0 &&
+			       (test[k].versions & xparms.version)) &&
+			     test[++k].option != NULL);
+		    if (*cp2 != '-' && test[k].option == NULL)
+			usage();
+		    break;
+		}
+	    }
+	    if (test[j].option == NULL)
+		usage();
+	    foundOne = True;
+	} else if (strcmp (argv[i], "-sync") == 0) {
+	    synchronous = True;
+	} else if (strcmp(argv[i], "-pack") == 0) {
+	    xparms.pack = True;
+	} else if (strcmp (argv[i], "-draw") == 0) {
+	    drawToFakeServer = True;
+	} else if (strcmp (argv[i], "-repeat") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    repeat = atoi (argv[i]);
+	    if (repeat <= 0)
+	       usage ();
+	} else if (strcmp (argv[i], "-time") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    seconds = atoi (argv[i]);
+	    if (seconds <= 0)
+	       usage ();
+	} else if (strcmp(argv[i], "-fg") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    foreground = argv[i];
+        } else if (strcmp(argv[i], "-bg") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    background = argv[i];
+	    if(ddbackground == NULL)
+		ddbackground = argv[i];
+	} else if (strcmp(argv[i], "-clips") == 0 ) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    clips = atoi( argv[i] );
+	} else if (strcmp(argv[i], "-ddbg") == 0) {
+	    if (argc <= i)
+		usage ();
+	    i++;
+	    ddbackground = argv[i];
+	} else if (strcmp(argv[i], "-rop") == 0) {
+	    skip = GetRops (i+1, argc, argv, rops, &numRops);
+	    i += skip;
+	} else if (strcmp(argv[i], "-pm") == 0) {
+	    skip = GetNumbers (i+1, argc, argv, planemasks, &numPlanemasks);
+	    i += skip;
+	} else if (strcmp(argv[i], "-xor") == 0) {
+	    numRops = 1;
+	    rops[0] = GXxor;
+	} else if (strcmp (argv[i], "-both") == 0) {
+	    numRops = 2;
+	    rops[0] = GXcopy;
+	    rops[1] = GXxor;
+	} else if (strcmp(argv[i], "-reps") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    fixedReps = atoi (argv[i]);
+	    if (fixedReps <= 0)
+		usage ();
+        } else if (strcmp(argv[i], "-depth") == 0) {
+	    i++;
+	    if (argc <= i)
+                usage ();
+            depth = atoi(argv[i]);
+            if (depth <= 0)
+		usage ();
+        } else if (strcmp(argv[i], "-vclass") == 0) {
+	    i++;
+	    if (argc <= i)
+                usage ();
+	    for (j = StaticGray; j <= DirectColor; j++) {
+		if (strcmp(argv[i], visualClassNames[j]) == 0) {
+		    vclass = j;
+		    break;
+		}
+	    }
+            if (vclass < 0)
+		usage ();
+	} else if (strcmp(argv[i], "-subs") == 0) {
+	    skip = GetNumbers (i+1, argc, argv, subWindows, &numSubWindows);
+	    i += skip;
+	} else if (strcmp(argv[i], "-v1.2") == 0) {
+	    xparms.version = VERSION1_2;
+	} else if (strcmp(argv[i], "-v1.3") == 0) {
+	    xparms.version = VERSION1_3;
+	} else if (strcmp(argv[i], "-su") == 0) {
+	    xparms.save_under = True;
+	} else if (strcmp(argv[i], "-bs") == 0) {
+	    i++;
+	    if (argc <= i)
+		usage ();
+	    if (strcmp(argv[i], "WhenMapped") == 0) {
+	      xparms.backing_store = WhenMapped;
+	    } else if (strcmp(argv[i], "Always") == 0) {
+	      xparms.backing_store = Always;
+	    } else usage ();
+	} else {
+	    int len,found;
+	    ForEachTest (j) {
+		if (strcmp (argv[i], test[j].option) == 0 &&
+		    (test[j].versions & xparms.version)) {
+		    doit[j] = True;
+		    goto LegalOption;
+		}
+	    }
+	    found = False;
+	    len = strlen(argv[i]);
+	    if(len>=3)
+	    ForEachTest (j) {
+		if (Strstr (test[j].option, argv[i]+1) != 0) {
+		    fprintf(stderr,"	-> %s	%s\n", test[j].option, LABELP(j));
+		    doit[j] = found = True;
+		}
+	    }
+	    if(!found)
+	    ForEachTest (j) {
+		if (Strstr (LABELP(j), argv[i]+1) != 0) {
+		    fprintf(stderr,"	-> %s	%s\n", test[j].option, LABELP(j));
+		    doit[j] = found = True;
+		}
+	    }
+	    if(!found)
+		usage ();
+	LegalOption: 
+		foundOne = True;
+	}
+    }
+
+    if (labels) {
+	/* Just print out list of tests for use with .sh programs that
+	   assemble data from different x11perf runs into a nice format */
+	ForEachTest (i) {
+	    int child;
+	    if (doit[i]) {
+		switch (test[i].testType) {
+		    case NONROP:
+			printf ("%s\n", LABELP(i));
+			break;
+    
+		    case ROP:
+			/* Run it through all specified rops and planemasks */
+			for (rop = 0; rop < numRops; rop++) {
+			    for (pm = 0; pm < numPlanemasks; pm++) {
+				if (planemasks[pm] == ~0) {
+				    if (rops[rop] == GXcopy) {
+					printf ("%s\n", LABELP(i));
+				    } else {
+					printf ("(%s) %s\n",
+					    ropNames[rops[rop]].name,
+					    LABELP(i));
+				    }
+				} else {
+				    printf ("(%s 0x%lx) %s\n",
+					    ropNames[rops[rop]].name,
+					    planemasks[pm],
+					    LABELP(i));
+				}
+			    } /* for pm */
+			} /* for rop */
+			break;
+		    
+		    case PLANEMASK:
+			/* Run it through all specified planemasks */
+			for (pm = 0; pm < numPlanemasks; pm++) {
+			    if (planemasks[pm] == ~0) {
+				printf ("%s\n", LABELP(i));
+			    } else {
+				printf ("(0x%lx) %s\n",
+					planemasks[pm],
+					LABELP(i));
+			    }
+			} /* for pm */
+			break;
+		    
+		    case WINDOW:
+			for (child = 0; child != numSubWindows; child++) {
+			    printf ("%s (%ld kids)\n",
+				LABELP(i), subWindows[child]);
+			}
+			break;
+		} /* switch */
+	    }
+	}
+	exit(0);
+    }
+
+    if (!foundOne)
+	usage ();
+    xparms.d = Open_Display (displayName);
+    screen = DefaultScreen(xparms.d);
+
+    /* get visual info of default visual */
+    vmask = VisualIDMask | VisualScreenMask;
+    vinfotempl.visualid = XVisualIDFromVisual(XDefaultVisual(xparms.d, screen));
+    vinfotempl.screen = screen;
+    vinfolist = XGetVisualInfo(xparms.d, vmask, &vinfotempl, &n);
+    if (!vinfolist || n != 1) {
+	fprintf (stderr, "%s: can't get visual info of default visual\n",
+	    program_name);
+	exit(1);
+    }
+
+    if (depth == -1 && vclass == -1) {
+	/* use the default visual and colormap */
+	xparms.vinfo = *vinfolist;
+	cmap = XDefaultColormap(xparms.d, screen);
+    } else {
+	/* find the specified visual */
+	int errorDepth = vinfolist[0].depth;
+	int errorClass = vinfolist[0].class;
+
+	vmask = VisualScreenMask;
+	vinfotempl.screen = screen;
+	if (depth >= 0) {
+	    vinfotempl.depth = depth;
+	    vmask |= VisualDepthMask;
+	    errorDepth = depth;
+	}
+	if (vclass >= 0) {
+	    vinfotempl.class = vclass;
+	    vmask |= VisualClassMask;
+	    errorClass = vclass;
+	}
+	vinfolist = XGetVisualInfo(xparms.d, vmask, &vinfotempl, &n);
+	if (!vinfolist) {
+	    fprintf (stderr,
+		"%s: can't find a visual of depth %d and class %s\n",
+		program_name, errorDepth, visualClassNames[errorClass]);
+	    exit(1);
+	}
+	xparms.vinfo = *vinfolist;  /* use the first one in list */
+	if (xparms.vinfo.visualid ==
+	    XVisualIDFromVisual(XDefaultVisual(xparms.d, screen))) {
+	    /* matched visual is same as default visual */
+	    cmap = XDefaultColormap(xparms.d, screen);
+	} else {
+	    cmap = XCreateColormap(xparms.d, DefaultRootWindow(xparms.d),
+		xparms.vinfo.visual, AllocNone);
+	    /* since this is not default cmap, must force color allocation */
+	    if (!foreground) foreground = "Black";
+	    if (!background) background = "White";
+	    XInstallColormap(xparms.d, cmap);
+	}
+    }
+    xparms.cmap = cmap;
+    
+    printf("x11perf - X11 performance program, version %s\n",
+	   xparms.version & VERSION1_5 ? "1.5" :
+	   xparms.version & VERSION1_4 ? "1.4" :
+	   xparms.version & VERSION1_3 ? "1.3" :
+	   "1.2"
+	   );
+    XmuGetHostname(hostname, 100);
+    printf ("%s server version %d on %s\nfrom %s\n",
+	    ServerVendor (xparms.d), VendorRelease (xparms.d),
+	    DisplayString (xparms.d), hostname);
+    PrintTime ();
+
+    /* Force screen out of screen-saver mode, grab current data, and set
+       time to blank to 8 hours.  We should just be able to turn the screen-
+       saver off, but this causes problems on some servers.  We also reset
+       the screen-saver timer each test, as 8 hours is about the maximum time
+       we can use, and that isn't long enough for some X terminals using a
+       serial protocol to finish all the tests.  As long as the tests run to 
+       completion, the old screen-saver values are restored. */
+    XForceScreenSaver(xparms.d, ScreenSaverReset);
+    XGetScreenSaver(xparms.d, &ssTimeout, &ssInterval, &ssPreferBlanking,
+	&ssAllowExposures);
+    (void) signal(SIGINT, Cleanup); /* ^C */
+#ifdef SIGQUIT
+    (void) signal(SIGQUIT, Cleanup);
+#endif
+    (void) signal(SIGTERM, Cleanup);
+#ifdef SIGHUP
+    (void) signal(SIGHUP, Cleanup);
+#endif
+    XSetScreenSaver(xparms.d, 8 * 3600, ssInterval, ssPreferBlanking, 
+	ssAllowExposures);
+
+    if (drawToFakeServer) {
+        tileToQuery =
+	    XCreatePixmap(xparms.d, DefaultRootWindow (xparms.d), 32, 32, 1);
+    }
+
+
+    xparms.foreground =
+	AllocateColor(xparms.d, foreground, BlackPixel(xparms.d, screen));
+    xparms.background =
+	AllocateColor(xparms.d, background, WhitePixel(xparms.d, screen));
+    xparms.ddbackground =
+	AllocateColor(xparms.d, ddbackground, WhitePixel(xparms.d, screen));
+    window_x = 2;
+    if (DisplayWidth(xparms.d, screen) < WIDTH + window_x + 1)
+	window_x = -1;
+    window_y = 2;
+    if (DisplayHeight(xparms.d, screen) < HEIGHT + window_y + 1)
+	window_y = -1;
+    xparms.w = CreatePerfWindow(&xparms, window_x, window_y, WIDTH, HEIGHT);
+    HSx = WIDTH-1;
+    if (window_x + 1 + WIDTH > DisplayWidth(xparms.d, screen))
+	HSx = DisplayWidth(xparms.d, screen) - (1 + window_x + 1);
+    HSy = HEIGHT-1;
+    if (window_y + 1 + HEIGHT > DisplayHeight(xparms.d, screen))
+	HSy = DisplayHeight(xparms.d, screen) - (1 + window_y + 1);
+    status = CreatePerfWindow(&xparms, window_x, HEIGHT+5, WIDTH, 20);
+    tgcv.foreground = 
+	AllocateColor(xparms.d, "black", BlackPixel(xparms.d, screen));
+    tgcv.background = 
+	AllocateColor(xparms.d, "white", WhitePixel(xparms.d, screen));
+    tgc = XCreateGC(xparms.d, status, GCForeground | GCBackground, &tgcv);
+   
+    xparms.p = (Pixmap)0;
+
+    if (synchronous)
+	XSynchronize (xparms.d, True);
+
+    /* Get mouse pointer out of the way of the performance window.  On
+       software cursor machines it will slow graphics performance.  On
+       all current MIT-derived servers it will slow window 
+       creation/configuration performance. */
+    XWarpPointer(xparms.d, None, status, 0, 0, 0, 0, WIDTH+32, 20+32);
+
+    /* Figure out how long to call HardwareSync, so we can adjust for that
+       in our total elapsed time */
+    (void) CalibrateTest(&xparms, &syncTest, 1, &syncTime);
+    printf("Sync time adjustment is %6.4f msecs.\n\n", syncTime/1000);
+
+    ForEachTest (i) {
+	int child;
+	char label[200];
+
+	if (doit[i] && (test[i].versions & xparms.version)) {
+	    switch (test[i].testType) {
+	        case NONROP:
+		    /* Simplest...just run it once */
+		    strcpy (label, LABELP(i));
+		    ProcessTest(&xparms, &test[i], GXcopy, ~0L, label);
+		    break;
+
+		case ROP:
+		    /* Run it through all specified rops and planemasks */
+		    for (rop = 0; rop < numRops; rop++) {
+			for (pm = 0; pm < numPlanemasks; pm++) {
+			    if (planemasks[pm] == ~0) {
+				if (rops[rop] == GXcopy) {
+				    sprintf (label, "%s", LABELP(i));
+				} else {
+				    sprintf (label, "(%s) %s",
+					ropNames[rops[rop]].name,
+					LABELP(i));
+				}
+			    } else {
+				sprintf (label, "(%s 0x%lx) %s",
+					ropNames[rops[rop]].name,
+					planemasks[pm],
+					LABELP(i));
+			    }
+			    ProcessTest(&xparms, &test[i], rops[rop],
+				        planemasks[pm], label);
+			} /* for pm */
+		    } /* for rop */
+		    break;
+		
+		case PLANEMASK:
+		    /* Run it through all specified planemasks */
+		    for (pm = 0; pm < numPlanemasks; pm++) {
+			if (planemasks[pm] == ~0) {
+			    sprintf (label, "%s", LABELP(i));
+			} else {
+			    sprintf (label, "(0x%lx) %s",
+				    planemasks[pm],
+				    LABELP(i));
+			}
+			ProcessTest(&xparms, &test[i], GXcopy,
+				    planemasks[pm], label);
+		    } /* for pm */
+		    break;
+		
+		case WINDOW:
+		    /* Loop through number of children array */
+		    for (child = 0; child != numSubWindows; child++) {
+			test[i].parms.objects = subWindows[child];
+			sprintf(label, "%s (%d kids)",
+			    LABELP(i), test[i].parms.objects);
+			ProcessTest(&xparms, &test[i], GXcopy, ~0L, label);
+		    }
+		    break;
+	    } /* switch */
+	} /* if doit */
+    } /* ForEachTest */
+
+    XFreeGC(xparms.d, tgc);
+    XDestroyWindow(xparms.d, xparms.w);
+    XFree(vinfolist);
+    if (drawToFakeServer)
+      XFreePixmap(xparms.d, tileToQuery);
+    /* Restore ScreenSaver to original state. */
+    XSetScreenSaver(xparms.d, ssTimeout, ssInterval, ssPreferBlanking,
+	ssAllowExposures);
+    XCloseDisplay(xparms.d);
+    free(saveargv);
+    free(doit);
+    exit(0);
+}
+
+static int
+GetWords (int argi, int argc, char **argv, char **wordsp, int *nump)
+{
+    int	    count;
+
+    if (argc <= argi)
+	usage();
+    count = 0;
+    while (argv[argi] && *(argv[argi]) != '-') {
+	*wordsp++ = argv[argi];
+	++argi;
+	count++;
+    }
+    *nump = count;
+    return count;
+}
+
+static long
+atox (char *s)
+{
+    long   v, c = 0;
+
+    v = 0;
+    while (*s) {
+	if ('0' <= *s && *s <= '9')
+	    c = *s - '0';
+	else if ('a' <= *s && *s <= 'f')
+	    c = *s - 'a' + 10;
+	else if ('A' <= *s && *s <= 'F')
+	    c = *s - 'A' + 10;
+	v = v * 16 + c;
+	s++;
+    }
+    return v;
+}
+
+static int 
+GetNumbers (int argi, int argc, char **argv, unsigned long *intsp, int *nump)
+{
+    char    *words[256];
+    int	    count;
+    int	    i;
+    int	    flip;
+
+    count = GetWords (argi, argc, argv, words, nump);
+    for (i = 0; i < count; i++) {
+	flip = 0;
+	if (!strncmp (words[i], "~", 1)) {
+	    words[i]++;
+	    flip = ~0;
+	}
+	if (!strncmp (words[i], "0x", 2))
+	    intsp[i] = atox(words[i] + 2) ^ flip;
+	else
+	    intsp[i] = atoi (words[i]) ^ flip;
+    }
+    return count;
+}
+
+static int
+GetRops (int argi, int argc, char **argv, int *ropsp, int *nump)
+{
+    char    *words[256];
+    int	    count;
+    int	    i;
+    int	    rop;
+
+    count = GetWords (argi, argc, argv, words, nump);
+    for (i = 0; i < count; i++) {
+	if (!strncmp (words[i], "GX", 2))
+	    words[i] += 2;
+	if (!strcmp (words[i], "all")) {
+	    for (i = 0; i < 16; i++)
+		ropsp[i] = ropNames[i].rop;
+	    *nump = 16;
+	    break;
+	}
+	for (rop = 0; rop < 16; rop++) {
+	    if (!strcmp (words[i], ropNames[rop].name)) {
+		ropsp[i] = ropNames[rop].rop;
+		break;
+	    }
+	}
+	if (rop == 16) {
+	    usage ();
+	    fprintf (stderr, "unknown rop name %s\n", words[i]);
+	}
+    }
+    return count;
+}
diff --git a/app/x11perf/x11perf.h b/app/x11perf/x11perf.h
new file mode 100644
index 000000000..da984630c
--- /dev/null
+++ b/app/x11perf/x11perf.h
@@ -0,0 +1,355 @@
+/* $Xorg: x11perf.h,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */
+/*****************************************************************************
+Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************************/
+/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.4 2001/07/25 15:05:16 dawes Exp $ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef VMS
+#include <X11/Xlib.h>
+#include <stdlib.h>
+#include <X11/Xutil.h>
+#else
+#include <decw$include/Xlib.h>
+#include <decw$include/Xutil.h>
+#endif
+#if defined(XlibSpecificationRelease) && XlibSpecificationRelease >= 5
+#include <X11/Xfuncs.h>
+#endif
+#include <stddef.h>
+
+#define POLY	     1000       /* # (small) items in poly calls	*/
+#define MAXROWS	       40       /* Max rows of items in poly calls      */
+#define MAXCOLS	       25       /* Max columns of items			*/
+
+#define WIDTH         600	/* Size of large window to work within  */
+#define HEIGHT        600
+
+#define CHILDSIZE       8       /* Size of children on windowing tests  */
+#define CHILDSPACE      4       /* Space between children		*/
+
+#define BigTile	((char *)2)		/* Big tile/stipple */
+#define OddTile	((char *)1)		/* Odd sized tile/stipple */
+
+
+typedef unsigned char Version;
+
+#define VERSION1_2  ((Version)(1 << 0))
+#define VERSION1_3  ((Version)(1 << 1))
+#define VERSION1_4  ((Version)(1 << 2))
+#define VERSION1_5  ((Version)(1 << 3))
+#define V1_2ONLY VERSION1_2
+#define V1_2FEATURE	(VERSION1_2 | VERSION1_3 | VERSION1_4 | VERSION1_5)
+#define V1_3FEATURE	(VERSION1_3 | VERSION1_4 | VERSION1_5)
+#define V1_4FEATURE	(VERSION1_4 | VERSION1_5)
+#define V1_5FEATURE     (VERSION1_5)
+
+typedef struct _Parms {
+    /* Required fields */
+    int  objects;       /* Number of objects to process in one X call	    */
+
+    /* Optional fields.  (Wouldn't object-oriented programming be nice ?)   */
+    int  special;       /* Usually size of objects to paint		    */
+    char *font, *bfont;
+    int  fillStyle;     /* Solid, transparent stipple, opaque stipple, tile */
+} ParmRec, *Parms;
+
+typedef struct _XParms {
+    Display	    *d;
+    Window	    w;
+    Pixmap          p;
+    GC		    fggc;
+    GC		    bggc;
+    GC		    ddfggc;
+    GC		    ddbggc;
+    unsigned long   foreground;
+    unsigned long   background;
+    unsigned long   ddbackground;
+    XVisualInfo     vinfo;
+    Bool	    pack;
+    Version	    version;
+    Bool	    save_under;
+    int		    backing_store;
+    unsigned long   planemask;
+    Colormap	    cmap;
+} XParmRec, *XParms;
+
+typedef int (*InitProc)(XParms xp, Parms p, int reps);
+typedef void (*Proc)(XParms xp, Parms p, int reps);
+typedef void (*CleanupProc)(XParms xp, Parms p);
+
+typedef enum {
+    WINDOW,     /* Windowing test, rop, planemask have no affect	*/
+    ROP,	/* Graphics test, rop, planemask has some affect	*/
+    PLANEMASK,  /* Graphics test, rop no affect, planemask some affect  */
+    NONROP      /* Graphics or overhead test, rop has no affect		*/
+} TestType;
+
+typedef struct _Test {
+    char	*option;    /* Name to use in prompt line		    */
+    char	*label;     /* Fuller description of test		    */
+    char	*label14;   /* Labels that are different in Version 1.4     */
+    InitProc    init;       /* Initialization procedure			    */
+    Proc	proc;       /* Timed benchmark procedure		    */
+    CleanupProc	passCleanup;/* Cleanup between repetitions of same test     */
+    CleanupProc	cleanup;    /* Cleanup after test			    */
+    Version     versions;   /* Test in 1.2 only, 1.3 only, or both	    */
+    TestType    testType;   /* Windowing, graphics rop, graphics non-rop    */
+    int		clips;      /* Number of obscuring windows to force clipping*/
+    ParmRec     parms;      /* Parameters passed to test procedures	    */
+} Test;
+
+extern void NullProc(XParms xp, Parms p);
+extern int NullInitProc(XParms xp, Parms p, int reps);
+
+extern Test test[];
+
+extern int abortTest;
+
+extern void AbortTest (void);
+
+#define CheckAbort()  if (abortTest) AbortTest ()
+#define ForEachTest(x) for (x = 0; test[x].option != NULL; x++)
+
+
+/* do_arcs.c */
+extern int InitCircles ( XParms xp, Parms p, int reps );
+extern int InitPartCircles ( XParms xp, Parms p, int reps );
+extern int InitChordPartCircles ( XParms xp, Parms p, int reps );
+extern int InitSlicePartCircles ( XParms xp, Parms p, int reps );
+extern int InitWideCircles ( XParms xp, Parms p, int reps );
+extern int InitPartWideCircles ( XParms xp, Parms p, int reps );
+extern int InitDashedCircles ( XParms xp, Parms p, int reps );
+extern int InitWideDashedCircles ( XParms xp, Parms p, int reps );
+extern int InitDoubleDashedCircles ( XParms xp, Parms p, int reps );
+extern int InitWideDoubleDashedCircles ( XParms xp, Parms p, int reps );
+extern int InitEllipses ( XParms xp, Parms p, int reps );
+extern int InitPartEllipses ( XParms xp, Parms p, int reps );
+extern int InitChordPartEllipses ( XParms xp, Parms p, int reps );
+extern int InitSlicePartEllipses ( XParms xp, Parms p, int reps );
+extern int InitWideEllipses ( XParms xp, Parms p, int reps );
+extern int InitPartWideEllipses ( XParms xp, Parms p, int reps );
+extern int InitDashedEllipses ( XParms xp, Parms p, int reps );
+extern int InitWideDashedEllipses ( XParms xp, Parms p, int reps );
+extern int InitDoubleDashedEllipses ( XParms xp, Parms p, int reps );
+extern int InitWideDoubleDashedEllipses ( XParms xp, Parms p, int reps );
+extern void DoArcs ( XParms xp, Parms p, int reps );
+extern void DoFilledArcs ( XParms xp, Parms p, int reps );
+extern void EndArcs ( XParms xp, Parms p );
+
+/* do_blt.c */
+extern int InitScroll ( XParms xp, Parms p, int reps );
+extern void DoScroll ( XParms xp, Parms p, int reps );
+extern void MidScroll ( XParms xp, Parms p );
+extern void EndScroll ( XParms xp, Parms p );
+extern int InitCopyWin ( XParms xp, Parms p, int reps );
+extern int InitCopyPix ( XParms xp, Parms p, int reps );
+extern int InitGetImage ( XParms xp, Parms p, int reps );
+extern int InitPutImage ( XParms xp, Parms p, int reps );
+extern void DoCopyWinWin ( XParms xp, Parms p, int reps );
+extern void DoCopyPixWin ( XParms xp, Parms p, int reps );
+extern void DoCopyWinPix ( XParms xp, Parms p, int reps );
+extern void DoCopyPixPix ( XParms xp, Parms p, int reps );
+extern void DoGetImage ( XParms xp, Parms p, int reps );
+extern void DoPutImage ( XParms xp, Parms p, int reps );
+#ifdef MITSHM
+extern int InitShmPutImage ( XParms xp, Parms p, int reps );
+extern void DoShmPutImage ( XParms xp, Parms p, int reps );
+extern void EndShmPutImage ( XParms xp, Parms p );
+#endif
+extern void MidCopyPix ( XParms xp, Parms p );
+extern void EndCopyWin ( XParms xp, Parms p );
+extern void EndCopyPix ( XParms xp, Parms p );
+extern void EndGetImage ( XParms xp, Parms p );
+extern int InitCopyPlane ( XParms xp, Parms p, int reps );
+extern void DoCopyPlane ( XParms xp, Parms p, int reps );
+
+/* do_complex.c */
+extern int InitComplexPoly ( XParms xp, Parms p, int reps );
+extern void DoComplexPoly ( XParms xp, Parms p, int reps );
+extern void EndComplexPoly ( XParms xp, Parms p );
+extern int InitGeneralPoly ( XParms xp, Parms p, int reps );
+extern void DoGeneralPoly ( XParms xp, Parms p, int reps );
+
+/* do_dots.c */
+extern int InitDots ( XParms xp, Parms p, int reps );
+extern void DoDots ( XParms xp, Parms p, int reps );
+extern void EndDots ( XParms xp, Parms p );
+
+/* do_lines.c */
+extern int InitLines ( XParms xp, Parms p, int reps );
+extern int InitWideLines ( XParms xp, Parms p, int reps );
+extern int InitDashedLines ( XParms xp, Parms p, int reps );
+extern int InitWideDashedLines ( XParms xp, Parms p, int reps );
+extern int InitDoubleDashedLines ( XParms xp, Parms p, int reps );
+extern int InitWideDoubleDashedLines ( XParms xp, Parms p, int reps );
+extern void DoLines ( XParms xp, Parms p, int reps );
+extern void EndLines ( XParms xp, Parms p );
+
+/* do_movewin.c */
+extern int InitMoveWindows ( XParms xp, Parms p, int reps );
+extern void DoMoveWindows ( XParms xp, Parms p, int reps );
+extern void EndMoveWindows ( XParms xp, Parms p );
+extern void DoResizeWindows ( XParms xp, Parms p, int reps );
+extern int InitCircWindows ( XParms xp, Parms p, int reps );
+extern void DoCircWindows ( XParms xp, Parms p, int reps );
+extern void EndCircWindows ( XParms xp, Parms p );
+extern int InitMoveTree ( XParms xp, Parms p, int reps );
+extern void DoMoveTree ( XParms xp, Parms p, int reps );
+extern void EndMoveTree ( XParms xp, Parms p );
+
+/* do_rects.c */
+extern int InitRectangles ( XParms xp, Parms p, int reps );
+extern void DoRectangles ( XParms xp, Parms p, int reps );
+extern void DoOutlineRectangles ( XParms xp, Parms p, int reps );
+extern void EndRectangles ( XParms xp, Parms p );
+
+/* do_segs.c */
+extern int InitSegments ( XParms xp, Parms p, int reps );
+extern int InitDashedSegments ( XParms xp, Parms p, int reps );
+extern int InitDoubleDashedSegments ( XParms xp, Parms p, int reps );
+extern int InitHorizSegments ( XParms xp, Parms p, int reps );
+extern int InitWideHorizSegments ( XParms xp, Parms p, int reps );
+extern int InitVertSegments ( XParms xp, Parms p, int reps );
+extern int InitWideVertSegments ( XParms xp, Parms p, int reps );
+extern void DoSegments ( XParms xp, Parms p, int reps );
+extern void EndSegments ( XParms xp, Parms p );
+
+/* do_simple.c */
+extern void DoNoOp ( XParms xp, Parms p, int reps );
+extern void DoGetAtom ( XParms xp, Parms p, int reps );
+extern void DoQueryPointer ( XParms xp, Parms p, int reps );
+extern int InitGetProperty ( XParms xp, Parms p, int reps );
+extern void DoGetProperty ( XParms xp, Parms p, int reps );
+
+/* do_text.c */
+extern int InitText ( XParms xp, Parms p, int reps );
+extern int InitText16 ( XParms xp, Parms p, int reps );
+extern void DoText ( XParms xp, Parms p, int reps );
+extern void DoText16 ( XParms xp, Parms p, int reps );
+extern void DoPolyText ( XParms xp, Parms p, int reps );
+extern void DoPolyText16 ( XParms xp, Parms p, int reps );
+extern void DoImageText ( XParms xp, Parms p, int reps );
+extern void DoImageText16 ( XParms xp, Parms p, int reps );
+extern void ClearTextWin ( XParms xp, Parms p );
+extern void EndText ( XParms xp, Parms p );
+extern void EndText16 ( XParms xp, Parms p );
+#ifdef XFT
+extern int InitAAText (XParms xp, Parms p, int reps );
+extern void DoAAText (XParms xp, Parms p, int reps );
+extern void EndAAText ( XParms xp, Parms p );
+#endif
+
+/* do_traps.c */
+extern int InitTrapezoids ( XParms xp, Parms p, int reps );
+extern void DoTrapezoids ( XParms xp, Parms p, int reps );
+extern void EndTrapezoids ( XParms xp, Parms p );
+#ifdef XRENDER
+extern int InitFixedTraps ( XParms xp, Parms p, int reps );
+extern void DoFixedTraps ( XParms xp, Parms p, int reps );
+extern void EndFixedTraps ( XParms xp, Parms p );
+extern int InitFixedTrapezoids ( XParms xp, Parms p, int reps );
+extern void DoFixedTrapezoids ( XParms xp, Parms p, int reps );
+extern void EndFixedTrapezoids ( XParms xp, Parms p );
+#endif
+
+/* do_tris.c */
+extern int InitTriangles ( XParms xp, Parms p, int reps );
+extern void DoTriangles ( XParms xp, Parms p, int reps );
+extern void EndTriangles ( XParms xp, Parms p );
+
+/* do_valgc.c */
+extern int InitGC ( XParms xp, Parms p, int reps );
+extern void DoChangeGC ( XParms xp, Parms p, int reps );
+extern void EndGC ( XParms xp, Parms p );
+
+/* do_windows.c */
+extern int CreateParents ( XParms xp, Parms p, int reps );
+extern void MapParents ( XParms xp, Parms p, int reps );
+extern void MapParentsCleanup ( XParms xp, Parms p );
+extern int InitCreate ( XParms xp, Parms p, int reps );
+extern void CreateChildren ( XParms xp, Parms p, int reps );
+extern void DestroyChildren ( XParms xp, Parms p );
+extern void EndCreate ( XParms xp, Parms p );
+extern int InitMap ( XParms xp, Parms p, int reps );
+extern void UnmapParents ( XParms xp, Parms p, int reps );
+extern void UnmapParentsCleanup ( XParms xp, Parms p);
+extern int InitDestroy ( XParms xp, Parms p, int reps );
+extern void DestroyParents ( XParms xp, Parms p, int reps );
+extern void RenewParents ( XParms xp, Parms p );
+extern int InitPopups ( XParms xp, Parms p, int reps );
+extern void DoPopUps ( XParms xp, Parms p, int reps );
+extern void EndPopups ( XParms xp, Parms p );
+
+
+/*****************************************************************************
+
+About x11perf:
+
+Many graphics benchmarks assume that the graphics device is used to display the
+output of a single fancy graphics application, and that the user gets his work
+done on some other device, like a terminal.  Such benchmarks usually measure
+drawing speed for lines, polygons, text, etc.
+
+Since workstations are not used as standalone graphics engines, but as
+super-terminals, x11perf measures window management performance as well as
+traditional graphics performace.  x11perf includes benchmarks for the time it
+takes to create and map windows (as when you start up an application); to map a
+pre-existing set of windows onto the screen (as when you deiconify an
+application or pop up a menu); and to rearrange windows (as when you slosh
+windows to and fro trying to find the one you want).
+
+x11perf also measures graphics performance for operations not normally used in
+standalone graphics displays, but are nonetheless used frequently by X
+applications.  Such operations include CopyPlane (used by the PostScript
+previewer), scrolling (used in text windows), and various stipples and tiles
+(used for CAD and half-toning, respectively).
+
+x11perf DOES NOT attempt to whittle down measurements to a single ``HeXStones''
+number.  We consider such numbers to be uninformative at best and misleading at
+worst.  x11perf should be used to analyze particular strengths and weaknesses
+of servers, and is most useful when used by a server writer who wants to
+analyze and improve a server.
+
+For repeatable results, x11perf should be run using a local connection on a
+freshly-started server.  The default configuration runs each test 5 times, in
+order to see if each trial takes approximately the same amount of time.
+Strange glitches should be examined; if non-repeatable I chalk them up to
+daemons and network traffic.  Each trial is run for 5 seconds, in order to
+reduce random time differences.  The number of objects processed per second is
+displayed to 3 significant digits, but you'll be lucky on most UNIX system if
+the numbers are actually consistent to 2 digits.
+
+The current program is mostly the responsibility of Joel McCormack.  It is
+based upon the x11perf developed by Phil Karlton, Susan Angebranndt, and Chris
+Kent, who wanted to assess performance differences between various servers.
+Mary Walker, Todd Newman, and I added several tests in order to write and tune
+the pmax (DECStation 3100) servers.  For a general release to the world, I've
+basically rewritten x11perf to ease making comparisons between widely varying
+machines, to cover most important X functionality (the notable exception being
+wide lines), and to exercise graphics operations in as many different
+orientations and alignments as possible.
+
+******************************************************************************/
diff --git a/app/x11perf/x11perf.man b/app/x11perf/x11perf.man
new file mode 100644
index 000000000..711504a47
--- /dev/null
+++ b/app/x11perf/x11perf.man
@@ -0,0 +1,1018 @@
+.\" $Xorg: x11perf.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
+.\" Copyright 1988, 1989 Digital Equipment Corporation.
+.\" Copyright 1989, 1994, 1998  The Open Group
+.\" 
+.\" Permission to use, copy, modify, distribute, and sell this software and its
+.\" documentation for any purpose is hereby granted without fee, provided that
+.\" the above copyright notice appear in all copies and that both that
+.\" copyright notice and this permission notice appear in supporting
+.\" documentation.
+.\" 
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.8 2001/12/14 20:01:14 dawes Exp $
+.\"
+.TH X11PERF 1 __xorgversion__
+.SH NAME
+x11perf \- X11 server performance test program
+.SH SYNTAX
+.B x11perf
+[ \-option ... ]
+.SH DESCRIPTION
+The
+.I x11perf
+program runs one or more performance tests and reports how fast an X server can
+execute the tests.
+.PP
+Many graphics benchmarks assume that the graphics device is used to display the
+output of a single fancy graphics application, and that the user gets his work
+done on some other device, like a terminal.  Such benchmarks usually measure
+drawing speed for lines, polygons, text, etc.
+.PP
+Since workstations are not used as standalone graphics engines, but as
+super-terminals, 
+.I x11perf 
+measures window management performance as well as
+traditional graphics performance.  
+.I x11perf 
+includes benchmarks for the time it
+takes to create and map windows (as when you start up an application); to map a
+pre-existing set of windows onto the screen (as when you deiconify an
+application or pop up a menu); and to rearrange windows (as when you slosh
+windows to and fro trying to find the one you want).
+.PP
+.I x11perf 
+also measures graphics performance for operations not normally used in
+standalone graphics displays, but are nonetheless used frequently by X
+applications.  Such operations include CopyPlane (used to map bitmaps into
+pixels), scrolling (used in text windows), and various stipples and tiles
+(used for CAD and color half-toning, respectively).
+.PP
+.I x11perf 
+should be used to analyze particular strengths and weaknesses
+of servers, and is most useful to a server writer who wants to
+analyze and improve a server.
+.I x11perf
+is meant to comprehensively exercise just about every X11 operation you can
+perform; it does not purport to be a representative sample of the
+operations that X11 applications actually use.
+While it can be used as a benchmark, it was written and is intended as
+a performance testing tool.
+.PP
+As such,
+.I x11perf 
+DOES NOT whittle down measurements to a single ``HeXStones''
+or ``MeXops'' number.  We consider such numbers to be uninformative 
+at best and misleading at worst.  
+Some servers which are very fast for certain applications can be
+very slow for others.
+No single number or small set of numbers are sufficient to
+characterize how an X implementation will perform on all applications.
+However, by knowledge of your favorite application, you
+may be able to use the numbers
+.I x11perf
+reports to predict its performance on a given X implementation.
+.PP
+That said, you might also want to look at
+.I x11perfcomp(1),
+a program to compare the outputs of different 
+.I x11perf
+runs.  You provide a list of files containing results from
+.I x11perf,
+and it lays them out in a nice tabular format.
+.PP
+For repeatable results, 
+.I x11perf 
+should be run using a local connection on a
+freshly-started server.  The default configuration runs each test 5 times, in
+order to see if each trial takes approximately the same amount of time.
+Strange glitches should be examined; if non-repeatable one might
+chalk them up to
+daemons and network traffic.  Each trial is run for 5 seconds, in order to
+reduce random time differences.  The number of objects processed per second is
+displayed to 3 significant digits, but you'll be lucky on most UNIX system if
+the numbers are actually consistent to 2 digits.
+.I x11perf
+moves the cursor out of the test window; you should be careful not
+to bump the mouse and move it back into the window.
+(A prize to people who correctly explain why!!).
+.PP
+Before running a test,
+.I x11perf
+determines what the round trip time to the server is, and factors this out of
+the final timing reported.  It ensures that the server has actually performed
+the work requested by fetching a pixel back from the test window, which means
+that servers talking to graphics accelerators can't claim that they are done,
+while in the meantime the accelerator is painting madly.
+.PP
+By default 
+.I x11perf
+automatically calibrates the number of repetitions of each test,
+so that each should take approximately the same length of time to run across
+servers of widely differing speeds.  However, since each test must be run to
+completion at least once, some slow servers may take a very long time,
+particularly on the window moving and resizing tests, and on the arc drawing
+tests.
+.PP
+All timing reports are for the smallest object involved.  For example, the line
+tests use a PolyLine request to paint several lines at once, but report how
+many lines per second the server can paint, not how many PolyLine requests per
+second.  Text tests paint a line of characters, but report on the number of
+characters per second.  Some window tests map, unmap, or move a single parent
+window, but report on how many children windows per second the server can map,
+unmap, or move.
+.PP
+The current program is mostly the responsibility of Joel McCormack.  It is
+based upon the x11perf developed by Phil Karlton, Susan Angebranndt, Chris
+Kent, Mary Walker, and Todd Newman, who wanted to assess performance differences between various servers.
+Several tests were added  in order to write and tune
+the PMAX (DECStation 3100) servers.  
+For a general release to the world, 
+.I x11perf 
+was rewritten to ease making comparisons between widely varying
+machines, to cover most important (and unimportant) X functionality,
+and to exercise graphics operations in as many different
+orientations and alignments as possible.
+.SH OPTIONS
+.I x11perf 
+is solely Xlib based, and
+accepts the options listed below:
+.TP 14
+.B \-display host:dpy
+Specifies which display to use.
+.TP 14
+.B \-sync
+Runs the tests in synchronous mode.
+Normally only useful for debugging 
+.I x11perf .
+.TP 14
+.B \-pack
+Runs rectangle tests so that they pack rectangles right next to each other.
+This makes it easy to debug server code for stipples and tiles...if the
+pattern looks ugly, you've got alignment problems.
+.TP 14
+.B \-repeat \fI<n>\fP
+Repeats each test 
+.I n
+times (by default each test is run 5 times).
+.TP 14
+.B \-time \fI<s>\fP
+Specifies how long in seconds each test should be run (default 5 seconds).
+.TP 14
+.B \-all
+Runs all tests.  This may take a while.
+.TP 14
+.B \-range \fI<test1>\fP[,\fI<test2>\fP]
+Runs all the tests starting from the specified name \fItest1\fP until
+the name \fItest2\fP, including both the specified tests. The testnames
+should be one of the options starting from -dot. (eg) -range line100
+will peform the tests from the 100 pixel line test, and go on till the
+last test, -range line100,dline10 will do the tests from line100 to
+dline10.
+.TP 14
+.B \-labels
+Generates just the descriptive labels for each test specified.  See
+.I x11perfcomp
+for more details.
+.TP 14
+.B \-fg \fIcolor-or-pixel\fP
+Specifies the foreground color or pixel value to use.
+.TP 14
+.B \-bg \fIcolor-or-pixel\fP
+Specifies the background color or pixel value to use.
+.TP 14
+.B \-clips \fIdefault\fP
+Default number of clip windows.
+.TP 14
+.B \-ddbg \fIcolor-or-pixel\fP
+Specifies the color or pixel value to use for drawing
+the odd segments of a DoubleDashed line or arc.
+This will default to the bg color.
+.TP 14
+.B \-rop <rop0 rop1 ...>
+Use specified raster ops (default is GXcopy).
+This option only affects graphics
+benchmarks in which the graphics function is actually used.
+.TP 14
+.B \-pm <pm0 pm1 ...>
+Use specified planemasks (default is ~0).
+This option only affects graphics
+benchmarks in which the planemask is actually used.
+.TP 14
+.B \-depth <depth>
+Use a visual with <depth> planes per pixel (default is the default
+visual).
+.TP 14
+.B \-vclass <vclass>
+Use a visual with of class <vclass>.  <vclass> can be StaticGray, GrayScale,
+StaticColor, PseudoColor, TrueColor, or DirectColor.  (default is the default
+visual).
+.TP 14
+.B \-reps <n>
+Specify the repetition count (Default is number that takes aprox. 5 seconds)
+.TP 14
+.B \-subs <s0 s1 ...>
+Specify the number of sub windows to use in the Window tests.
+Default is  4, 16, 25, 50, 75, 100 and 200.
+.TP 14
+.B \-v1.2
+Perform only x11perf Version 1.2 tests using Version 1.2 semantics.
+.TP 14
+.B \-v1.3
+Perform only x11perf Version 1.3 tests using Version 1.3 semantics.
+.TP 14
+.B \-su
+Set the save_under window attribute to True on all windows created by x11perf.
+Default is False.
+.TP 14
+.B \-bs <backing_store_hint>
+Set the backing_store window attribute to the given value on all windows 
+created by x11perf. <backing_store_hint> can be WhenMapped or 
+Always.  Default is NotUseful.
+.TP 14
+.B \-dot
+Dot.
+.TP 14
+.B \-rect1
+1x1 solid-filled rectangle.
+.TP 14
+.B \-rect10
+10x10 solid-filled rectangle.
+.TP 14
+.B \-rect100
+100x100 solid-filled rectangle.
+.TP 14
+.B \-rect500
+500x500 solid-filled rectangle.
+.TP 14
+.B \-srect1
+1x1 transparent stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-srect10
+10x10 transparent stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-srect100
+100x100 transparent stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-srect500
+500x500 transparent stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-osrect1
+1x1 opaque stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-osrect10
+10x10 opaque stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-osrect100
+100x100 opaque stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-osrect500
+500x500 opaque stippled rectangle, 8x8 stipple pattern.
+.TP 14
+.B \-tilerect1
+1x1 tiled rectangle, 4x4 tile pattern.
+.TP 14
+.B \-tilerect10
+10x10 tiled rectangle, 4x4 tile pattern.
+.TP 14
+.B \-tilerect100
+100x100 tiled rectangle, 4x4 tile pattern.
+.TP 14
+.B \-tilerect500
+500x500 tiled rectangle, 4x4 tile pattern.
+.TP 14
+.B \-oddsrect1
+1x1 transparent stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddsrect10
+10x10 transparent stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddsrect100
+100x100 transparent stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddsrect500
+500x500 transparent stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddosrect1
+1x1 opaque stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddosrect10
+10x10 opaque stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddosrect100
+100x100 opaque stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddosrect500
+500x500 opaque stippled rectangle, 17x15 stipple pattern.
+.TP 14
+.B \-oddtilerect1
+1x1 tiled rectangle, 17x15 tile pattern.
+.TP 14
+.B \-oddtilerect10
+10x10 tiled rectangle, 17x15 tile pattern.
+.TP 14
+.B \-oddtilerect100
+100x100 tiled rectangle, 17x15 tile pattern.
+.TP 14
+.B \-oddtilerect500
+500x500 tiled rectangle, 17x15 tile pattern.
+.TP 14
+.B \-bigsrect1
+1x1 stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigsrect10
+10x10 stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigsrect100
+100x100 stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigsrect500
+500x500 stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigosrect1
+1x1 opaque stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigosrect10
+10x10 opaque stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigosrect100
+100x100 opaque stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigosrect500
+500x500 opaque stippled rectangle, 161x145 stipple pattern.
+.TP 14
+.B \-bigtilerect1
+1x1 tiled rectangle, 161x145 tile pattern.
+.TP 14
+.B \-bigtilerect10
+10x10 tiled rectangle, 161x145 tile pattern.
+.TP 14
+.B \-bigtilerect100
+100x100 tiled rectangle, 161x145 tile pattern.
+.TP 14
+.B \-bigtilerect500
+500x500 tiled rectangle, 161x145 tile pattern.
+.TP 14
+.B \-eschertilerect1
+1x1 tiled rectangle, 215x208 tile pattern.
+.TP 14
+.B \-eschertilerect10
+10x10 tiled rectangle, 215x208 tile pattern.
+.TP 14
+.B \-eschertilerect100
+100x100 tiled rectangle, 215x208 tile pattern.
+.TP 14
+.B \-eschertilerect500
+500x500 tiled rectangle, 215x208 tile pattern.
+.TP 14
+.B \-seg1
+1-pixel thin line segment.
+.TP 14
+.B \-seg10
+10-pixel thin line segment.
+.TP 14
+.B \-seg100
+100-pixel thin line segment.
+.TP 14
+.B \-seg500
+500-pixel thin line segment.
+.TP 14
+.B \-seg100c1
+100-pixel thin line segment (1 obscuring rectangle).
+.TP 14
+.B \-seg100c2
+100-pixel thin line segment (2 obscuring rectangles).
+.TP 14
+.B \-seg100c3
+100-pixel thin line segment (3 obscuring rectangles).
+.TP 14
+.B \-dseg10
+10-pixel thin dashed segment (3 on, 2 off).
+.TP 14
+.B \-dseg100
+100-pixel thin dashed segment (3 on, 2 off).
+.TP 14
+.B \-ddseg100
+100-pixel thin double-dashed segment (3 fg, 2 bg).
+.TP 14
+.B \-hseg10
+10-pixel thin horizontal line segment.
+.TP 14
+.B \-hseg100
+100-pixel thin horizontal line segment.
+.TP 14
+.B \-hseg500
+500-pixel thin horizontal line segment.
+.TP 14
+.B \-vseg10
+10-pixel thin vertical line segment.
+.TP 14
+.B \-vseg100
+100-pixel thin vertical line segment.
+.TP 14
+.B \-vseg500
+500-pixel thin vertical line segment.
+.TP 14
+.B \-whseg10
+10-pixel wide horizontal line segment.
+.TP 14
+.B \-whseg100
+100-pixel wide horizontal line segment.
+.TP 14
+.B \-whseg500
+500-pixel wide horizontal line segment.
+.TP 14
+.B \-wvseg10
+10-pixel wide vertical line segment.
+.TP 14
+.B \-wvseg100
+100-pixel wide vertical line segment.
+.TP 14
+.B \-wvseg500
+500-pixel wide vertical line segment.
+.TP 14
+.B \-line1
+1-pixel thin (width 0) line.
+.TP 14
+.B \-line10
+10-pixel thin line.
+.TP 14
+.B \-line100
+100-pixel thin line.
+.TP 14
+.B \-line500
+500-pixel thin line.
+.TP 14
+.B \-dline10
+10-pixel thin dashed line (3 on, 2 off).
+.TP 14
+.B \-dline100
+100-pixel thin dashed line (3 on, 2 off).
+.TP 14
+.B \-ddline100
+100-pixel thin double-dashed line (3 fg, 2 bg).
+.TP 14
+.B \-wline10
+10-pixel line, line width 1.
+.TP 14
+.B \-wline100
+100-pixel line, line width 10.
+.TP 14
+.B \-wline500
+500-pixel line, line width 50.
+.TP 14
+.B \-wdline100
+100-pixel dashed line, line width 10 (30 on, 20 off).
+.TP 14
+.B \-wddline100
+100-pixel double-dashed line, line width 10 (30 fg, 20 bg).
+.TP 14
+.B \-orect10
+10x10 thin rectangle outline.
+.TP 14
+.B \-orect100
+100-pixel thin vertical line segment.
+.TP 14
+.B \-orect500
+500-pixel thin vertical line segment.
+.TP 14
+.B \-worect10
+10x10 wide rectangle outline.
+.TP 14
+.B \-worect100
+100-pixel wide vertical line segment.
+.TP 14
+.B \-worect500
+500-pixel wide vertical line segment.
+.TP 14
+.B \-circle1
+1-pixel diameter thin (line width 0) circle.
+.TP 14
+.B \-circle10
+10-pixel diameter thin circle.
+.TP 14
+.B \-circle100
+100-pixel diameter thin circle.
+.TP 14
+.B \-circle500
+500-pixel diameter thin circle.
+.TP 14
+.B \-dcircle100
+100-pixel diameter thin dashed circle (3 on, 2 off).
+.TP 14
+.B \-ddcircle100
+100-pixel diameter thin double-dashed circle (3 fg, 2 bg).
+.TP 14
+.B \-wcircle10
+10-pixel diameter circle, line width 1.
+.TP 14
+.B \-wcircle100
+100-pixel diameter circle, line width 10.
+.TP 14
+.B \-wcircle500
+500-pixel diameter circle, line width 50.
+.TP 14
+.B \-wdcircle100
+100-pixel diameter dashed circle, line width 10 (30 on, 20 off).
+.TP 14
+.B \-wddcircle100
+100-pixel diameter double-dashed circle, line width 10 (30 fg, 20 bg).
+.TP 14
+.B \-pcircle10
+10-pixel diameter thin partial circle,
+orientation and arc angle evenly distributed.
+.TP 14
+.B \-pcircle100
+100-pixel diameter thin partial circle.
+.TP 14
+.B \-wpcircle10
+10-pixel diameter wide partial circle.
+.TP 14
+.B \-wpcircle100
+100-pixel diameter wide partial circle.
+.TP 14
+.B \-fcircle1
+1-pixel diameter filled circle.
+.TP 14
+.B \-fcircle10
+10-pixel diameter filled circle.
+.TP 14
+.B \-fcircle100
+100-pixel diameter filled circle.
+.TP 14
+.B \-fcircle500
+500-pixel diameter filled circle.
+.TP 14
+.B \-fcpcircle10
+10-pixel diameter partial filled circle, chord fill,
+orientation and arc angle evenly distributed.
+.TP 14
+.B \-fcpcircle100
+100-pixel diameter partial filled circle, chord fill.
+.TP 14
+.B \-fspcircle10
+10-pixel diameter partial filled circle, pie slice fill,
+orientation and arc angle evenly distributed.
+.TP 14
+.B \-fspcircle100
+100-pixel diameter partial filled circle, pie slice fill.
+.TP 14
+.B \-ellipse10
+10-pixel diameter thin (line width 0) ellipse, major and
+minor axis sizes evenly distributed.
+.TP 14
+.B \-ellipse100
+100-pixel diameter thin ellipse.
+.TP 14
+.B \-ellipse500
+500-pixel diameter thin ellipse.
+.TP 14
+.B \-dellipse100
+100-pixel diameter thin dashed ellipse (3 on, 2 off).
+.TP 14
+.B \-ddellipse100
+100-pixel diameter thin double-dashed ellipse (3 fg, 2 bg).
+.TP 14
+.B \-wellipse10
+10-pixel diameter ellipse, line width 1.
+.TP 14
+.B \-wellipse100
+100-pixel diameter ellipse, line width 10.
+.TP 14
+.B \-wellipse500
+500-pixel diameter ellipse, line width 50.
+.TP 14
+.B \-wdellipse100
+100-pixel diameter dashed ellipse, line width 10 (30 on, 20 off).
+.TP 14
+.B \-wddellipse100
+100-pixel diameter double-dashed ellipse, line width 10 (30 fg, 20 bg).
+.TP 14
+.B \-pellipse10
+10-pixel diameter thin partial ellipse.
+.TP 14
+.B \-pellipse100
+100-pixel diameter thin partial ellipse.
+.TP 14
+.B \-wpellipse10
+10-pixel diameter wide partial ellipse.
+.TP 14
+.B \-wpellipse100
+100-pixel diameter wide partial ellipse.
+.TP 14
+.B \-fellipse10
+10-pixel diameter filled ellipse.
+.TP 14
+.B \-fellipse100
+100-pixel diameter filled ellipse.
+.TP 14
+.B \-fellipse500
+500-pixel diameter filled ellipse.
+.TP 14
+.B \-fcpellipse10
+10-pixel diameter partial filled ellipse, chord fill.
+.TP 14
+.B \-fcpellipse100
+100-pixel diameter partial filled ellipse, chord fill.
+.TP 14
+.B \-fspellipse10
+10-pixel diameter partial filled ellipse, pie slice fill.
+.TP 14
+.B \-fspellipse100
+100-pixel diameter partial filled ellipse, pie slice fill.
+.TP 14
+.B \-triangle1
+Fill 1-pixel/side triangle.
+.TP 14
+.B \-triangle10
+Fill 10-pixel/side triangle.
+.TP 14
+.B \-triangle100
+Fill 100-pixel/side triangle.
+.TP 14
+.B \-trap1
+Fill 1x1 trapezoid.
+.TP 14
+.B \-trap10
+Fill 10x10 trapezoid.
+.TP 14
+.B \-trap100
+Fill 100x100 trapezoid.
+.TP 14
+.B \-trap300
+Fill 300x300 trapezoid.
+.TP 14
+.B \-strap1
+Fill 1x1 transparent stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-strap10
+Fill 10x10 transparent stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-strap100
+Fill 100x100 transparent stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-strap300
+Fill 300x300 transparent stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-ostrap1
+Fill 10x10 opaque stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-ostrap10
+Fill 10x10 opaque stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-ostrap100
+Fill 100x100 opaque stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-ostrap300
+Fill 300x300 opaque stippled trapezoid, 8x8 stipple pattern.
+.TP 14
+.B \-tiletrap1
+Fill 10x10 tiled trapezoid, 4x4 tile pattern.
+.TP 14
+.B \-tiletrap10
+Fill 10x10 tiled trapezoid, 4x4 tile pattern.
+.TP 14
+.B \-tiletrap100
+Fill 100x100 tiled trapezoid, 4x4 tile pattern.
+.TP 14
+.B \-tiletrap300
+Fill 300x300 tiled trapezoid, 4x4 tile pattern.
+.TP 14
+.B \-oddstrap1
+Fill 1x1 transparent stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddstrap10
+Fill 10x10 transparent stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddstrap100
+Fill 100x100 transparent stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddstrap300
+Fill 300x300 transparent stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddostrap1
+Fill 10x10 opaque stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddostrap10
+Fill 10x10 opaque stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddostrap100
+Fill 100x100 opaque stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddostrap300
+Fill 300x300 opaque stippled trapezoid, 17x15 stipple pattern.
+.TP 14
+.B \-oddtiletrap1
+Fill 10x10 tiled trapezoid, 17x15 tile pattern.
+.TP 14
+.B \-oddtiletrap10
+Fill 10x10 tiled trapezoid, 17x15 tile pattern.
+.TP 14
+.B \-oddtiletrap100
+Fill 100x100 tiled trapezoid, 17x15 tile pattern.
+.TP 14
+.B \-oddtiletrap300
+Fill 300x300 tiled trapezoid, 17x15 tile pattern.
+.TP 14
+.B \-bigstrap1
+Fill 1x1 transparent stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigstrap10
+Fill 10x10 transparent stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigstrap100
+Fill 100x100 transparent stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigstrap300
+Fill 300x300 transparent stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigostrap1
+Fill 10x10 opaque stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigostrap10
+Fill 10x10 opaque stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigostrap100
+Fill 100x100 opaque stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigostrap300
+Fill 300x300 opaque stippled trapezoid, 161x145 stipple pattern.
+.TP 14
+.B \-bigtiletrap1
+Fill 10x10 tiled trapezoid, 161x145 tile pattern.
+.TP 14
+.B \-bigtiletrap10
+Fill 10x10 tiled trapezoid, 161x145 tile pattern.
+.TP 14
+.B \-bigtiletrap100
+Fill 100x100 tiled trapezoid, 161x145 tile pattern.
+.TP 14
+.B \-bigtiletrap300
+Fill 300x300 tiled trapezoid, 161x145 tile pattern.
+.TP 14
+.B \-eschertiletrap1
+Fill 1x1 tiled trapezoid, 216x208 tile pattern.
+.TP 14
+.B \-eschertiletrap10
+Fill 10x10 tiled trapezoid, 216x208 tile pattern.
+.TP 14
+.B \-eschertiletrap100
+Fill 100x100 tiled trapezoid, 216x208 tile pattern.
+.TP 14
+.B \-eschertiletrap300
+Fill 300x300 tiled trapezoid, 216x208 tile pattern.
+.TP 14
+.B \-complex10
+Fill 10-pixel/side complex polygon.
+.TP 14
+.B \-complex100
+Fill 100-pixel/side complex polygon.
+.TP 14
+.B \-64poly10convex
+Fill 10x10 convex 64-gon.
+.TP 14
+.B \-64poly100convex
+Fill 100x100 convex 64-gon.
+.TP 14
+.B \-64poly10complex
+Fill 10x10 complex 64-gon.
+.TP 14
+.B \-64poly100complex
+Fill 100x100 complex 64-gon.
+.TP 14
+.B \-ftext
+Character in 80-char line (6x13).
+.TP 14
+.B \-f8text
+Character in 70-char line (8x13).
+.TP 14
+.B \-f9text
+Character in 60-char line (9x15).
+.TP 14
+.B \-f14text16
+2-byte character in 40-char line (k14).
+.TP 14
+.B \-tr10text
+Character in 80-char line (Times-Roman 10).
+.TP 14
+.B \-tr24text
+Character in 30-char line (Times-Roman 24).
+.TP 14
+.B \-polytext
+Character in 20/40/20 line (6x13, Times-Roman 10, 6x13).
+.TP 14
+.B \-polytext16
+2-byte character in 7/14/7 line (k14, k24).
+.TP 14
+.B \-fitext
+Character in 80-char image line (6x13).
+.TP 14
+.B \-f8itext
+Character in 70-char image line (8x13).
+.TP 14
+.B \-f9itext
+Character in 60-char image line (9x15).
+.TP 14
+.B \-f14itext16
+2-byte character in 40-char image line (k14).
+.TP 14
+.B \-f24itext16
+2-byte character in 23-char image line (k24).
+.TP 14
+.B \-tr10itext
+Character in 80-char image line (Times-Roman 10).
+.TP 14
+.B \-tr24itext
+Character in 30-char image line (Times-Roman 24).
+.TP 14
+.B \-scroll10
+Scroll 10x10 pixels vertically.
+.TP 14
+.B \-scroll100
+Scroll 100x100 pixels vertically.
+.TP 14
+.B \-scroll500
+Scroll 500x500 pixels vertically.
+.TP 14
+.B \-copywinwin10
+Copy 10x10 square from window to window.
+.TP 14
+.B \-copywinwin100
+Copy 100x100 square from window to window.
+.TP 14
+.B \-copywinwin500
+Copy 500x500 square from window to window.
+.TP 14
+.B \-copypixwin10
+Copy 10x10 square from pixmap to window.
+.TP 14
+.B \-copypixwin100
+Copy 100x100 square from pixmap to window.
+.TP 14
+.B \-copypixwin500
+Copy 500x500 square from pixmap to window.
+.TP 14
+.B \-copywinpix10
+Copy 10x10 square from window to pixmap.
+.TP 14
+.B \-copywinpix100
+Copy 100x100 square from window to pixmap.
+.TP 14
+.B \-copywinpix500
+Copy 500x500 square from window to pixmap.
+.TP 14
+.B \-copypixpix10
+Copy 10x10 square from pixmap to pixmap.
+.TP 14
+.B \-copypixpix100
+Copy 100x100 square from pixmap to pixmap.
+.TP 14
+.B \-copypixpix500
+Copy 500x500 square from pixmap to pixmap.
+.TP 14
+.B \-copyplane10
+Copy 10x10 1-bit deep plane.
+.TP 14
+.B \-copyplane100
+Copy 100x100 1-bit deep plane.
+.TP 14
+.B \-copyplane500
+Copy 500x500 1-bit deep plane.
+.TP 14
+.B \-putimage10
+PutImage 10x10 square.
+.TP 14
+.B \-putimage100
+PutImage 100x100 square.
+.TP 14
+.B \-putimage500
+PutImage 500x500 square.
+.TP 14
+.B \-putimagexy10
+PutImage XY format 10x10 square.
+.TP 14
+.B \-putimagexy100
+PutImage XY format 100x100 square.
+.TP 14
+.B \-putimagexy500
+PutImage XY format 500x500 square.
+.TP 14
+.B \-shmput10
+PutImage 10x10 square, MIT shared memory extension.
+.TP 14
+.B \-shmput100
+PutImage 100x100 square, MIT shared memory extension.
+.TP 14
+.B \-shmput500
+PutImage 500x500 square, MIT shared memory extension.
+.TP 14
+.B \-shmputxy10
+PutImage XY format 10x10 square, MIT shared memory extension.
+.TP 14
+.B \-shmputxy100
+PutImage XY format 100x100 square, MIT shared memory extension.
+.TP 14
+.B \-shmputxy500
+PutImage XY format 500x500 square, MIT shared memory extension.
+.TP 14
+.B \-getimage10
+GetImage 10x10 square.
+.TP 14
+.B \-getimage100
+GetImage 100x100 square.
+.TP 14
+.B \-getimage500
+GetImage 500x500 square.
+.TP 14
+.B \-getimagexy10
+GetImage XY format 10x10 square.
+.TP 14
+.B \-getimagexy100
+GetImage XY format 100x100 square.
+.TP 14
+.B \-getimagexy500
+GetImage XY format 500x500 square.
+.TP 14
+.B \-noop
+X protocol NoOperation.
+.TP 14
+.B \-atom
+GetAtomName.
+.TP 14
+.B \-pointer
+QueryPointer.
+.TP 14
+.B \-prop
+GetProperty.
+.TP 14
+.B \-gc
+Change graphics context.
+.TP 14
+.B \-create
+Create child window and map using MapSubwindows.
+.TP 14
+.B \-ucreate
+Create unmapped window.
+.TP 14
+.B \-map
+Map child window via MapWindow on parent.
+.TP 14
+.B \-unmap
+Unmap child window via UnmapWindow on parent.
+.TP 14
+.B \-destroy
+Destroy child window via DestroyWindow parent.
+.TP 14
+.B \-popup
+Hide/expose window via Map/Unmap popup window.
+.TP 14
+.B \-move
+Move window.
+.TP 14
+.B \-umove
+Moved unmapped window.
+.TP 14
+.B \-movetree
+Move window via MoveWindow on parent.
+.TP 14
+.B \-resize
+Resize window.
+.TP 14
+.B \-uresize
+Resize unmapped window.
+.TP 14
+.B \-circulate
+Circulate lowest window to top.
+.TP 14
+.B \-ucirculate
+Circulate unmapped window to top.
+.SH X DEFAULTS
+There are no X defaults used by this program.
+.SH "SEE ALSO"
+X(__miscmansuffix__), xbench(1), x11perfcomp(1)
+.SH AUTHORS
+Joel McCormack
+.br
+Phil Karlton
+.br
+Susan Angebranndt
+.br
+Chris Kent
+.br
+Keith Packard
+.br
+Graeme Gill
diff --git a/app/x11perf/x11perfcomp.man b/app/x11perf/x11perfcomp.man
new file mode 100644
index 000000000..2750412ae
--- /dev/null
+++ b/app/x11perf/x11perfcomp.man
@@ -0,0 +1,82 @@
+.\" $Xorg: x11pcomp.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
+.\" Copyright 1993, 1994, 1998  The Open Group
+.\" 
+.\" Permission to use, copy, modify, distribute, and sell this software and its
+.\" documentation for any purpose is hereby granted without fee, provided that
+.\" the above copyright notice appear in all copies and that both that
+.\" copyright notice and this permission notice appear in supporting
+.\" documentation.
+.\" 
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\" 
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.7 2001/01/27 18:21:07 dawes Exp $
+.\"
+.TH X11PERFCOMP 1 __xorgversion__
+.SH NAME
+x11perfcomp \- X11 server performance comparison program
+.SH SYNTAX
+.B x11perfcomp
+[ \-r | \-ro ] [ \-l label_file ] files
+.SH DESCRIPTION
+The
+.I x11perfcomp
+program merges the output of several
+.I x11perf(1)
+runs into a nice tabular
+format.  It takes the results in each file, fills in any missing test results if
+necessary, and for each test shows the objects/second rate of each server.
+If invoked with the -r or -ro options, it shows the relative performance 
+of each server to the first server.
+.PP
+Normally,
+.I x11perfcomp
+uses the first file specified to determine which specific tests it should
+report on.  Some (non-DEC :) servers may fail to perform
+all tests.  In this case,
+.I x11perfcomp
+automatically substitutes in a rate of 0.0 objects/second. 
+Since the first file
+determines which tests to report on, this file must contain a superset of
+the tests reported in the other files, else 
+.I x11perfcomp
+will fail.
+.PP
+You can provide an explicit list of tests to report on
+by using the -l switch to specify a file of labels.  You can create a label
+file by using the -label option in 
+.I x11perf.
+.SH OPTIONS
+.I x11perfcomp
+accepts the options listed below:
+.TP 16
+.B \-r
+Specifies that the output should also include relative server
+performance.
+.TP 16
+.B \-ro
+Specifies that the output should include only relative server performance.
+.TP 16
+.B \-l label_file
+Specifies a label file to use.
+.SH X DEFAULTS
+There are no X defaults used by this program.
+.SH "SEE ALSO"
+X(__miscmansuffix__), x11perf(1)
+.SH AUTHORS
+Mark Moraes wrote the original scripts to compare servers.
+.br
+Joel McCormack just munged them together a bit.
author	Matthieu Herrb <matthieu@cvs.openbsd.org>	2006-11-25 20:24:16 +0000
committer	Matthieu Herrb <matthieu@cvs.openbsd.org>	2006-11-25 20:24:16 +0000
commit	dc4a2107be04f29ad06d6e60e102370bf68739cd (patch)
tree	57b3b37d49dada5a081f5ee365979a730b13acf4 /app/x11perf
parent	78d9ac52db47a21e2260ec82b6666ca014fc4c68 (diff)