Remove old X proto files, replaced by xorgproto.

"go for it" deraadt@

19 files changed, 0 insertions, 9258 deletions

diff --git a/proto/glproto/COPYING b/proto/glproto/COPYING
deleted file mode 100644
index 78b6de44f..000000000
--- a/proto/glproto/COPYING
+++ /dev/null
@@ -1,27 +0,0 @@
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice including the dates of first publication and
-either this permission notice or a reference to
-http://oss.sgi.com/projects/FreeB/
-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
-SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
-shall not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-Silicon Graphics, Inc.
diff --git a/proto/glproto/ChangeLog b/proto/glproto/ChangeLog
deleted file mode 100644
index 50e1dd09e..000000000
--- a/proto/glproto/ChangeLog
+++ /dev/null
@@ -1,748 +0,0 @@
-commit f84853d97d5749308992412a215fa518b6536eb3
-Author: Keith Packard <keithp@keithp.com>
-Date:   Tue Dec 10 07:03:55 2013 -0800
-
-    glproto: bump version to 1.4.17 for release
-    
-    Signed-off-by: Keith Packard <keithp@keithp.com>
-
-commit 7adf6d08b7d9fe1304f8c37f5a9152df97a6344d
-Author: Keith Packard <keithp@keithp.com>
-Date:   Wed Dec 4 10:20:12 2013 -0800
-
-    Add defines for float renderType bits
-    
-    These were added to mesa's glxext.h, but not duplicated here.
-    
-    Signed-off-by: Keith Packard <keithp@keithp.com>
-    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-
-commit aacc7a51b6161c765b04524e0d2ab31e5e586834
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sat Oct 26 09:42:05 2013 -0400
-
-    config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
-    
-    Fix Automake warning: AC_OUTPUT should be used without arguments.
-    www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 8e3407e02980d088e20041e79bdcdd3737e7827e
-Author: Colin Walters <walters@verbum.org>
-Date:   Wed Jan 4 17:37:06 2012 -0500
-
-    autogen.sh: Implement GNOME Build API
-    
-    http://people.gnome.org/~walters/docs/build-api.txt
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 223af08767d504b32c4852961d70ad3130d2243f
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Jan 15 14:01:10 2013 -0500
-
-    configure: Remove AM_MAINTAINER_MODE
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit ec1eec4355ee4a6c5134f2178192f10b6d28a87a
-Author: Dave Airlie <airlied@gmail.com>
-Date:   Thu Jul 12 22:55:53 2012 +1000
-
-    glproto: bump version to 1.4.16 for release.
-    
-    Signed-off-by: Dave Airlie <airlied@redhat.com>
-
-commit 458a9eb2660b6c9fcc5b63ad55d0529c22803138
-Author: Ian Romanick <ian.d.romanick@intel.com>
-Date:   Wed May 23 13:49:36 2012 -0700
-
-    glproto: Add define for GLX_EXT_create_context_es2_profile
-    
-    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-    Reviewed-by: Matt Turner <mattst88@gmail.com>
-
-commit ec3f3387211f428886dfdee2443e16f45e00e77b
-Author: Ian Romanick <ian.d.romanick@intel.com>
-Date:   Wed May 23 13:47:52 2012 -0700
-
-    glproto: Fix typo in name of GLX_LOSE_CONTEXT_ON_RESET_ARB
-    
-    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-    Reviewed-by: Matt Turner <mattst88@gmail.com>
-
-commit 29d5b553b30755a25300c30b67d39b37c9a76466
-Author: Ian Romanick <ian.d.romanick@intel.com>
-Date:   Mon Nov 28 10:53:17 2011 -0800
-
-    glproto: Document GLX_ARB_create_context and GLX_ARB_create_context_profile protocol
-    
-    Also add the struct names (in addition to the typedef names).  Most of
-    the other protocol structures have this, but some lack it.
-    
-    v2: Add a few missing Req suffixes.  Rename n0, n1, and n2 fields of
-    GLXSetClientInfoARB and GLXSetClientInfo2ARB to numVersions,
-    numGLExtensionBytes and numGLXExtensionBytes, respectively.  Since the
-    names of some structure fields change, bump the version to 1.4.15.
-    
-    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-    Reviewed-by: Dave Airlie <airlied@redhat.com>
-
-commit 6d7e398150dde1c15b7f62f485cb33bad8f4d5c6
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Thu May 5 13:10:39 2011 -0700
-
-    glproto: add a new GLXBufferSwapComplete struct that matches the spec
-    
-    Just add a new struct to remain compatible with existing code.
-    
-    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-
-commit 7196c9441af941be74180f8e8d4e10a08659b80f
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Thu May 5 09:21:19 2011 -0700
-
-    Revert "glxproto: make GLX swap event struct match spec"
-    
-    This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b.
-    
-    This broke compatibility with existing code, so revert in favor of a new
-    struct definition instead.
-
-commit f5403828c68af0f12c79c0504df0a4781ca84b2b
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Tue May 3 12:14:10 2011 -0700
-
-    glxproto: make GLX swap event struct match spec
-    
-    We only spec a 32 bit swap count, so drop the high sbc field.  Also make
-    the padding explicit (most compilers would have already done this since
-    it's not a packed structure, but making it explicit should prevent
-    surprises in the future).
-    
-    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-
-commit 0cc3162cd29e63f915dc2b66c8dbd7a1a3dcdddc
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Sun Mar 6 17:48:05 2011 +1000
-
-    glproto: add GLX_ARB_context_create + GLX_ARB_context_create_profile
-    
-    Add glproto support for these two extensions
-    
-    also add tokens for GLX_ARB_create_context_robustness
-
-commit a50bd646df530b4ce84a8aef3d40c74766dfb60c
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Mon Jan 3 19:40:30 2011 +1000
-
-    glxtokens.h: add GLX_EXT_framebuffer_sRGB support.
-    
-    this is needed to glxcmds.c to emit this info.
-
-commit f065686b320c5fbfd7e1da6fcd3e2690b8305ec8
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Aug 10 10:01:33 2010 -0400
-
-    glproto 1.4.12
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 6d7e398150dde1c15b7f62f485cb33bad8f4d5c6
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Thu May 5 13:10:39 2011 -0700
-
-    glproto: add a new GLXBufferSwapComplete struct that matches the spec
-    
-    Just add a new struct to remain compatible with existing code.
-    
-    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-
-commit 7196c9441af941be74180f8e8d4e10a08659b80f
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Thu May 5 09:21:19 2011 -0700
-
-    Revert "glxproto: make GLX swap event struct match spec"
-    
-    This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b.
-    
-    This broke compatibility with existing code, so revert in favor of a new
-    struct definition instead.
-
-commit f5403828c68af0f12c79c0504df0a4781ca84b2b
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Tue May 3 12:14:10 2011 -0700
-
-    glxproto: make GLX swap event struct match spec
-    
-    We only spec a 32 bit swap count, so drop the high sbc field.  Also make
-    the padding explicit (most compilers would have already done this since
-    it's not a packed structure, but making it explicit should prevent
-    surprises in the future).
-    
-    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-
-commit 0cc3162cd29e63f915dc2b66c8dbd7a1a3dcdddc
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Sun Mar 6 17:48:05 2011 +1000
-
-    glproto: add GLX_ARB_context_create + GLX_ARB_context_create_profile
-    
-    Add glproto support for these two extensions
-    
-    also add tokens for GLX_ARB_create_context_robustness
-
-commit a50bd646df530b4ce84a8aef3d40c74766dfb60c
-Author: Dave Airlie <airlied@redhat.com>
-Date:   Mon Jan 3 19:40:30 2011 +1000
-
-    glxtokens.h: add GLX_EXT_framebuffer_sRGB support.
-    
-    this is needed to glxcmds.c to emit this info.
-
-commit f065686b320c5fbfd7e1da6fcd3e2690b8305ec8
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Aug 10 10:01:33 2010 -0400
-
-    glproto 1.4.12
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit b173af9ea5361b4794d4cca79f7c7dddd8401a87
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Wed Aug 4 09:44:14 2010 -0400
-
-    Remove structure tag for xGLXHyperpipeConfigSGIXReq
-    
-    X request structs don't have tags, in general, and this particular one
-    causes a conflict with glxext.h which defines GLXHyperpipeConfigSGIX for
-    the client-side API.
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 8e7ef2d30ea8a98b6e90540e674b60d066a71fef
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Mar 28 19:25:52 2010 -0400
-
-    config: update AC_PREREQ statement to 2.60
-    
-    Unrelated to the previous patches, the new value simply reflects
-    the reality that the minimum level for autoconf to configure
-    all x.org modules is 2.60 dated June 2006.
-    
-    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit bba203c33e943d8de1bfe545434bee1db52a2245
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Mar 28 19:00:31 2010 -0400
-
-    config: remove the pkgconfig pc.in file from EXTRA_DIST
-    
-    Automake always includes it in the tarball.
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 9c58144688d0200e7683882549490827868a44b5
-Author: Luc Verhaegen <libv@skynet.be>
-Date:   Fri Mar 5 15:32:11 2010 +0100
-
-    Sync glcore.h with mesa HEAD.
-    
-    EXT_texture_from_pixmap was added close to 4ys ago, but this file never
-    got updated, leading to "interesting" behaviour when anything slightly less
-    standard is attempted.
-    
-    Signed-off-by: Luc Verhaegen <libv@skynet.be>
-
-commit fa99593342f13220fb675a1c3c17b6a3d755abda
-Author: Ian Romanick <ian.d.romanick@intel.com>
-Date:   Tue Feb 9 15:20:59 2010 -0800
-
-    Update tokens for GLX_INTEL_swap_event to match final version of spec
-
-commit 2c7f76a1d42fbd4be995de56563c94882dd4a058
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Nov 16 11:47:44 2009 -0500
-
-    COPYING: add Copyright from Silicon Graphics
-    
-    The COPYING file contains all Copyright notices from source code.
-    Refer to glxproto.h
-    
-    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 3966379209ec48f14a1d12e48f51b687d48cc6ac
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Fri Jan 8 15:11:48 2010 -0500
-
-    Bump version for release
-
-commit 6a9361aaec49495d566db1267a21a0f4ed1b9480
-Merge: c35f05d f2b9a6a
-Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-Date:   Fri Jan 8 11:43:07 2010 -0500
-
-    Merge branch 'master' of git://people.freedesktop.org/~jbarnes/glproto
-
-commit f2b9a6a29edf930f30eade7a0abe40a6d3c4962b
-Author: Jesse Barnes <jbarnes@jbarnes-desktop.localdomain>
-Date:   Thu Nov 12 16:53:13 2009 +0000
-
-    Add GLX swap buffers event support
-
-commit c35f05decd7c1c5e4d4c1cc955c6ba9ba370b788
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Nov 22 19:24:48 2009 -0500
-
-    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
-    
-    Now that the INSTALL file is generated.
-    Allows running make maintainer-clean.
-
-commit 57dfc6eaf0da7ba8ef3bc1bbe105037f4b7b97f7
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Mon Nov 16 11:13:30 2009 -0500
-
-    README: file created or updated #24206
-    
-    Contains a set of URLs to freedesktop.org.
-
-commit 6f612cd9c52ad89369cb6364c11c47ad3a356b95
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Nov 15 19:45:26 2009 -0500
-
-    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
-    
-    ChangeLog filename is known to Automake and requires no further
-    coding in the makefile.
-
-commit 201a1ad998f1f5eefb43f6a0b6a4a59dee7662e6
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Nov 15 18:31:28 2009 -0500
-
-    Makefile.am: INSTALL file is missing or incorrect #24206
-    
-    The standard GNU file on building/installing  tarball is copied
-    using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
-    Add INSTALL target
-
-commit acc2c1191ea96cdecf973139fda57bd8efccb8c7
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Nov 15 18:11:36 2009 -0500
-
-    configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
-    
-    This macro aggregate a number of existing macros that sets commmon
-    X.Org components configuration options. It shields the configuration file from
-    future changes.
-
-commit 26004693388740e3c94dc194348bc56bf9a85f18
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sun Nov 15 13:55:25 2009 -0500
-
-    configure.ac: AM_MAINTAINER_MODE missing #24238
-    
-    This turns off maintainer mode build rules in tarballs.
-    Works in conjunction with autogen.sh --enable-maintainer-mode
-
-commit abdb124781c90394eb5b0e49203b9287b7b48cbc
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date:   Sat Nov 14 18:26:47 2009 -0500
-
-    .gitignore: use common defaults with custom section # 24239
-    
-    Using common defaults will reduce errors and maintenance.
-    Only the very small or inexistent custom section need periodic maintenance
-    when the structure of the component changes. Do not edit defaults.
-
-commit 2f13449c987e3d58555e030f887736d67e2fe62d
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue May 26 17:16:20 2009 -0400
-
-    glproto 1.4.10
-
-commit 25a12ff858d569f990e63d942677f05d301be95e
-Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
-Date:   Tue Jan 27 20:06:28 2009 -0200
-
-    Janitor: Correct make distcheck and dont distribute autogen.sh
-
-commit 660a90502a993f11d883f4f9ddb7314dfe34a0bb
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Mon Sep 22 11:41:04 2008 -0400
-
-    Upgrade GLX Public License 1.0 to FreeB 2.0.
-    
-    According to the press release:
-    
-        Previous SGI contributions to the free and open source community
-        are now available under the new license. These contributions
-        include the SGI® OpenGL® Sample Implementation, the GLX™ API and
-        other GLX extensions.
-    
-        [...]
-    
-        "SGI has been one of the most ardent commercial supporters of free
-        and open source software, so it was important to us that we continue
-        to support the free software development community by releasing our
-        earlier OpenGL-related contributions under this new license," said
-        Steve Neuner, director of Linux, SGI. "This license ensures that all
-        existing user communities will benefit, and their work can proceed
-        unimpeded. Both Mesa and the X.org Project can continue to utilize
-        this code in free software distributions of GNU/Linux. Now more than
-        ever, software previously released by SGI under earlier GLX and SGI
-        Free Software License B is free."
-    
-    "The GLX API" is here read to include the original GLX source release
-    from:
-    
-    http://www.sgi.com/products/software/opensource/glx/download.html
-    ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz
-    
-    which includes glxint.h as included in XFree86, from which our copy
-    is derived.
-
-commit 391a147ccccd2f85526776a7d9639f48f83f976c
-Author: Julien Cristau <jcristau@debian.org>
-Date:   Fri Sep 19 18:59:05 2008 +0200
-
-    Update to SGI FreeB 2.0.
-    
-    Under the terms of version 1.1, "once Covered Code has been published
-    under a particular version of the License, Recipient may, for the
-    duration of the License, continue to use it under the terms of that
-    version, or choose to use such Covered Code under the terms of any
-    subsequent version published by SGI."
-    
-    FreeB 2.0 license refers to "dates of first publication".  They are here
-    taken to be 1991-2000, as noted in the original license text:
-    
-    ** Original Code. The Original Code is: OpenGL Sample Implementation,
-    ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-    ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-    ** Copyright in any portions created by third parties is as indicated
-    ** elsewhere herein.  All Rights Reserved.
-    
-    Official FreeB 2.0 text:
-    
-    http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
-    
-    As always, this code has not been tested for conformance with the OpenGL
-    specification.  OpenGL conformance testing is available from
-    http://khronos.org/ and is required for use of the OpenGL logo in
-    product advertising and promotion.
-
-commit a51078116ff54e9ffad3f3784ec226ad91c62816
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Thu Dec 6 16:39:01 2007 -0500
-
-    Replace static ChangeLog with dist-hook to generate from git log
-
-commit 6430de9a12b0430be8a635976038f8769d798bef
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Fri Oct 12 19:03:25 2007 -0400
-
-    Bump to 1.4.9 so we can depend on SGI pbuffer structs.
-
-commit e89ed37e56e2dec95fd43778f3a72bafca1d56e3
-Merge: 2adf876 750a853
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Mon Sep 3 06:17:08 2007 -0400
-
-    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/glproto
-
-commit 2adf876f7bb078b86f7e967d3115e25cfc9c705d
-Author: James Cloos <cloos@jhcloos.com>
-Date:   Mon Sep 3 05:54:04 2007 -0400
-
-    Add *~ to .gitignore to skip patch/emacs droppings
-
-commit 750a853fa546a004deae7987eb645b2c4c88ccdc
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Thu Aug 23 21:37:53 2007 -0400
-
-    Add proto structs for GLX_SGIX_pbuffer.
-
-commit e37b97e0392affea38cdddbcc279e6a69b7a13bd
-Author: Ian Romanick <idr@us.ibm.com>
-Date:   Thu Sep 14 14:17:57 2006 -0700
-
-    Use correct opcodes for GLX_EXT_texture_from_pixmap.
-
-commit 786f411fedfcd556399437e11c5a401758da193b
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Fri Jul 14 18:56:16 2006 -0700
-
-    renamed: .cvsignore -> .gitignore
-
-commit cbabd9f7189d2445a6db90b648b1eec7de30a435
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Thu Jun 29 03:14:11 2006 +0000
-
-    There are 13 GLX errors.
-
-commit aa8b3bb05bf390feb6389a4ef94b26fc394c9fe1
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Mon May 1 22:23:33 2006 +0000
-
-    Bump to 1.4.7
-
-commit 2864cebfcbf8e52e1245590724894a6167179b2f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Fri Mar 17 00:43:28 2006 +0000
-
-    Bump to 1.4.6 for FBO opcodes.
-
-commit 60b85349042a1a44bdc79ef2b7bb3326f242aa83
-Author: David Reveman <c99drn@cs.umu.se>
-Date:   Fri Mar 10 00:11:25 2006 +0000
-
-    Fix typo
-
-commit 90980329b2a3e2466176cd3a87119a6939418eae
-Author: Brian Paul <brian.paul@tungstengraphics.com>
-Date:   Fri Feb 24 22:12:33 2006 +0000
-
-    added GL_EXT_framebuffer_object opcodes for Dave Reveman
-
-commit 1086f49267a8c469384550e57e108d8eb957332c
-Author: Brian Paul <brian.paul@tungstengraphics.com>
-Date:   Fri Feb 24 15:43:51 2006 +0000
-
-    added GL_EXT_framebuffer_object opcodes (Dave Reveman)
-
-commit 709e3db8065c808483b81e53a1779ceec3dac775
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Mon Feb 20 15:43:44 2006 +0000
-
-    Add GLX_FRONT_LEFT_EXT. Bump to 1.4.5.
-
-commit 29f219c9dfdbd9c38b4987a3b8c14c72e34a3ce3
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Tue Feb 14 19:44:32 2006 +0000
-
-    Bump to 1.4.4
-
-commit 25812fd3853ad7c4b3fa1dc05f6afef04ec9f1b2
-Author: Zack Rusin <zack@kde.org>
-Date:   Tue Feb 7 22:17:29 2006 +0000
-
-    texture_from_pixmap defines
-
-commit 5ca023367e697051202fdc2d0bb2e4742615ad72
-Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Dec 21 02:30:07 2005 +0000
-
-    Update package version for X11R7 release.
-
-commit 7d16c0f03b1ebb875b7e421869fb9b06f4cd1cef
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Mon Dec 19 16:32:25 2005 +0000
-
-    Stub COPYING files
-
-commit e6b965749d46c8aa7237bdbb8cc8797b218a89be
-Author: Kevin E Martin <kem@kem.org>
-Date:   Thu Dec 15 00:24:37 2005 +0000
-
-    Update package version number for final X11R7 release candidate.
-
-commit 1c07b08a7558f11833586ba9b1315bfab5379791
-Author: Donnie Berkholz <spyderous@gentoo.org>
-Date:   Fri Oct 14 05:09:12 2005 +0000
-
-    Bump version to 1.4.1, so xserver can depend on newer version and not die.
-
-commit a30aedabe968efbbb122644a34385480d37630ad
-Author: Kevin E Martin <kem@kem.org>
-Date:   Thu Oct 6 02:51:57 2005 +0000
-
-    Revert changes that duplicated GLX_SGIX_swap_barrier protocol requests and
-        replies
-
-commit 0526e5aa281ce0fedb3362e7e64f79d52312d7c0
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Wed Oct 5 22:39:41 2005 +0000
-
-    Bug #3652: Server-side GLX support for GLX_SGIX_swap_barrier and
-        GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI)
-
-commit bde8b196d88e2fe69fc232cca829da4d37ab109c
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Wed Sep 21 00:16:29 2005 +0000
-
-    Bug #4036: glx.h and glu.h don't belong in glproto.
-
-commit 7bfaeebc4da09552cb4fd24061244717b6605975
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Tue Aug 2 19:19:38 2005 +0000
-
-    Add basic .cvsignore files for proto modules.
-
-commit cdd2a9866b6baa9b8a0d93977d9142dad9e17fb0
-Author: Kevin E Martin <kem@kem.org>
-Date:   Fri Jul 29 21:22:55 2005 +0000
-
-    Various changes preparing packages for RC0:
-    - Verify and update package version numbers as needed
-    - Implement versioning scheme
-    - Change bug address to point to bugzilla bug entry form
-    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
-        reenable it)
-    - Fix makedepend to use pkgconfig and pass distcheck
-    - Update build script to build macros first
-    - Update modular Xorg version
-
-commit d207f9ce6def32a5a09e71a5aa186f95c9a66dd8
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date:   Thu Jul 14 00:28:45 2005 +0000
-
-    - Add build system for xf86-video-ati
-    - Add build system for xserver/xorg/hw/xfree86/dri
-    - Add glcore.h to symlink.sh
-    - Symlink.sh: add some more DRI files, symlink glcore.h from
-        extras/Mesa/include/GL/internal to proto/GL
-    - proto/GL/Makefile.am: install glcore.h
-    - xf86-video-ark: s/module-dir/xorg-module-dir/
-
-commit 9f99b048a1b3292f262f95a6807983069ee62eb7
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Fri Jul 8 17:00:34 2005 +0000
-
-    GLX headers have to go under a directory named GL/
-
-commit 694d4df483a69877fb106437e948a2394bd3eb08
-Author: Daniel Stone <daniel@fooishbar.org>
-Date:   Sat May 21 04:07:44 2005 +0000
-
-    Set version to 1.4.
-
-commit 11e397f4e2b4c0f5a8ffa72593cb392f61f42174
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Thu May 19 00:22:39 2005 +0000
-
-    revert last change, didn't do right thing at all, sorry for the noise
-
-commit e65f2e93678607e1230e623284ab5a8cefa53522
-Author: Adam Jackson <ajax@nwnk.net>
-Date:   Thu May 19 00:10:18 2005 +0000
-
-    Require automake 1.7 in AM_INIT_AUTOMAKE
-
-commit 8daef2b6035761994584be1772f2bd8fc4afe99b
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date:   Mon May 9 18:20:04 2005 +0000
-
-    Change all the protonames from <extension>Ext to <extension>Proto.
-
-commit af91f8a13dd7980d4964afe9f0dabbabe27847d9
-Author: Kevin E Martin <kem@kem.org>
-Date:   Fri May 6 01:46:30 2005 +0000
-
-    Initial build system files for proto module.
-
-commit 67f6a40fc6117988c1d5a13dbb6f5e1c523776a7
-Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Jun 30 20:06:52 2004 +0000
-
-    Add Distributed Multihead X (DMX) support
-
-commit ae53d8689c0257a8b8bdcc71e977344bc35c6968
-Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
-Date:   Mon Jun 21 13:35:05 2004 +0000
-
-    Bug 782: Merge native OpenGL for Windows from CYGWIN branch
-
-commit 290d3f948d650f64ef70fdcce62faf4b9c19af27
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Wed Jun 16 09:47:09 2004 +0000
-
-    Merge DRI-trunk-20040613 changes to include/GL
-
-commit 88f719bedec749a400b3e2d883027ced0f6a3f5e
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Wed Jun 16 09:25:12 2004 +0000
-
-    DRI trunk-20040613 import
-
-commit c301cc2aea606d19d94d5ff26038fc078d2d5632
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Wed Jun 16 09:21:44 2004 +0000
-
-    DRI XFree86-4_3_99_12-merge import
-
-commit 4f0d4529d6ec57104a49b33624191394495d895a
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Wed Jun 16 09:16:34 2004 +0000
-
-    Mesa 6.1 20040613 import
-
-commit e2bc1e26498f48c9fb478495bef54852e59a1ae5
-Author: Eric Anholt <anholt@freebsd.org>
-Date:   Wed Jun 16 09:16:34 2004 +0000
-
-    Initial revision
-
-commit 9ae18a0dc799c4f3cebe0879dda2aac126b47e4a
-Author: Egbert Eich <eich@suse.de>
-Date:   Fri Apr 23 18:43:06 2004 +0000
-
-    Merging XORG-CURRENT into trunk
-
-commit 0e26563ec9899895c193c7374632021d98927472
-Author: Egbert Eich <eich@suse.de>
-Date:   Sun Mar 14 08:31:35 2004 +0000
-
-    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
-
-commit 0adef4ac4efdd21653890d17ab2358ea2fa30167
-Author: Egbert Eich <eich@suse.de>
-Date:   Wed Mar 3 12:10:53 2004 +0000
-
-    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
-
-commit d3f4ee16d49ffddea4128ffcae7a949ed4581f74
-Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 13:35:11 2004 +0000
-
-    readding XFree86's cvs IDs
-
-commit 7e6e16483e09178df27674f6d05a87e9c2bf9df6
-Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 09:22:24 2004 +0000
-
-    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
-
-commit 815fc7150094098c1a749f70fada3c6e62a13a95
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Mon Feb 23 20:34:29 2004 +0000
-
-    Import most of XFree86 4.4RC3. This import excludes files which have the
-        new license. If we want to, later we can import 4.4RC3 again and pick
-        up the files that have the new license, but for now the vendor branch
-        is "pure."
-
-commit 556ac2703ceaaaa4a14e4aaba6ac31496a3ccc06
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Tue Nov 25 19:28:02 2003 +0000
-
-    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
-
-commit a41f4589db4b9638a73963c9dd65618814b3bd73
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 16:48:42 2003 +0000
-
-    XFree86 4.3.0.1
-
-commit ba28c09e114061f441034b7c974581702462ed2d
-Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 16:48:42 2003 +0000
-
-    Initial revision
diff --git a/proto/glproto/INSTALL b/proto/glproto/INSTALL
deleted file mode 100644
index 8b82ade08..000000000
--- a/proto/glproto/INSTALL
+++ /dev/null
@@ -1,291 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/proto/glproto/Makefile b/proto/glproto/Makefile
deleted file mode 100644
index cf5deb849..000000000
--- a/proto/glproto/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:19 matthieu Exp $
-
-HEADERS_SUBDIRS=	GL GL/internal
-HEADERS_GL=		glxint.h glxmd.h glxproto.h glxtokens.h
-HEADERS_GL_internal=	glcore.h
-PKGCONFIG=		glproto.pc
-
-.include <bsd.xorg.mk>
diff --git a/proto/glproto/Makefile.am b/proto/glproto/Makefile.am
deleted file mode 100644
index 40cb57cc6..000000000
--- a/proto/glproto/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-gldir = $(includedir)/GL
-gl_HEADERS = \
-	glxint.h \
-	glxmd.h \
-	glxproto.h \
-	glxtokens.h
-
-glinternaldir = $(includedir)/GL/internal
-glinternal_HEADERS = \
-	glcore.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glproto.pc
-
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
diff --git a/proto/glproto/Makefile.in b/proto/glproto/Makefile.in
deleted file mode 100644
index f5cb60023..000000000
--- a/proto/glproto/Makefile.in
+++ /dev/null
@@ -1,511 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  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@
-
-
-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 = :
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(gl_HEADERS) \
-	$(glinternal_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/glproto.pc.in \
-	$(top_srcdir)/configure COPYING ChangeLog install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(install_sh) -d
-CONFIG_CLEAN_FILES = glproto.pc
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gldir)" \
-	"$(DESTDIR)$(glinternaldir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-glHEADERS_INSTALL = $(INSTALL_HEADER)
-glinternalHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(gl_HEADERS) $(glinternal_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-gldir = $(includedir)/GL
-gl_HEADERS = \
-	glxint.h \
-	glxmd.h \
-	glxproto.h \
-	glxtokens.h
-
-glinternaldir = $(includedir)/GL/internal
-glinternal_HEADERS = \
-	glcore.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = glproto.pc
-EXTRA_DIST = autogen.sh glproto.pc.in
-all: all-am
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-glproto.pc: $(top_builddir)/config.status $(srcdir)/glproto.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-install-glHEADERS: $(gl_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(gldir)" || $(mkdir_p) "$(DESTDIR)$(gldir)"
-	@list='$(gl_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(glHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gldir)/$$f'"; \
-	  $(glHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gldir)/$$f"; \
-	done
-
-uninstall-glHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(gl_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gldir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gldir)/$$f"; \
-	done
-install-glinternalHEADERS: $(glinternal_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(glinternaldir)" || $(mkdir_p) "$(DESTDIR)$(glinternaldir)"
-	@list='$(glinternal_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(glinternalHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(glinternaldir)/$$f'"; \
-	  $(glinternalHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(glinternaldir)/$$f"; \
-	done
-
-uninstall-glinternalHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glinternal_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(glinternaldir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(glinternaldir)/$$f"; \
-	done
-
-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: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	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; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	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; }'`; \
-	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
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(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"; \
-	    $(mkdir_p) "$(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
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | 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
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	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 ../.. && umask 077 && mkdir "$$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 \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${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 $(DATA) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gldir)" "$(DESTDIR)$(glinternaldir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-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:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || 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-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-glHEADERS install-glinternalHEADERS \
-	install-pkgconfigDATA
-
-install-exec-am:
-
-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 -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-glHEADERS uninstall-glinternalHEADERS \
-	uninstall-info-am uninstall-pkgconfigDATA
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-glHEADERS install-glinternalHEADERS \
-	install-info install-info-am install-man install-pkgconfigDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-glHEADERS uninstall-glinternalHEADERS \
-	uninstall-info-am uninstall-pkgconfigDATA
-
-# 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/proto/glproto/README b/proto/glproto/README
deleted file mode 100644
index 16c59cb3d..000000000
--- a/proto/glproto/README
+++ /dev/null
@@ -1,30 +0,0 @@
-			OpenGL Extension to the X Window System
-
-This extension defines a protocol for the client to send 3D rendering
-commands to the X server.
-
-Extension name: GLX
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/proto/glproto
-
-        http://cgit.freedesktop.org/xorg/proto/glproto
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
diff --git a/proto/glproto/aclocal.m4 b/proto/glproto/aclocal.m4
deleted file mode 100644
index 09b839a03..000000000
--- a/proto/glproto/aclocal.m4
+++ /dev/null
@@ -1,551 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  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.
-
-# Copyright (C) 2002, 2003, 2005  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.
-
-# 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.9"])
-
-# 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.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  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.
-
-# 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.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# 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.
-
-# serial 12
-
-# 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.
-
-# 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_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-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_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# 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([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_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 (C) 2001, 2003, 2005  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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-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)])
-
-# Copyright (C) 2003, 2005  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.
-
-# serial 2
-
-# 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])])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# 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.
-
-# serial 4
-
-# 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
-])
-
-# Copyright (C) 2003, 2004, 2005  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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(SHELL) $(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  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.
-
-# serial 3
-
-# _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])])
-
-# Copyright (C) 2001, 2003, 2005  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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# 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])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  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.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-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.  Also
-# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
- 
-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
-	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
-		[`echo $PACKAGE_VERSION | cut -d . -f 1`],
-		[Major version of this package])
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
-	if test "x$PVM" = "x"; then
-		PVM="0"
-	fi
-	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
-		[$PVM],
-		[Minor version of this package])
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
-	if test "x$PVP" = "x"; then
-		PVP="0"
-	fi
-	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
-		[$PVP],
-		[Patch version of this package])
-])
-
diff --git a/proto/glproto/compile b/proto/glproto/compile
deleted file mode 100644
index 531136b06..000000000
--- a/proto/glproto/compile
+++ /dev/null
@@ -1,347 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.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, 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, see <http://www.gnu.org/licenses/>.
-
-# 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.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/proto/glproto/configure b/proto/glproto/configure
deleted file mode 100644
index 1e7394c2e..000000000
--- a/proto/glproto/configure
+++ /dev/null
@@ -1,2604 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GLProto 1.4.8.
-#
-# 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='GLProto'
-PACKAGE_TARNAME='glproto'
-PACKAGE_VERSION='1.4.8'
-PACKAGE_STRING='GLProto 1.4.8'
-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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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
-
-#
-# 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 GLProto 1.4.8 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
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of GLProto 1.4.8:";;
-   esac
-  cat <<\_ACEOF
-
-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
-
-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
-GLProto configure 1.4.8
-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 GLProto $as_me 1.4.8, 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.9"
-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'
-
-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
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(SHELL) $(install_sh) -d'
-  fi
-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='glproto'
- VERSION='1.4.8'
-
-
-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"}
-
-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.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-
-
-# 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
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
-_ACEOF
-
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
-	if test "x$PVM" = "x"; then
-		PVM="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
-_ACEOF
-
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
-	if test "x$PVP" = "x"; then
-		PVP="0"
-	fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
-_ACEOF
-
-
-
-                    ac_config_files="$ac_config_files Makefile glproto.pc"
-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
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-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
-
-
-
-: ${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 GLProto $as_me 1.4.8, 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
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-GLProto config.status 1.4.8
-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
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "glproto.pc" ) CONFIG_FILES="$CONFIG_FILES glproto.pc" ;;
-  *) { { 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
-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,@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,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;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
-
-{ (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/proto/glproto/configure.ac b/proto/glproto/configure.ac
deleted file mode 100644
index 7b0c60899..000000000
--- a/proto/glproto/configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
-
-AC_CONFIG_FILES([Makefile
-           glproto.pc])
-AC_OUTPUT
diff --git a/proto/glproto/glcore.h b/proto/glproto/glcore.h
deleted file mode 100644
index 547b11137..000000000
--- a/proto/glproto/glcore.h
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifndef __gl_core_h_
-#define __gl_core_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#if !defined(_WIN32_WCE)
-#include <sys/types.h>
-#endif
-
-#define GL_CORE_SGI  1
-#define GL_CORE_MESA 2
-#define GL_CORE_APPLE 4
-#define GL_CORE_WINDOWS 8
-
-typedef struct __GLcontextRec __GLcontext;
-
-/*
-** This file defines the interface between the GL core and the surrounding
-** "operating system" that supports it (currently the GLX or WGL extensions).
-**
-** Members (data and function pointers) are documented as imported or
-** exported according to how they are used by the core rendering functions.
-** Imported members are initialized by the "operating system" and used by
-** the core functions.  Exported members are initialized by the core functions
-** and used by the "operating system".
-*/
-
-/**
- * Mode and limit information for a context.  This information is
- * kept around in the context so that values can be used during
- * command execution, and for returning information about the
- * context to the application.
- * 
- * Instances of this structure are shared by the driver and the loader.  To
- * maintain binary compatability, new fields \b must be added only to the
- * end of the structure.
- * 
- * \sa _gl_context_modes_create
- */
-typedef struct __GLcontextModesRec {
-    struct __GLcontextModesRec * next;
-
-    GLboolean rgbMode;
-    GLboolean floatMode;
-    GLboolean colorIndexMode;
-    GLuint doubleBufferMode;
-    GLuint stereoMode;
-
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
-
-    GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
-    GLuint redMask, greenMask, blueMask, alphaMask;
-    GLint rgbBits;		/* total bits for rgb */
-    GLint indexBits;		/* total bits for colorindex */
-
-    GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
-    GLint depthBits;
-    GLint stencilBits;
-
-    GLint numAuxBuffers;
-
-    GLint level;
-
-    GLint pixmapMode;
-
-    /* GLX */
-    GLint visualID;
-    GLint visualType;     /**< One of the GLX X visual types. (i.e., 
-			   * \c GLX_TRUE_COLOR, etc.)
-			   */
-
-    /* EXT_visual_rating / GLX 1.2 */
-    GLint visualRating;
-
-    /* EXT_visual_info / GLX 1.2 */
-    GLint transparentPixel;
-				/*    colors are floats scaled to ints */
-    GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;
-    GLint transparentIndex;
-
-    /* ARB_multisample / SGIS_multisample */
-    GLint sampleBuffers;
-    GLint samples;
-
-    /* SGIX_fbconfig / GLX 1.3 */
-    GLint drawableType;
-    GLint renderType;
-    GLint xRenderable;
-    GLint fbconfigID;
-
-    /* SGIX_pbuffer / GLX 1.3 */
-    GLint maxPbufferWidth;
-    GLint maxPbufferHeight;
-    GLint maxPbufferPixels;
-    GLint optimalPbufferWidth;   /* Only for SGIX_pbuffer. */
-    GLint optimalPbufferHeight;  /* Only for SGIX_pbuffer. */
-
-    /* SGIX_visual_select_group */
-    GLint visualSelectGroup;
-
-    /* OML_swap_method */
-    GLint swapMethod;
-
-    GLint screen;
-
-    /* EXT_texture_from_pixmap */
-    GLint bindToTextureRgb;
-    GLint bindToTextureRgba;
-    GLint bindToMipmapTexture;
-    GLint bindToTextureTargets;
-    GLint yInverted;
-} __GLcontextModes;
-
-/* Several fields of __GLcontextModes can take these as values.  Since
- * GLX header files may not be available everywhere they need to be used,
- * redefine them here.
- */
-#define GLX_NONE                           0x8000
-#define GLX_SLOW_CONFIG                    0x8001
-#define GLX_TRUE_COLOR                     0x8002
-#define GLX_DIRECT_COLOR                   0x8003
-#define GLX_PSEUDO_COLOR                   0x8004
-#define GLX_STATIC_COLOR                   0x8005
-#define GLX_GRAY_SCALE                     0x8006
-#define GLX_STATIC_GRAY                    0x8007
-#define GLX_TRANSPARENT_RGB                0x8008
-#define GLX_TRANSPARENT_INDEX              0x8009
-#define GLX_NON_CONFORMANT_CONFIG          0x800D
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-
-#define GLX_DONT_CARE                      0xFFFFFFFF
-
-#define GLX_RGBA_BIT                       0x00000001
-#define GLX_COLOR_INDEX_BIT                0x00000002
-#define GLX_WINDOW_BIT                     0x00000001
-#define GLX_PIXMAP_BIT                     0x00000002
-#define GLX_PBUFFER_BIT                    0x00000004
-
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-
-#endif /* __gl_core_h_ */
diff --git a/proto/glproto/glproto.pc.in b/proto/glproto/glproto.pc.in
deleted file mode 100644
index bd275d8bd..000000000
--- a/proto/glproto/glproto.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
- 
-Name: GLProto
-Description: GL extension headers
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}
diff --git a/proto/glproto/glxint.h b/proto/glproto/glxint.h
deleted file mode 100644
index 9da4910d5..000000000
--- a/proto/glproto/glxint.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef __GLX_glxint_h__
-#define __GLX_glxint_h__
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#include <X11/X.h>
-#include <X11/Xdefs.h>
-#include "GL/gl.h"
-
-typedef struct __GLXvisualConfigRec __GLXvisualConfig;
-typedef struct __GLXFBConfigRec __GLXFBConfig;
-
-struct __GLXvisualConfigRec {
-    VisualID vid;
-    int class;
-    Bool rgba;
-    int redSize, greenSize, blueSize, alphaSize;
-    unsigned long redMask, greenMask, blueMask, alphaMask;
-    int accumRedSize, accumGreenSize, accumBlueSize, accumAlphaSize;
-    Bool doubleBuffer;
-    Bool stereo;
-    int bufferSize;
-    int depthSize;
-    int stencilSize;
-    int auxBuffers;
-    int level;
-    /* Start of Extended Visual Properties */
-    int visualRating;		/* visual_rating extension */
-    int transparentPixel;	/* visual_info extension */
-				/*    colors are floats scaled to ints */
-    int transparentRed, transparentGreen, transparentBlue, transparentAlpha;
-    int transparentIndex;
-    int multiSampleSize;
-    int nMultiSampleBuffers;
-    int visualSelectGroup;
-};
-
-#define __GLX_MIN_CONFIG_PROPS	18
-#define __GLX_MAX_CONFIG_PROPS	500
-
-#define __GLX_EXT_CONFIG_PROPS 	10
-
-/*
-** Since we send all non-core visual properties as token, value pairs,
-** we require 2 words across the wire. In order to maintain backwards
-** compatibility, we need to send the total number of words that the
-** VisualConfigs are sent back in so old libraries can simply "ignore"
-** the new properties. 
-*/
-#define __GLX_TOTAL_CONFIG       (__GLX_MIN_CONFIG_PROPS +      \
-                                    2 * __GLX_EXT_CONFIG_PROPS)
-
-struct __GLXFBConfigRec {
-    int visualType;
-    int transparentType;
-                                /*    colors are floats scaled to ints */
-    int transparentRed, transparentGreen, transparentBlue, transparentAlpha;
-    int transparentIndex;
-
-    int visualCaveat;
-
-    int associatedVisualId;
-    int screen;
-
-    int drawableType;
-    int renderType;
-
-    int maxPbufferWidth, maxPbufferHeight, maxPbufferPixels;
-    int optimalPbufferWidth, optimalPbufferHeight;  /* for SGIX_pbuffer */
-
-    int visualSelectGroup;	/* visuals grouped by select priority */
-
-    unsigned int id;          
-
-    GLboolean rgbMode;
-    GLboolean colorIndexMode;
-    GLboolean doubleBufferMode;
-    GLboolean stereoMode;
-    GLboolean haveAccumBuffer;
-    GLboolean haveDepthBuffer;
-    GLboolean haveStencilBuffer;
-
-    /* The number of bits present in various buffers */
-    GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
-    GLint depthBits;
-    GLint stencilBits;
-    GLint indexBits;
-    GLint redBits, greenBits, blueBits, alphaBits;
-    GLuint redMask, greenMask, blueMask, alphaMask;
-
-    GLuint multiSampleSize;     /* Number of samples per pixel (0 if no ms) */
-
-    GLuint nMultiSampleBuffers; /* Number of availble ms buffers */
-    GLint maxAuxBuffers;
-
-    /* frame buffer level */
-    GLint level;
-
-    /* color ranges (for SGI_color_range) */
-    GLboolean extendedRange;
-    GLdouble minRed, maxRed;
-    GLdouble minGreen, maxGreen;
-    GLdouble minBlue, maxBlue;
-    GLdouble minAlpha, maxAlpha;
-};
-
-#define __GLX_TOTAL_FBCONFIG_PROPS	 35
-
-#endif /* !__GLX_glxint_h__ */
diff --git a/proto/glproto/glxmd.h b/proto/glproto/glxmd.h
deleted file mode 100644
index 96c07dbd0..000000000
--- a/proto/glproto/glxmd.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _GLX_glxmd_h_
-#define _GLX_glxmd_h_
-
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-/*
-** Machine dependent declarations.
-*/
-
-/*
-** Define floating point wire types.  These are in IEEE format on the wire.
-*/
-typedef float FLOAT32;
-typedef double FLOAT64;
-
-/*
-** Like B32, but this is used to store floats in a request.
-**
-** NOTE: Machines that have a native 32-bit IEEE float can define this as 
-**       nothing.  Machines that don't might mimic the float with an integer,
-**       and then define this to :32.
-*/
-#define F32
-
-#endif /* _GLX_glxmd_h_ */
diff --git a/proto/glproto/glxproto.h b/proto/glproto/glxproto.h
deleted file mode 100644
index b50adc2c8..000000000
--- a/proto/glproto/glxproto.h
+++ /dev/null
@@ -1,2722 +0,0 @@
-#ifndef _GLX_glxproto_h_
-#define _GLX_glxproto_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#include <GL/glxmd.h>
-
-/*****************************************************************************/
-
-/*
-** Errrors.
-*/
-#define GLXBadContext		0
-#define GLXBadContextState	1
-#define GLXBadDrawable		2
-#define GLXBadPixmap		3
-#define GLXBadContextTag	4
-#define GLXBadCurrentWindow	5
-#define GLXBadRenderRequest	6
-#define GLXBadLargeRequest	7
-#define GLXUnsupportedPrivateRequest	8
-#define GLXBadFBConfig		9
-#define GLXBadPbuffer		10
-#define GLXBadCurrentDrawable	11
-#define GLXBadWindow		12
-#define GLXBadProfileARB        13
-
-#define __GLX_NUMBER_ERRORS 14
-
-/*
-** Events.
-** __GLX_NUMBER_EVENTS is set to 17 to account for the BufferClobberSGIX
-**  event - this helps initialization if the server supports the pbuffer
-**  extension and the client doesn't.
-*/
-#define GLX_PbufferClobber	0
-#define GLX_BufferSwapComplete	1
-
-#define __GLX_NUMBER_EVENTS 17
-
-#define GLX_EXTENSION_NAME	"GLX"
-#define GLX_EXTENSION_ALIAS	"SGI-GLX"
-
-#define __GLX_MAX_CONTEXT_PROPS 3
-
-#ifndef GLX_VENDOR
-#define GLX_VENDOR		0x1
-#endif
-#ifndef GLX_VERSION
-#define GLX_VERSION		0x2
-#endif
-#ifndef GLX_EXTENSIONS
-#define GLX_EXTENSIONS		0x3
-#endif
-
-/*****************************************************************************/
-
-/*
-** For the structure definitions in this file, we must redefine these types in
-** terms of Xmd.h types, which may include bitfields.  All of these are
-** undef'ed at the end of this file, restoring the definitions in glx.h.
-*/
-#define GLXContextID CARD32
-#define GLXPixmap CARD32
-#define GLXDrawable CARD32
-#define GLXPbuffer CARD32
-#define GLXWindow CARD32
-#define GLXFBConfigID CARD32
-#define GLXFBConfigIDSGIX CARD32
-#define GLXPbufferSGIX CARD32
-
-/*
-** ContextTag is not exposed to the API.
-*/
-typedef CARD32 GLXContextTag;
-
-/*****************************************************************************/
-
-/*
-** Sizes of basic wire types.
-*/
-#define __GLX_SIZE_INT8		1
-#define __GLX_SIZE_INT16	2
-#define __GLX_SIZE_INT32	4
-#define __GLX_SIZE_CARD8	1
-#define __GLX_SIZE_CARD16	2
-#define __GLX_SIZE_CARD32	4
-#define __GLX_SIZE_FLOAT32	4
-#define __GLX_SIZE_FLOAT64	8
-
-/*****************************************************************************/
-
-/* Requests */
-
-/*
-** Render command request.  A bunch of rendering commands are packed into
-** a single X extension request.
-*/
-typedef struct GLXRender {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-} xGLXRenderReq;
-#define sz_xGLXRenderReq 8
-
-/*
-** The maximum size that a GLXRender command can be.  The value must fit
-** in 16 bits and should be a multiple of 4.
-*/
-#define __GLX_MAX_RENDER_CMD_SIZE	64000
-
-/*
-** Large render command request.  A single large rendering command
-** is output in multiple X extension requests.	The first packet
-** contains an opcode dependent header (see below) that describes
-** the data that follows.
-*/
-typedef struct GLXRenderLarge {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-    CARD16	requestNumber B16;
-    CARD16	requestTotal B16;
-    CARD32	dataBytes B32;
-} xGLXRenderLargeReq;
-#define sz_xGLXRenderLargeReq 16
-
-/*
-** GLX single request.	Commands that go over as single GLX protocol
-** requests use this structure.  The glxCode will be one of the X_GLsop
-** opcodes.
-*/
-typedef struct GLXSingle {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-} xGLXSingleReq;
-#define sz_xGLXSingleReq 8
-
-/*
-** glXQueryVersion request
-*/
-typedef struct GLXQueryVersion {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	majorVersion B32;
-    CARD32	minorVersion B32;
-} xGLXQueryVersionReq;
-#define sz_xGLXQueryVersionReq 12
-
-/*
-** glXIsDirect request
-*/
-typedef struct GLXIsDirect {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID context B32;
-} xGLXIsDirectReq;
-#define sz_xGLXIsDirectReq 8
-
-/*
-** glXCreateContext request
-*/
-typedef struct GLXCreateContext {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID context B32;
-    CARD32	visual B32;
-    CARD32	screen B32;
-    GLXContextID shareList B32;
-    BOOL	isDirect;
-    CARD8	reserved1;
-    CARD16	reserved2 B16;
-} xGLXCreateContextReq;
-#define sz_xGLXCreateContextReq 24
-
-/*
-** glXDestroyContext request
-*/
-typedef struct GLXDestroyContext {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID context B32;
-} xGLXDestroyContextReq;
-#define sz_xGLXDestroyContextReq 8
-
-/*
-** glXMakeCurrent request
-*/
-typedef struct GLXMakeCurrent {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXDrawable drawable B32;
-    GLXContextID context B32;
-    GLXContextTag oldContextTag B32;
-} xGLXMakeCurrentReq;
-#define sz_xGLXMakeCurrentReq 16
-
-/*
-** glXWaitGL request
-*/
-typedef struct GLXWaitGL {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-} xGLXWaitGLReq;
-#define sz_xGLXWaitGLReq 8
-
-/*
-** glXWaitX request
-*/
-typedef struct GLXWaitX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-} xGLXWaitXReq;
-#define sz_xGLXWaitXReq 8
-
-/*
-** glXCopyContext request
-*/
-typedef struct GLXCopyContext {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID source B32;
-    GLXContextID dest B32;
-    CARD32	mask B32;
-    GLXContextTag contextTag B32;
-} xGLXCopyContextReq;
-#define sz_xGLXCopyContextReq 20
-
-/*
-** glXSwapBuffers request
-*/
-typedef struct GLXSwapBuffers {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-    GLXDrawable drawable B32;
-} xGLXSwapBuffersReq;
-#define sz_xGLXSwapBuffersReq 12
-
-/*
-** glXUseXFont request
-*/
-typedef struct GLXUseXFont {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag contextTag B32;
-    CARD32	font B32;
-    CARD32	first B32;
-    CARD32	count B32;
-    CARD32	listBase B32;
-} xGLXUseXFontReq;
-#define sz_xGLXUseXFontReq 24
-
-/*
-** glXCreateGLXPixmap request
-*/
-typedef struct GLXCreateGLXPixmap {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	visual B32;
-    CARD32	pixmap B32;
-    GLXPixmap	glxpixmap B32;
-} xGLXCreateGLXPixmapReq;
-#define sz_xGLXCreateGLXPixmapReq 20
-
-/*
-** glXDestroyGLXPixmap request
-*/
-typedef struct GLXDestroyGLXPixmap {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXPixmap	glxpixmap B32;
-} xGLXDestroyGLXPixmapReq;
-#define sz_xGLXDestroyGLXPixmapReq 8
-
-/*
-** glXGetVisualConfigs request
-*/
-typedef struct GLXGetVisualConfigs {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xGLXGetVisualConfigsReq;
-#define sz_xGLXGetVisualConfigsReq 8
-
-/*
-** glXVendorPrivate request.
-*/
-typedef struct GLXVendorPrivate {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    GLXContextTag contextTag B32;
-    /*
-    ** More data may follow; this is just the header.
-    */
-} xGLXVendorPrivateReq;
-#define sz_xGLXVendorPrivateReq 12
-
-/*
-** glXVendorPrivateWithReply request
-*/
-typedef struct GLXVendorPrivateWithReply {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    GLXContextTag contextTag B32;
-    /*
-    ** More data may follow; this is just the header.
-    */
-} xGLXVendorPrivateWithReplyReq;
-#define sz_xGLXVendorPrivateWithReplyReq 12
-
-/*
-** glXQueryExtensionsString request
-*/
-typedef struct GLXQueryExtensionsString {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xGLXQueryExtensionsStringReq;
-#define sz_xGLXQueryExtensionsStringReq 8
-
-/*
-** glXQueryServerString request
-*/
-typedef struct GLXQueryServerString {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen	B32;
-    CARD32	name B32;
-} xGLXQueryServerStringReq;
-#define sz_xGLXQueryServerStringReq 12
-
-/*
-** glXClientInfo request
-*/
-typedef struct GLXClientInfo {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	major B32;
-    CARD32	minor B32;
-    CARD32	numbytes B32;
-} xGLXClientInfoReq;
-#define sz_xGLXClientInfoReq 16
-
-/*** Start of GLX 1.3 requests */
-
-/*
-** glXGetFBConfigs request
-*/
-typedef struct GLXGetFBConfigs {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-} xGLXGetFBConfigsReq;
-#define sz_xGLXGetFBConfigsReq 8
-
-/*
-** glXCreatePixmap request
-*/
-typedef struct GLXCreatePixmap {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-    GLXFBConfigID fbconfig B32;
-    CARD32	pixmap B32;
-    GLXPixmap	glxpixmap B32;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXCreatePixmapReq;
-#define sz_xGLXCreatePixmapReq 24
-
-/*
-** glXDestroyPixmap request
-*/
-typedef struct GLXDestroyPixmap {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXPixmap	glxpixmap B32;
-} xGLXDestroyPixmapReq;
-#define sz_xGLXDestroyPixmapReq 8
-
-/*
-** glXCreateNewContext request
-*/
-typedef struct GLXCreateNewContext {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID context B32;
-    GLXFBConfigID fbconfig B32;
-    CARD32	screen B32;
-    CARD32	renderType;
-    GLXContextID shareList B32;
-    BOOL	isDirect;
-    CARD8	reserved1;
-    CARD16	reserved2 B16;
-} xGLXCreateNewContextReq;
-#define sz_xGLXCreateNewContextReq 28
-
-/*
-** glXQueryContext request
-*/
-typedef struct GLXQueryContext {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID context B32;
-} xGLXQueryContextReq;
-#define sz_xGLXQueryContextReq 8
-
-/*
-** glXMakeContextCurrent request
-*/
-typedef struct GLXMakeContextCurrent {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextTag oldContextTag B32;
-    GLXDrawable drawable B32;
-    GLXDrawable readdrawable B32;
-    GLXContextID context B32;
-} xGLXMakeContextCurrentReq;
-#define sz_xGLXMakeContextCurrentReq 20
-
-/*
-** glXCreatePbuffer request
-*/
-typedef struct GLXCreatePbuffer {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-    GLXFBConfigID fbconfig B32;
-    GLXPbuffer	pbuffer B32;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXCreatePbufferReq;
-#define sz_xGLXCreatePbufferReq 20
-
-/*
-** glXDestroyPbuffer request
-*/
-typedef struct GLXDestroyPbuffer {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXPbuffer	pbuffer B32;
-} xGLXDestroyPbufferReq;
-#define sz_xGLXDestroyPbufferReq 8
-
-/*
-** glXGetDrawableAttributes request
-*/
-typedef struct GLXGetDrawableAttributes {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXDrawable drawable B32;
-} xGLXGetDrawableAttributesReq;
-#define sz_xGLXGetDrawableAttributesReq 8
-
-/*
-** glXChangeDrawableAttributes request
-*/
-typedef struct GLXChangeDrawableAttributes {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXDrawable drawable B32;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXChangeDrawableAttributesReq;
-#define sz_xGLXChangeDrawableAttributesReq 12
-
-/*
-** glXCreateWindow request
-*/
-typedef struct GLXCreateWindow {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	screen B32;
-    GLXFBConfigID fbconfig B32;
-    CARD32	window B32;
-    GLXWindow	glxwindow B32;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXCreateWindowReq;
-#define sz_xGLXCreateWindowReq 24
-
-/*
-** glXDestroyWindow request
-*/
-typedef struct GLXDestroyWindow {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXWindow	glxwindow B32;
-} xGLXDestroyWindowReq;
-#define sz_xGLXDestroyWindowReq 8
-
-/* Replies */
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	error B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetErrorReply;
-#define sz_xGLXGetErrorReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    GLXContextTag contextTag B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXMakeCurrentReply;
-#define sz_xGLXMakeCurrentReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXReadPixelsReply;
-#define sz_xGLXReadPixelsReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    CARD32	depth B32;
-    CARD32	pad6 B32;
-} xGLXGetTexImageReply;
-#define sz_xGLXGetTexImageReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetSeparableFilterReply;
-#define sz_xGLXGetSeparableFilterReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetConvolutionFilterReply;
-#define sz_xGLXGetConvolutionFilterReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	width B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetHistogramReply;
-#define sz_xGLXGetHistogramReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetMinmaxReply;
-#define sz_xGLXGetMinmaxReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	retval B32;
-    CARD32	size B32;
-    CARD32	newMode B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXRenderModeReply;
-#define sz_xGLXRenderModeReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	majorVersion B32;
-    CARD32	minorVersion B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryVersionReply;
-#define sz_xGLXQueryVersionReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	numVisuals B32;
-    CARD32	numProps B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetVisualConfigsReply;
-#define sz_xGLXGetVisualConfigsReply 32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    BOOL	isDirect;
-    CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-} xGLXIsDirectReply;
-#define sz_xGLXIsDirectReply	32
-
-/*
-** This reply structure is used for all single replies.  Single replies
-** ship either 1 piece of data or N pieces of data.  In these cases
-** size indicates how much data is to be returned.
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	retval B32;
-    CARD32	size B32;
-    CARD32	pad3 B32;		/* NOTE: may hold a single value */
-    CARD32	pad4 B32;		/* NOTE: may hold half a double */
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXSingleReply;
-#define sz_xGLXSingleReply 32
-
-/*
-** This reply structure is used for all Vendor Private replies. Vendor
-** Private replies can ship up to 24 bytes within the header or can
-** be variable sized, in which case, the reply length field indicates
-** the number of words of data which follow the header.
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	retval B32;
-    CARD32	size B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXVendorPrivReply;
-#define sz_xGLXVendorPrivReply 32
-
-/*
-**  QueryExtensionsStringReply
-**  n indicates the number of bytes to be returned.
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	n B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryExtensionsStringReply;
-#define sz_xGLXQueryExtensionsStringReply 32
-
-/*
-** QueryServerString Reply struct
-** n indicates the number of bytes to be returned.
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	n B32;
-    CARD32	pad3 B32;		/* NOTE: may hold a single value */
-    CARD32	pad4 B32;		/* NOTE: may hold half a double */
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryServerStringReply;
-#define sz_xGLXQueryServerStringReply 32
-
-/*** Start of GLX 1.3 replies */
-
-/*
-** glXGetFBConfigs reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	numFBConfigs B32;
-    CARD32	numAttribs B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetFBConfigsReply;
-#define sz_xGLXGetFBConfigsReply 32
-
-/*
-** glXQueryContext reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	n B32;			/* number of attribute/value pairs */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryContextReply;
-#define sz_xGLXQueryContextReply 32
-
-/*
-** glXMakeContextCurrent reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    GLXContextTag contextTag B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXMakeContextCurrentReply;
-#define sz_xGLXMakeContextCurrentReply 32
-
-/*
-** glXCreateGLXPbuffer reply
-** This is used only in the direct rendering case on SGIs - otherwise
-**  CreateGLXPbuffer has no reply. It is not part of GLX 1.3.
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	success;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXCreateGLXPbufferReply;
-#define sz_xGLXCreateGLXPbufferReply 32
-
-/*
-** glXGetDrawableAttributes reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	numAttribs B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetDrawableAttributesReply;
-#define sz_xGLXGetDrawableAttributesReply 32
-
-/*
-** glXGetColorTable reply
-*/
-typedef struct {
-    BYTE	type;		       /* X_Reply */
-    CARD8	unused;		       /* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	width B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetColorTableReply;
-#define sz_xGLXGetColorTableReply 32
-
-/************************************************************************/
-
-/* GLX extension requests and replies */
-
-/*
-** glXQueryContextInfoEXT request
-*/
-typedef struct GLXQueryContextInfoEXT {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    GLXContextID context B32;
-} xGLXQueryContextInfoEXTReq;
-#define sz_xGLXQueryContextInfoEXTReq 16
-
-/*
-** glXQueryContextInfoEXT reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	n B32;			/* number of attribute/value pairs */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryContextInfoEXTReply;
-#define sz_xGLXQueryContextInfoEXTReply 32
-
-/*
-** glXMakeCurrentReadSGI request
-*/
-typedef struct GLXMakeCurrentReadSGI {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    GLXContextTag oldContextTag B32;
-    GLXDrawable drawable B32;
-    GLXDrawable readable B32;
-    GLXContextID context B32;
-} xGLXMakeCurrentReadSGIReq;
-#define sz_xGLXMakeCurrentReadSGIReq 24
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    GLXContextTag contextTag B32;
-    CARD32	writeVid B32;
-    CARD32	writeType B32;
-    CARD32	readVid B32;
-    CARD32	readType B32;
-    CARD32	pad6 B32;
-} xGLXMakeCurrentReadSGIReply;
-#define sz_xGLXMakeCurrentReadSGIReply 32
-
-/*
-** glXGetFBConfigsSGIX request
-*/
-typedef struct GLXGetFBConfigsSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32	screen B32;
-} xGLXGetFBConfigsSGIXReq;
-#define sz_xGLXGetFBConfigsSGIXReq 16
-
-/*
-** glXCreateContextWithConfigSGIX request
-*/
-
-typedef struct GLXCreateContextWithConfigSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    GLXContextID context B32;
-    GLXFBConfigID fbconfig B32;
-    CARD32	screen B32;
-    CARD32	renderType;
-    GLXContextID shareList B32;
-    BOOL	isDirect;
-    CARD8	reserved1;
-    CARD16	reserved2 B16;
-} xGLXCreateContextWithConfigSGIXReq;
-#define sz_xGLXCreateContextWithConfigSGIXReq 36
-
-/*
-** glXCreatePixmapWithConfigSGIX request
-*/
-
-typedef struct GLXCreateGLXPixmapWithConfigSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32	screen B32;
-    GLXFBConfigID fbconfig B32;
-    CARD32	pixmap B32;
-    GLXPixmap	glxpixmap B32;
-} xGLXCreateGLXPixmapWithConfigSGIXReq;
-#define sz_xGLXCreateGLXPixmapWithConfigSGIXReq 28
-
-/*
-** glXCreateGLXPbufferSGIX request
-*/
-typedef struct GLXCreateGLXPbufferSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32	screen B32;
-    GLXFBConfigID fbconfig B32;
-    GLXPbuffer	pbuffer B32;
-    CARD32	width B32;
-    CARD32	height B32;
-    /* followed by attribute list */
-} xGLXCreateGLXPbufferSGIXReq;
-#define sz_xGLXCreateGLXPbufferSGIXReq 32
-
-/*
-** glXDestroyGLXPbufferSGIX request
-*/
-typedef struct GLXDestroyGLXPbuffer {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    GLXPbuffer	pbuffer B32;
-} xGLXDestroyGLXPbufferSGIXReq;
-#define sz_xGLXDestroyGLXPbufferSGIXReq 16
-
-/*
-** glXChangeDrawableAttributesSGIX request
-*/
-typedef struct GLXChangeDrawableAttributesSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    GLXDrawable drawable B32;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXChangeDrawableAttributesSGIXReq;
-#define sz_xGLXChangeDrawableAttributesSGIXReq 20
-
-/*
-** glXGetDrawableAttributesSGIX request
-*/
-typedef struct GLXGetDrawableAttributesSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32	pad1 B32;   /* unused; corresponds to contextTag in header */
-    GLXDrawable drawable B32;
-} xGLXGetDrawableAttributesSGIXReq;
-#define sz_xGLXGetDrawableAttributesSGIXReq 16
-
-/*
-** glXGetDrawableAttributesSGIX reply
-*/
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	numAttribs B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXGetDrawableAttributesSGIXReply;
-#define sz_xGLXGetDrawableAttributesSGIXReply 32
-
-/*
-** glXJoinSwapGroupSGIX request
-*/
-typedef struct GLXJoinSwapGroupSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32 	unused B32;		/* corresponds to contextTag in hdr */
-    GLXDrawable	drawable B32;
-    GLXDrawable	member B32;
-} xGLXJoinSwapGroupSGIXReq;
-#define sz_xGLXJoinSwapGroupSGIXReq 20
-
-/*
-** glXBindSwapBarrierSGIX request
-*/
-typedef struct GLXBindSwapBarrierSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32 	unused B32;		/* corresponds to contextTag in hdr */
-    GLXDrawable	drawable B32;
-    CARD32	barrier B32;
-} xGLXBindSwapBarrierSGIXReq;
-#define sz_xGLXBindSwapBarrierSGIXReq 20
-
-/*
-** glXQueryMaxSwapBarriersSGIX request
-*/
-typedef struct GLXQueryMaxSwapBarriersSGIX {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	vendorCode B32;		/* vendor-specific opcode */
-    CARD32 	unused B32;		/* corresponds to contextTag in hdr */
-    CARD32	screen B32;
-} xGLXQueryMaxSwapBarriersSGIXReq;
-#define sz_xGLXQueryMaxSwapBarriersSGIXReq 16
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	max B32;
-    CARD32	size B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xGLXQueryMaxSwapBarriersSGIXReply;
-#define sz_xGLXQueryMaxSwapBarriersSGIXReply 32
-
-/*
-** glXQueryHyperpipeNetworkSGIX request
-*/
-typedef struct GLXQueryHyperpipeNetworkSGIX {
-    CARD8       reqType;
-    CARD8       glxCode;
-    CARD16      length B16;
-    CARD32      vendorCode B32;         /* vendor-specific opcode */
-    CARD32      pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32      screen B32;
-} xGLXQueryHyperpipeNetworkSGIXReq;
-#define sz_xGLXQueryHyperpipeNetworkSGIXReq 16
-
-/*
-** glXQueryHyperpipeNetworkSGIX reply
-*/
-typedef struct {
-    BYTE        type;                   /* X_Reply */
-    CARD8       unused;                 /* not used */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      pad1 B32;
-    CARD32      n B32;
-    CARD32      npipes B32;             /* NOTE: may hold a single value */
-    CARD32      pad4 B32;               /* NOTE: may hold half a double */
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xGLXQueryHyperpipeNetworkSGIXReply;
-#define sz_xGLXQueryHyperpipeNetworkSGIXReply 32
-
-/*
-** glXDestroyHyperpipeConfigSGIX request
-*/
-typedef struct GLXDestroyHyperpipeConfigSGIX {
-    CARD8       reqType;
-    CARD8       glxCode;
-    CARD16      length B16;
-    CARD32      vendorCode B32;         /* vendor-specific opcode */
-    CARD32      pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32      screen B32;
-    CARD32      hpId B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-} xGLXDestroyHyperpipeConfigSGIXReq;
-#define sz_xGLXDestroyHyperpipeConfigSGIXReq 32
-
-/*
-** glXDestroyHyperpipeConfigSGIX reply
-*/
-typedef struct {
-    BYTE        type;                   /* X_Reply */
-    CARD8       unused;                 /* not used */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      pad1 B32;
-    CARD32      n B32;
-    CARD32      success B32;            /* NOTE: may hold a single value */
-    CARD32      pad4 B32;               /* NOTE: may hold half a double */
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xGLXDestroyHyperpipeConfigSGIXReply;
-#define sz_xGLXDestroyHyperpipeConfigSGIXReply 32
-
-/*
-** glXQueryHyperpipeConfigSGIX request
-*/
-typedef struct GLXQueryHyperpipeConfigSGIX {
-    CARD8       reqType;
-    CARD8       glxCode;
-    CARD16      length B16;
-    CARD32      vendorCode B32;         /* vendor-specific opcode */
-    CARD32      pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32      screen B32;
-    CARD32      hpId B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-} xGLXQueryHyperpipeConfigSGIXReq;
-#define sz_xGLXQueryHyperpipeConfigSGIXReq 32
-
-/*
-** glXQueryHyperpipeConfigSGIX reply
-*/
-typedef struct {
-    BYTE        type;                   /* X_Reply */
-    CARD8       unused;                 /* not used */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      pad1 B32;
-    CARD32      n B32;
-    CARD32      npipes B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xGLXQueryHyperpipeConfigSGIXReply;
-#define sz_xGLXQueryHyperpipeConfigSGIXReply 32
-
-/*
-** glXHyperpipeConfigSGIX request
-*/
-typedef struct {
-    CARD8       reqType;
-    CARD8       glxCode;
-    CARD16      length B16;
-    CARD32      vendorCode B32;         /* vendor-specific opcode */
-    CARD32      pad1 B32;   /* unused; corresponds to contextTag in header */
-    CARD32      screen B32;
-    CARD32      npipes B32;
-    CARD32      networkId B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    /* followed by attribute list */
-} xGLXHyperpipeConfigSGIXReq;
-#define sz_xGLXHyperpipeConfigSGIXReq 32
-
-/*
-** glXHyperpipeConfigSGIX reply
-*/
-typedef struct {
-    BYTE        type;                   /* X_Reply */
-    CARD8       unused;                 /* not used */
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      pad1 B32;
-    CARD32      n B32;
-    CARD32      npipes B32;
-    CARD32      hpId B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xGLXHyperpipeConfigSGIXReply;
-#define sz_xGLXHyperpipeConfigSGIXReply 32
-
-/**
- * \name Protocol structures for GLX_ARB_create_context and
- * GLX_ARB_create_context_profile
- */
-/*@{*/
-/**
- * Protocol header for glXSetClientInfoARB
- *
- * This structure is follwed by \c numVersions * 2 \c CARD32 values listing
- * the OpenGL versions supported by the client.  The pairs of values are an
- * OpenGL major version followed by a minor version.  For example,
- *
- *      CARD32 versions[4] = { 2, 1, 3, 0 };
- *
- * says that the client supports OpenGL 2.1 and OpenGL 3.0.
- * 
- * These are followed by \c numGLExtensionBytes bytes of \c STRING8 containing
- * the OpenGL extension string supported by the client and up to 3 bytes of
- * padding.
- *
- * The list of OpenGL extensions is followed by \c numGLXExtensionBytes bytes
- * of \c STRING8 containing the GLX extension string supported by the client
- * and up to 3 bytes of padding.
- *
- * This protocol replaces \c GLXClientInfo.
- *
- * \sa GLXClientInfo, GLXSetClientInfo2ARB
- */
-typedef struct GLXSetClientInfoARB {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	major B32;
-    CARD32	minor B32;
-    CARD32	numVersions B32;
-    CARD32	numGLExtensionBytes B32;
-    CARD32	numGLXExtensionBytes B32;
-    /*
-    ** More data may follow; this is just the header.
-    */
-} xGLXSetClientInfoARBReq;
-#define sz_xGLXSetClientInfoARBReq 24
-
-/**
- * Protocol head for glXCreateContextAttribsARB
- *
- * This protocol replaces \c GLXCreateContext, \c GLXCreateNewContext, and
- * \c GLXCreateContextWithConfigSGIX.
- */
-typedef struct GLXCreateContextAttribsARB {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    GLXContextID	context B32;
-    GLXFBConfigID	fbconfig B32;
-    CARD32	screen;
-    GLXContextID	shareList B32;
-    BOOL	isDirect;
-    CARD8	reserved1;
-    CARD16	reserved2 B16;
-    CARD32	numAttribs B32;
-    /* followed by attribute list */
-} xGLXCreateContextAttribsARBReq;
-#define sz_xGLXCreateContextAttribsARBReq 28
-
-/**
- * Protocol header for glXSetClientInfo2ARB
- *
- * The glXSetClientInfo2ARB protocol differs from glXSetClientInfoARB in that
- * the list of OpenGL versions supported by the client is 3 \c CARD32 values
- * per version: major version, minor version, and supported profile mask.
- *
- * This protocol replaces \c GLXClientInfo and \c GLXSetClientInfoARB.
- *
- * \sa GLXClientInfo, GLXSetClientInfoARB
- */
-typedef struct GLXSetClientInfo2ARB {
-    CARD8	reqType;
-    CARD8	glxCode;
-    CARD16	length B16;
-    CARD32	major B32;
-    CARD32	minor B32;
-    CARD32	numVersions B32;
-    CARD32	numGLExtensionBytes B32;
-    CARD32	numGLXExtensionBytes B32;
-    /*
-    ** More data may follow; this is just the header.
-    */
-} xGLXSetClientInfo2ARBReq;
-#define sz_xGLXSetClientInfo2ARBReq 24
-/*@}*/
-
-/************************************************************************/
-
-/*
-** Events
-*/
-
-typedef struct {
-    BYTE type;
-    BYTE pad;
-    CARD16 sequenceNumber B16;
-    CARD16 event_type B16;  /*** was clobber_class */
-    CARD16 draw_type B16;
-    CARD32 drawable B32;
-    CARD32 buffer_mask B32; /*** was mask */
-    CARD16 aux_buffer B16;
-    CARD16 x B16;
-    CARD16 y B16;
-    CARD16 width B16;
-    CARD16 height B16;
-    CARD16 count B16;
-    CARD32 unused2 B32;
-} xGLXPbufferClobberEvent;
-
-typedef struct {
-    BYTE type;
-    BYTE pad;
-    CARD16 sequenceNumber B16;
-    CARD16 event_type B16;
-    CARD32 drawable;
-    CARD32 ust_hi B32;
-    CARD32 ust_lo B32;
-    CARD32 msc_hi B32;
-    CARD32 msc_lo B32;
-    CARD32 sbc_hi B32;
-    CARD32 sbc_lo B32;
-} xGLXBufferSwapComplete;
-
-typedef struct {
-    BYTE type;
-    BYTE pad;
-    CARD16 sequenceNumber B16;
-    CARD16 event_type B16;
-    CARD16 pad2;
-    CARD32 drawable;
-    CARD32 ust_hi B32;
-    CARD32 ust_lo B32;
-    CARD32 msc_hi B32;
-    CARD32 msc_lo B32;
-    CARD32 sbc B32;
-} xGLXBufferSwapComplete2;
-
-/************************************************************************/
-
-/*
-** Size of the standard X request header.
-*/
-#define __GLX_SINGLE_HDR_SIZE sz_xGLXSingleReq
-#define __GLX_VENDPRIV_HDR_SIZE sz_xGLXVendorPrivateReq
-
-#define __GLX_RENDER_HDR    \
-    CARD16	length B16; \
-    CARD16	opcode B16
-
-#define __GLX_RENDER_HDR_SIZE 4
-
-typedef struct {
-    __GLX_RENDER_HDR;
-} __GLXrenderHeader;
-
-#define __GLX_RENDER_LARGE_HDR \
-    CARD32	length B32;    \
-    CARD32	opcode B32
-
-#define __GLX_RENDER_LARGE_HDR_SIZE 8
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-} __GLXrenderLargeHeader;
-
-/*
-** The glBitmap, glPolygonStipple, glTexImage[12]D, glTexSubImage[12]D
-** and glDrawPixels calls all have a pixel header transmitted after the
-** Render or RenderLarge header and before their own opcode specific
-** headers.
-*/
-#define __GLX_PIXEL_HDR		\
-    BOOL	swapBytes;	\
-    BOOL	lsbFirst;	\
-    CARD8	reserved0;	\
-    CARD8	reserved1;	\
-    CARD32	rowLength B32;	\
-    CARD32	skipRows B32;	\
-    CARD32	skipPixels B32; \
-    CARD32	alignment B32
-
-#define __GLX_PIXEL_HDR_SIZE 20
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-} __GLXpixelHeader;
-
-/*
-** glTexImage[34]D and glTexSubImage[34]D calls
-** all have a pixel header transmitted after the Render or RenderLarge
-** header and before their own opcode specific headers.
-*/
-#define __GLX_PIXEL_3D_HDR		\
-    BOOL	swapBytes;		\
-    BOOL	lsbFirst;		\
-    CARD8	reserved0;		\
-    CARD8	reserved1;		\
-    CARD32	rowLength B32;		\
-    CARD32	imageHeight B32;	\
-    CARD32	imageDepth B32;		\
-    CARD32	skipRows B32;		\
-    CARD32	skipImages B32;		\
-    CARD32	skipVolumes B32;	\
-    CARD32	skipPixels B32;		\
-    CARD32	alignment B32
-
-#define __GLX_PIXEL_3D_HDR_SIZE 36
-
-/*
-** Data that is specific to a glBitmap call.  The data is sent in the
-** following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	Bitmap header
-*/
-#define __GLX_BITMAP_HDR    \
-    CARD32	width B32;  \
-    CARD32	height B32; \
-    FLOAT32	xorig F32;  \
-    FLOAT32	yorig F32;  \
-    FLOAT32	xmove F32;  \
-    FLOAT32	ymove F32
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_BITMAP_HDR;
-} __GLXbitmapHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_BITMAP_HDR;
-} __GLXbitmapLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_BITMAP_HDR;
-} __GLXdispatchBitmapHeader;
-
-#define __GLX_BITMAP_HDR_SIZE 24
-
-#define __GLX_BITMAP_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_BITMAP_HDR_SIZE)
-
-#define __GLX_BITMAP_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_HDR_SIZE + __GLX_BITMAP_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-} __GLXpolygonStippleHeader;
-
-#define __GLX_POLYGONSTIPPLE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE)
-
-/*
-** Data that is specific to a glTexImage1D or glTexImage2D call.  The
-** data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	TexImage header
-** When a glTexImage1D call the height field is unexamined by the server.
-*/
-#define __GLX_TEXIMAGE_HDR	\
-    CARD32	target B32;	\
-    CARD32	level B32;	\
-    CARD32	components B32; \
-    CARD32	width B32;	\
-    CARD32	height B32;	\
-    CARD32	border B32;	\
-    CARD32	format B32;	\
-    CARD32	type B32
-
-#define __GLX_TEXIMAGE_HDR_SIZE 32
-
-#define __GLX_TEXIMAGE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_TEXIMAGE_HDR_SIZE)
-
-#define __GLX_TEXIMAGE_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_HDR_SIZE + __GLX_TEXIMAGE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_TEXIMAGE_HDR;
-} __GLXtexImageHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_TEXIMAGE_HDR;
-} __GLXtexImageLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_TEXIMAGE_HDR;
-} __GLXdispatchTexImageHeader;
-
-/*
-** Data that is specific to a glTexImage3D or glTexImage4D call.  The
-** data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel 3D header
-**	TexImage 3D header
-** When a glTexImage3D call the size4d and woffset fields are unexamined
-** by the server.
-** Could be used by all TexImage commands and perhaps should be in the
-** future.
-*/
-#define __GLX_TEXIMAGE_3D_HDR \
-    CARD32	target B32;	\
-    CARD32	level B32;	\
-    CARD32	internalformat B32;	\
-    CARD32	width B32;	\
-    CARD32	height B32;	\
-    CARD32	depth B32;	\
-    CARD32	size4d B32;	\
-    CARD32	border B32;	\
-    CARD32	format B32;	\
-    CARD32	type B32;	\
-    CARD32	nullimage B32
-
-#define __GLX_TEXIMAGE_3D_HDR_SIZE 44
-
-#define __GLX_TEXIMAGE_3D_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_3D_HDR_SIZE + \
-		__GLX_TEXIMAGE_3D_HDR_SIZE)
-
-#define __GLX_TEXIMAGE_3D_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_3D_HDR_SIZE + __GLX_TEXIMAGE_3D_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXIMAGE_3D_HDR;
-} __GLXtexImage3DHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXIMAGE_3D_HDR;
-} __GLXtexImage3DLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXIMAGE_3D_HDR;
-} __GLXdispatchTexImage3DHeader;
-
-/*
-** Data that is specific to a glTexSubImage1D or glTexSubImage2D call.	The
-** data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	TexSubImage header
-** When a glTexSubImage1D call is made, the yoffset and height fields
-** are unexamined by the server and are  considered to be padding.
-*/
-#define __GLX_TEXSUBIMAGE_HDR	\
-    CARD32	target B32;	\
-    CARD32	level B32;	\
-    CARD32	xoffset B32;	\
-    CARD32	yoffset B32;	\
-    CARD32	width B32;	\
-    CARD32	height B32;	\
-    CARD32	format B32;	\
-    CARD32	type B32;	\
-    CARD32	nullImage	\
-
-#define __GLX_TEXSUBIMAGE_HDR_SIZE 36
-
-#define __GLX_TEXSUBIMAGE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_TEXSUBIMAGE_HDR_SIZE)
-
-#define __GLX_TEXSUBIMAGE_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_HDR_SIZE + __GLX_TEXSUBIMAGE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_TEXSUBIMAGE_HDR;
-} __GLXtexSubImageHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_TEXSUBIMAGE_HDR;
-} __GLXtexSubImageLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_TEXSUBIMAGE_HDR;
-} __GLXdispatchTexSubImageHeader;
-
-/*
-** Data that is specific to a glTexSubImage3D and 4D calls.  The
-** data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel 3D header
-**	TexSubImage 3D header
-** When a glTexSubImage3D call is made, the woffset and size4d fields
-** are unexamined by the server and are considered to be padding.
-*/
-#define __GLX_TEXSUBIMAGE_3D_HDR	\
-    CARD32	target B32;	\
-    CARD32	level B32;	\
-    CARD32	xoffset B32;	\
-    CARD32	yoffset B32;	\
-    CARD32	zoffset B32;	\
-    CARD32	woffset B32;	\
-    CARD32	width B32;	\
-    CARD32	height B32;	\
-    CARD32	depth B32;	\
-    CARD32	size4d B32;	\
-    CARD32	format B32;	\
-    CARD32	type B32;	\
-    CARD32	nullImage	\
-
-#define __GLX_TEXSUBIMAGE_3D_HDR_SIZE 52
-
-#define __GLX_TEXSUBIMAGE_3D_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_3D_HDR_SIZE + \
-		__GLX_TEXSUBIMAGE_3D_HDR_SIZE)
-
-#define __GLX_TEXSUBIMAGE_3D_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_3D_HDR_SIZE + __GLX_TEXSUBIMAGE_3D_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXSUBIMAGE_3D_HDR;
-} __GLXtexSubImage3DHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXSUBIMAGE_3D_HDR;
-} __GLXtexSubImage3DLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_3D_HDR;
-    __GLX_TEXSUBIMAGE_3D_HDR;
-} __GLXdispatchTexSubImage3DHeader;
-
-/**
- * Data that is specific to a \c glCompressedTexImage1D or
- * \c glCompressedTexImage2D call.  The data is sent in the following
- * order:
- *     - Render or RenderLarge header
- *     - CompressedTexImage header
- * 
- * When a \c glCompressedTexImage1D call is made, the \c height field is
- * not examined by the server and is considered padding.
- */
-
-#define __GLX_COMPRESSED_TEXIMAGE_HDR \
-    CARD32     target B32;            \
-    CARD32     level B32;             \
-    CARD32     internalFormat B32;    \
-    CARD32     width B32;             \
-    CARD32     height B32;            \
-    CARD32     border B32;            \
-    CARD32     imageSize B32
-
-#define __GLX_COMPRESSED_TEXIMAGE_HDR_SIZE 28
-
-#define __GLX_COMPRESSED_TEXIMAGE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_COMPRESSED_TEXIMAGE_HDR_SIZE)
-
-#define __GLX_COMPRESSED_TEXIMAGE_DISPATCH_HDR_SIZE \
-    (__GLX_COMPRESSED_TEXIMAGE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_COMPRESSED_TEXIMAGE_HDR;
-} __GLXcompressedTexImageHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_COMPRESSED_TEXIMAGE_HDR;
-} __GLXcompressedTexImageLargeHeader;
-
-typedef struct {
-    __GLX_COMPRESSED_TEXIMAGE_HDR;
-} __GLXdispatchCompressedTexImageHeader;
-
-/**
- * Data that is specifi to a \c glCompressedTexSubImage1D or
- * \c glCompressedTexSubImage2D call.  The data is sent in the following
- * order:
- *     - Render or RenderLarge header
- *     - CompressedTexSubImage header
- * 
- * When a \c glCompressedTexSubImage1D call is made, the \c yoffset and
- * \c height fields are not examined by the server and are considered padding.
- */
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_HDR \
-    CARD32     target B32;            \
-    CARD32     level B32;             \
-    CARD32     xoffset B32;           \
-    CARD32     yoffset B32;           \
-    CARD32     width B32;             \
-    CARD32     height B32;            \
-    CARD32     format B32;            \
-    CARD32     imageSize B32
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_HDR_SIZE 32
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_COMPRESSED_TEXSUBIMAGE_HDR_SIZE)
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_DISPATCH_HDR_SIZE \
-    (__GLX_COMPRESSED_TEXSUBIMAGE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_COMPRESSED_TEXSUBIMAGE_HDR;
-} __GLXcompressedTexSubImageHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_COMPRESSED_TEXSUBIMAGE_HDR;
-} __GLXcompressedTexSubImageLargeHeader;
-
-typedef struct {
-    __GLX_COMPRESSED_TEXSUBIMAGE_HDR;
-} __GLXdispatchCompressedTexSubImageHeader;
-
-/**
- * Data that is specific to a \c glCompressedTexImage3D call.  The data is
- * sent in the following order:
- *     - Render or RenderLarge header
- *     - CompressedTexImage3D header
- */
-
-#define __GLX_COMPRESSED_TEXIMAGE_3D_HDR \
-    CARD32     target B32;            \
-    CARD32     level B32;             \
-    CARD32     internalFormat B32;    \
-    CARD32     width B32;             \
-    CARD32     height B32;            \
-    CARD32     depth B32;             \
-    CARD32     border B32;            \
-    CARD32     imageSize B32
-
-#define __GLX_COMPRESSED_TEXIMAGE_3D_HDR_SIZE 32
-
-#define __GLX_COMPRESSED_TEXIMAGE_3D_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_COMPRESSED_TEXIMAGE_3D_HDR_SIZE)
-
-#define __GLX_COMPRESSED_TEXIMAGE_3D_DISPATCH_HDR_SIZE \
-    (__GLX_COMPRESSED_TEXIMAGE_3D_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_COMPRESSED_TEXIMAGE_3D_HDR;
-} __GLXcompressedTexImage3DHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_COMPRESSED_TEXIMAGE_3D_HDR;
-} __GLXcompressedTexImage3DLargeHeader;
-
-typedef struct {
-    __GLX_COMPRESSED_TEXIMAGE_3D_HDR;
-} __GLXdispatchCompressedTexImage3DHeader;
-
-/**
- * Data that is specifi to a \c glCompressedTexSubImage3D call.  The data is
- * sent in the following order:
- *     - Render or RenderLarge header
- *     - CompressedTexSubImage3D header
- */
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR \
-    CARD32     target B32;            \
-    CARD32     level B32;             \
-    CARD32     xoffset B32;           \
-    CARD32     yoffset B32;           \
-    CARD32     zoffset B32;           \
-    CARD32     width B32;             \
-    CARD32     height B32;            \
-    CARD32     depth B32;             \
-    CARD32     format B32;            \
-    CARD32     imageSize B32
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR_SIZE 32
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR_SIZE)
-
-#define __GLX_COMPRESSED_TEXSUBIMAGE_3D_DISPATCH_HDR_SIZE \
-    (__GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR;
-} __GLXcompressedTexSubImage3DHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR;
-} __GLXcompressedTexSubImage3DLargeHeader;
-
-typedef struct {
-    __GLX_COMPRESSED_TEXSUBIMAGE_3D_HDR;
-} __GLXdispatchCompressedTexSubImage3DHeader;
-
-/*
-** Data that is specific to a glDrawPixels call.  The data is sent in the
-** following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	DrawPixels header
-*/
-#define __GLX_DRAWPIXELS_HDR \
-    CARD32	width B32;   \
-    CARD32	height B32;  \
-    CARD32	format B32;  \
-    CARD32	type B32
-
-#define __GLX_DRAWPIXELS_HDR_SIZE 16
-
-#define __GLX_DRAWPIXELS_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_DRAWPIXELS_HDR_SIZE)
-
-#define __GLX_DRAWPIXELS_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_HDR_SIZE + __GLX_DRAWPIXELS_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_DRAWPIXELS_HDR;
-} __GLXdrawPixelsHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_DRAWPIXELS_HDR;
-} __GLXdrawPixelsLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_DRAWPIXELS_HDR;
-} __GLXdispatchDrawPixelsHeader;
-
-/*
-** Data that is specific to a glConvolutionFilter1D or glConvolutionFilter2D
-** call.  The data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	ConvolutionFilter header
-** When a glConvolutionFilter1D call the height field is unexamined by the server.
-*/
-#define __GLX_CONV_FILT_HDR	\
-    CARD32	target B32;	\
-    CARD32	internalformat B32;	\
-    CARD32	width B32;	\
-    CARD32	height B32;	\
-    CARD32	format B32;	\
-    CARD32	type B32
-
-#define __GLX_CONV_FILT_HDR_SIZE 24
-
-#define __GLX_CONV_FILT_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_CONV_FILT_HDR_SIZE)
-
-#define __GLX_CONV_FILT_CMD_DISPATCH_HDR_SIZE \
-    (__GLX_PIXEL_HDR_SIZE + __GLX_CONV_FILT_HDR_SIZE)
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_CONV_FILT_HDR;
-} __GLXConvolutionFilterHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_CONV_FILT_HDR;
-} __GLXConvolutionFilterLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_CONV_FILT_HDR;
-} __GLXdispatchConvolutionFilterHeader;
-
-/*
-** Data that is specific to a glDrawArraysEXT call.  The data is sent in the
-** following order:
-**	Render or RenderLarge header
-**	Draw Arrays header
-**	a variable number of Component headers
-**	vertex data for each component type
-*/
-
-#define __GLX_DRAWARRAYS_HDR \
-    CARD32	numVertexes B32; \
-    CARD32	numComponents B32; \
-    CARD32	primType B32
-
-#define __GLX_DRAWARRAYS_HDR_SIZE 12
-
-#define __GLX_DRAWARRAYS_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_DRAWARRAYS_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_DRAWARRAYS_HDR;
-} __GLXdrawArraysHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_DRAWARRAYS_HDR;
-} __GLXdrawArraysLargeHeader;
-
-typedef struct {
-    __GLX_DRAWARRAYS_HDR;
-} __GLXdispatchDrawArraysHeader;
-
-#define __GLX_COMPONENT_HDR \
-    CARD32	datatype B32; \
-    INT32	numVals B32; \
-    CARD32	component B32
-
-typedef struct {
-    __GLX_COMPONENT_HDR;
-} __GLXdispatchDrawArraysComponentHeader;
-
-#define __GLX_COMPONENT_HDR_SIZE 12
-
-/*
-** Data that is specific to a glColorTable call
-**	The data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	ColorTable header
-*/
-
-#define __GLX_COLOR_TABLE_HDR	     \
-    CARD32	target B32;	    \
-    CARD32	internalformat B32; \
-    CARD32	width B32;	    \
-    CARD32	format B32;	    \
-    CARD32	type   B32
-
-#define __GLX_COLOR_TABLE_HDR_SIZE 20
-
-#define __GLX_COLOR_TABLE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + __GLX_COLOR_TABLE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_TABLE_HDR;
-} __GLXColorTableHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_TABLE_HDR;
-} __GLXColorTableLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_TABLE_HDR;
-} __GLXdispatchColorTableHeader;
-
-/*
-** Data that is specific to a glColorSubTable call
-**	The data is sent in the following order:
-**	Render or RenderLarge header
-**	Pixel header
-**	ColorTable header
-*/
-
-#define __GLX_COLOR_SUBTABLE_HDR    \
-    CARD32	target B32;	    \
-    CARD32	start B32; 	    \
-    CARD32	count B32;	    \
-    CARD32	format B32;	    \
-    CARD32	type   B32
-
-#define __GLX_COLOR_SUBTABLE_HDR_SIZE 20
-
-#define __GLX_COLOR_SUBTABLE_CMD_HDR_SIZE \
-    (__GLX_RENDER_HDR_SIZE + __GLX_PIXEL_HDR_SIZE + \
-     __GLX_COLOR_SUBTABLE_HDR_SIZE)
-
-typedef struct {
-    __GLX_RENDER_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_SUBTABLE_HDR;
-} __GLXColorSubTableHeader;
-
-typedef struct {
-    __GLX_RENDER_LARGE_HDR;
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_SUBTABLE_HDR;
-} __GLXColorSubTableLargeHeader;
-
-typedef struct {
-    __GLX_PIXEL_HDR;
-    __GLX_COLOR_SUBTABLE_HDR;
-} __GLXdispatchColorSubTableHeader;
-
-#define GLX_WINDOW_TYPE		1
-#define GLX_PIXMAP_TYPE		2
-#define GLX_VIDEO_SOURCE_TYPE	3
-#define GLX_PBUFFER_TYPE	4
-/* 5 is for DM_PBUFFER */
-#define GLX_GLXWINDOW_TYPE	6	
-
-/*****************************************************************************/
-
-/*
-** Restore these definitions back to the typedefs in glx.h
-*/
-#undef GLXContextID
-#undef GLXPixmap
-#undef GLXDrawable
-#undef GLXPbuffer
-#undef GLXWindow
-#undef GLXFBConfigID
-#undef GLXFBConfigIDSGIX
-#undef GLXPbufferSGIX
-
-
-/* Opcodes for GLX commands */
-
-#define X_GLXRender                       1
-#define X_GLXRenderLarge                  2
-#define X_GLXCreateContext                3
-#define X_GLXDestroyContext               4
-#define X_GLXMakeCurrent                  5
-#define X_GLXIsDirect                     6
-#define X_GLXQueryVersion                 7
-#define X_GLXWaitGL                       8
-#define X_GLXWaitX                        9
-#define X_GLXCopyContext                 10
-#define X_GLXSwapBuffers                 11
-#define X_GLXUseXFont                    12
-#define X_GLXCreateGLXPixmap             13
-#define X_GLXGetVisualConfigs            14
-#define X_GLXDestroyGLXPixmap            15
-#define X_GLXVendorPrivate               16
-#define X_GLXVendorPrivateWithReply      17
-#define X_GLXQueryExtensionsString       18
-#define X_GLXQueryServerString           19
-#define X_GLXClientInfo                  20
-#define X_GLXGetFBConfigs                21
-#define X_GLXCreatePixmap                22
-#define X_GLXDestroyPixmap               23
-#define X_GLXCreateNewContext            24
-#define X_GLXQueryContext                25
-#define X_GLXMakeContextCurrent          26
-#define X_GLXCreatePbuffer               27
-#define X_GLXDestroyPbuffer              28
-#define X_GLXGetDrawableAttributes       29
-#define X_GLXChangeDrawableAttributes    30
-#define X_GLXCreateWindow                31
-#define X_GLXDestroyWindow               32
-#define X_GLXSetClientInfoARB            33
-#define X_GLXCreateContextAtrribsARB     34
-#define X_GLXSetConfigInfo2ARB           35
-
-/* Opcodes for single commands (part of GLX command space) */
-
-#define X_GLsop_NewList                    101
-#define X_GLsop_EndList                    102
-#define X_GLsop_DeleteLists                103
-#define X_GLsop_GenLists                   104
-#define X_GLsop_FeedbackBuffer             105
-#define X_GLsop_SelectBuffer               106
-#define X_GLsop_RenderMode                 107
-#define X_GLsop_Finish                     108
-#define X_GLsop_Flush                      142
-#define X_GLsop_PixelStoref                109
-#define X_GLsop_PixelStorei                110
-#define X_GLsop_ReadPixels                 111
-#define X_GLsop_GetBooleanv                112
-#define X_GLsop_GetClipPlane               113
-#define X_GLsop_GetDoublev                 114
-#define X_GLsop_GetError                   115
-#define X_GLsop_GetFloatv                  116
-#define X_GLsop_GetIntegerv                117
-#define X_GLsop_GetLightfv                 118
-#define X_GLsop_GetLightiv                 119
-#define X_GLsop_GetMapdv                   120
-#define X_GLsop_GetMapfv                   121
-#define X_GLsop_GetMapiv                   122
-#define X_GLsop_GetMaterialfv              123
-#define X_GLsop_GetMaterialiv              124
-#define X_GLsop_GetPixelMapfv              125
-#define X_GLsop_GetPixelMapuiv             126
-#define X_GLsop_GetPixelMapusv             127
-#define X_GLsop_GetPolygonStipple          128
-#define X_GLsop_GetString                  129
-#define X_GLsop_GetTexEnvfv                130
-#define X_GLsop_GetTexEnviv                131
-#define X_GLsop_GetTexGendv                132
-#define X_GLsop_GetTexGenfv                133
-#define X_GLsop_GetTexGeniv                134
-#define X_GLsop_GetTexImage                135
-#define X_GLsop_GetTexParameterfv          136
-#define X_GLsop_GetTexParameteriv          137
-#define X_GLsop_GetTexLevelParameterfv     138
-#define X_GLsop_GetTexLevelParameteriv     139
-#define X_GLsop_IsEnabled                  140
-#define X_GLsop_IsList                     141
-#define X_GLsop_AreTexturesResident        143
-#define X_GLsop_DeleteTextures             144
-#define X_GLsop_GenTextures                145
-#define X_GLsop_IsTexture                  146
-#define X_GLsop_GetColorTable              147
-#define X_GLsop_GetColorTableParameterfv   148
-#define X_GLsop_GetColorTableParameteriv   149
-#define X_GLsop_GetConvolutionFilter       150
-#define X_GLsop_GetConvolutionParameterfv  151
-#define X_GLsop_GetConvolutionParameteriv  152
-#define X_GLsop_GetSeparableFilter         153
-#define X_GLsop_GetHistogram               154
-#define X_GLsop_GetHistogramParameterfv    155
-#define X_GLsop_GetHistogramParameteriv    156
-#define X_GLsop_GetMinmax                  157
-#define X_GLsop_GetMinmaxParameterfv       158
-#define X_GLsop_GetMinmaxParameteriv       159
-#define X_GLsop_GetCompressedTexImage      160
-
-
-/* Opcodes for rendering commands */
-
-#define X_GLrop_CallList                     1
-#define X_GLrop_CallLists                    2
-#define X_GLrop_ListBase                     3
-#define X_GLrop_Begin                        4
-#define X_GLrop_Bitmap                       5
-#define X_GLrop_Color3bv                     6
-#define X_GLrop_Color3dv                     7
-#define X_GLrop_Color3fv                     8
-#define X_GLrop_Color3iv                     9
-#define X_GLrop_Color3sv                    10
-#define X_GLrop_Color3ubv                   11
-#define X_GLrop_Color3uiv                   12
-#define X_GLrop_Color3usv                   13
-#define X_GLrop_Color4bv                    14
-#define X_GLrop_Color4dv                    15
-#define X_GLrop_Color4fv                    16
-#define X_GLrop_Color4iv                    17
-#define X_GLrop_Color4sv                    18
-#define X_GLrop_Color4ubv                   19
-#define X_GLrop_Color4uiv                   20
-#define X_GLrop_Color4usv                   21
-#define X_GLrop_EdgeFlagv                   22
-#define X_GLrop_End                         23
-#define X_GLrop_Indexdv                     24
-#define X_GLrop_Indexfv                     25
-#define X_GLrop_Indexiv                     26
-#define X_GLrop_Indexsv                     27
-#define X_GLrop_Normal3bv                   28
-#define X_GLrop_Normal3dv                   29
-#define X_GLrop_Normal3fv                   30
-#define X_GLrop_Normal3iv                   31
-#define X_GLrop_Normal3sv                   32
-#define X_GLrop_RasterPos2dv                33
-#define X_GLrop_RasterPos2fv                34
-#define X_GLrop_RasterPos2iv                35
-#define X_GLrop_RasterPos2sv                36
-#define X_GLrop_RasterPos3dv                37
-#define X_GLrop_RasterPos3fv                38
-#define X_GLrop_RasterPos3iv                39
-#define X_GLrop_RasterPos3sv                40
-#define X_GLrop_RasterPos4dv                41
-#define X_GLrop_RasterPos4fv                42
-#define X_GLrop_RasterPos4iv                43
-#define X_GLrop_RasterPos4sv                44
-#define X_GLrop_Rectdv                      45
-#define X_GLrop_Rectfv                      46
-#define X_GLrop_Rectiv                      47
-#define X_GLrop_Rectsv                      48
-#define X_GLrop_TexCoord1dv                 49
-#define X_GLrop_TexCoord1fv                 50
-#define X_GLrop_TexCoord1iv                 51
-#define X_GLrop_TexCoord1sv                 52
-#define X_GLrop_TexCoord2dv                 53
-#define X_GLrop_TexCoord2fv                 54
-#define X_GLrop_TexCoord2iv                 55
-#define X_GLrop_TexCoord2sv                 56
-#define X_GLrop_TexCoord3dv                 57
-#define X_GLrop_TexCoord3fv                 58
-#define X_GLrop_TexCoord3iv                 59
-#define X_GLrop_TexCoord3sv                 60
-#define X_GLrop_TexCoord4dv                 61
-#define X_GLrop_TexCoord4fv                 62
-#define X_GLrop_TexCoord4iv                 63
-#define X_GLrop_TexCoord4sv                 64
-#define X_GLrop_Vertex2dv                   65
-#define X_GLrop_Vertex2fv                   66
-#define X_GLrop_Vertex2iv                   67
-#define X_GLrop_Vertex2sv                   68
-#define X_GLrop_Vertex3dv                   69
-#define X_GLrop_Vertex3fv                   70
-#define X_GLrop_Vertex3iv                   71
-#define X_GLrop_Vertex3sv                   72
-#define X_GLrop_Vertex4dv                   73
-#define X_GLrop_Vertex4fv                   74
-#define X_GLrop_Vertex4iv                   75
-#define X_GLrop_Vertex4sv                   76
-#define X_GLrop_ClipPlane                   77
-#define X_GLrop_ColorMaterial               78
-#define X_GLrop_CullFace                    79
-#define X_GLrop_Fogf                        80
-#define X_GLrop_Fogfv                       81
-#define X_GLrop_Fogi                        82
-#define X_GLrop_Fogiv                       83
-#define X_GLrop_FrontFace                   84
-#define X_GLrop_Hint                        85
-#define X_GLrop_Lightf                      86
-#define X_GLrop_Lightfv                     87
-#define X_GLrop_Lighti                      88
-#define X_GLrop_Lightiv                     89
-#define X_GLrop_LightModelf                 90
-#define X_GLrop_LightModelfv                91
-#define X_GLrop_LightModeli                 92
-#define X_GLrop_LightModeliv                93
-#define X_GLrop_LineStipple                 94
-#define X_GLrop_LineWidth                   95
-#define X_GLrop_Materialf                   96
-#define X_GLrop_Materialfv                  97
-#define X_GLrop_Materiali                   98
-#define X_GLrop_Materialiv                  99
-#define X_GLrop_PointSize                  100
-#define X_GLrop_PolygonMode                101
-#define X_GLrop_PolygonStipple             102
-#define X_GLrop_Scissor                    103
-#define X_GLrop_ShadeModel                 104
-#define X_GLrop_TexParameterf              105
-#define X_GLrop_TexParameterfv             106
-#define X_GLrop_TexParameteri              107
-#define X_GLrop_TexParameteriv             108
-#define X_GLrop_TexImage1D                 109
-#define X_GLrop_TexImage2D                 110
-#define X_GLrop_TexEnvf                    111
-#define X_GLrop_TexEnvfv                   112
-#define X_GLrop_TexEnvi                    113
-#define X_GLrop_TexEnviv                   114
-#define X_GLrop_TexGend                    115
-#define X_GLrop_TexGendv                   116
-#define X_GLrop_TexGenf                    117
-#define X_GLrop_TexGenfv                   118
-#define X_GLrop_TexGeni                    119
-#define X_GLrop_TexGeniv                   120
-#define X_GLrop_InitNames                  121
-#define X_GLrop_LoadName                   122
-#define X_GLrop_PassThrough                123
-#define X_GLrop_PopName                    124
-#define X_GLrop_PushName                   125
-#define X_GLrop_DrawBuffer                 126
-#define X_GLrop_Clear                      127
-#define X_GLrop_ClearAccum                 128
-#define X_GLrop_ClearIndex                 129
-#define X_GLrop_ClearColor                 130
-#define X_GLrop_ClearStencil               131
-#define X_GLrop_ClearDepth                 132
-#define X_GLrop_StencilMask                133
-#define X_GLrop_ColorMask                  134
-#define X_GLrop_DepthMask                  135
-#define X_GLrop_IndexMask                  136
-#define X_GLrop_Accum                      137
-#define X_GLrop_Disable                    138
-#define X_GLrop_Enable                     139
-#define X_GLrop_PopAttrib                  141
-#define X_GLrop_PushAttrib                 142
-#define X_GLrop_Map1d                      143
-#define X_GLrop_Map1f                      144
-#define X_GLrop_Map2d                      145
-#define X_GLrop_Map2f                      146
-#define X_GLrop_MapGrid1d                  147
-#define X_GLrop_MapGrid1f                  148
-#define X_GLrop_MapGrid2d                  149
-#define X_GLrop_MapGrid2f                  150
-#define X_GLrop_EvalCoord1dv               151
-#define X_GLrop_EvalCoord1fv               152
-#define X_GLrop_EvalCoord2dv               153
-#define X_GLrop_EvalCoord2fv               154
-#define X_GLrop_EvalMesh1                  155
-#define X_GLrop_EvalPoint1                 156
-#define X_GLrop_EvalMesh2                  157
-#define X_GLrop_EvalPoint2                 158
-#define X_GLrop_AlphaFunc                  159
-#define X_GLrop_BlendFunc                  160
-#define X_GLrop_LogicOp                    161
-#define X_GLrop_StencilFunc                162
-#define X_GLrop_StencilOp                  163
-#define X_GLrop_DepthFunc                  164
-#define X_GLrop_PixelZoom                  165
-#define X_GLrop_PixelTransferf             166
-#define X_GLrop_PixelTransferi             167
-#define X_GLrop_PixelMapfv                 168
-#define X_GLrop_PixelMapuiv                169
-#define X_GLrop_PixelMapusv                170
-#define X_GLrop_ReadBuffer                 171
-#define X_GLrop_CopyPixels                 172
-#define X_GLrop_DrawPixels                 173
-#define X_GLrop_DepthRange                 174
-#define X_GLrop_Frustum                    175
-#define X_GLrop_LoadIdentity               176
-#define X_GLrop_LoadMatrixf                177
-#define X_GLrop_LoadMatrixd                178
-#define X_GLrop_MatrixMode                 179
-#define X_GLrop_MultMatrixf                180
-#define X_GLrop_MultMatrixd                181
-#define X_GLrop_Ortho                      182
-#define X_GLrop_PopMatrix                  183
-#define X_GLrop_PushMatrix                 184
-#define X_GLrop_Rotated                    185
-#define X_GLrop_Rotatef                    186
-#define X_GLrop_Scaled                     187
-#define X_GLrop_Scalef                     188
-#define X_GLrop_Translated                 189
-#define X_GLrop_Translatef                 190
-#define X_GLrop_Viewport                   191
-#define X_GLrop_DrawArrays                 193
-#define X_GLrop_PolygonOffset              192
-#define X_GLrop_CopyTexImage1D             4119
-#define X_GLrop_CopyTexImage2D             4120
-#define X_GLrop_CopyTexSubImage1D          4121
-#define X_GLrop_CopyTexSubImage2D          4122
-#define X_GLrop_TexSubImage1D              4099
-#define X_GLrop_TexSubImage2D              4100
-#define X_GLrop_BindTexture                4117
-#define X_GLrop_PrioritizeTextures         4118
-#define X_GLrop_Indexubv                   194
-#define X_GLrop_BlendColor                 4096
-#define X_GLrop_BlendEquation              4097
-#define X_GLrop_ColorTable                 2053
-#define X_GLrop_ColorTableParameterfv      2054
-#define X_GLrop_ColorTableParameteriv      2055
-#define X_GLrop_CopyColorTable             2056
-#define X_GLrop_ColorSubTable              195
-#define X_GLrop_CopyColorSubTable          196
-#define X_GLrop_ConvolutionFilter1D        4101
-#define X_GLrop_ConvolutionFilter2D        4102
-#define X_GLrop_ConvolutionParameterf      4103
-#define X_GLrop_ConvolutionParameterfv     4104
-#define X_GLrop_ConvolutionParameteri      4105
-#define X_GLrop_ConvolutionParameteriv     4106
-#define X_GLrop_CopyConvolutionFilter1D    4107
-#define X_GLrop_CopyConvolutionFilter2D    4108
-#define X_GLrop_SeparableFilter2D          4109
-#define X_GLrop_Histogram                  4110
-#define X_GLrop_Minmax                     4111
-#define X_GLrop_ResetHistogram             4112
-#define X_GLrop_ResetMinmax                4113
-#define X_GLrop_TexImage3D                 4114
-#define X_GLrop_TexSubImage3D              4115
-#define X_GLrop_CopyTexSubImage3D          4123
-#define X_GLrop_DrawArraysEXT              4116
-
-/* Added for core GL version 1.3 */
-
-#define X_GLrop_ActiveTextureARB            197
-#define X_GLrop_MultiTexCoord1dvARB         198
-#define X_GLrop_MultiTexCoord1fvARB         199
-#define X_GLrop_MultiTexCoord1ivARB         200
-#define X_GLrop_MultiTexCoord1svARB         201
-#define X_GLrop_MultiTexCoord2dvARB         202
-#define X_GLrop_MultiTexCoord2fvARB         203
-#define X_GLrop_MultiTexCoord2ivARB         204
-#define X_GLrop_MultiTexCoord2svARB         205
-#define X_GLrop_MultiTexCoord3dvARB         206
-#define X_GLrop_MultiTexCoord3fvARB         207
-#define X_GLrop_MultiTexCoord3ivARB         208
-#define X_GLrop_MultiTexCoord3svARB         209
-#define X_GLrop_MultiTexCoord4dvARB         210
-#define X_GLrop_MultiTexCoord4fvARB         211
-#define X_GLrop_MultiTexCoord4ivARB         212
-#define X_GLrop_MultiTexCoord4svARB         213
-#define X_GLrop_CompressedTexImage1D        214
-#define X_GLrop_CompressedTexImage2D        215
-#define X_GLrop_CompressedTexImage3D        216
-#define X_GLrop_CompressedTexSubImage1D     217
-#define X_GLrop_CompressedTexSubImage2D     218
-#define X_GLrop_CompressedTexSubImage3D     219
-#define X_GLrop_SampleCoverageARB           229
-
-/* Added for core GL version 1.4 */
-
-#define X_GLrop_WindowPos3fARB              230
-#define X_GLrop_FogCoordfv                  4124
-#define X_GLrop_FogCoorddv                  4125
-#define X_GLrop_PointParameterfARB          2065
-#define X_GLrop_PointParameterfvARB         2066
-#define X_GLrop_SecondaryColor3bv           4126
-#define X_GLrop_SecondaryColor3sv           4127
-#define X_GLrop_SecondaryColor3iv           4128
-#define X_GLrop_SecondaryColor3fv           4129
-#define X_GLrop_SecondaryColor3dv           4130
-#define X_GLrop_SecondaryColor3ubv          4131
-#define X_GLrop_SecondaryColor3usv          4132
-#define X_GLrop_SecondaryColor3uiv          4133
-#define X_GLrop_BlendFuncSeparate           4134
-#define X_GLrop_PointParameteri             4221
-#define X_GLrop_PointParameteriv            4222
-
-/* Added for core GL version 1.5 */
-/* XXX opcodes not defined in the spec */
-
-/* Opcodes for Vendor Private commands */
-
-
-#define X_GLvop_GetConvolutionFilterEXT        1
-#define X_GLvop_GetConvolutionParameterfvEXT   2
-#define X_GLvop_GetConvolutionParameterivEXT   3
-#define X_GLvop_GetSeparableFilterEXT          4
-#define X_GLvop_GetHistogramEXT                5
-#define X_GLvop_GetHistogramParameterfvEXT     6
-#define X_GLvop_GetHistogramParameterivEXT     7
-#define X_GLvop_GetMinmaxEXT                   8
-#define X_GLvop_GetMinmaxParameterfvEXT        9
-#define X_GLvop_GetMinmaxParameterivEXT        10
-#define X_GLvop_AreTexturesResidentEXT         11
-#define X_GLvop_DeleteTexturesEXT              12
-#define X_GLvop_GenTexturesEXT                 13
-#define X_GLvop_IsTextureEXT                   14
-#define X_GLvop_GetCombinerInputParameterfvNV  1270
-#define X_GLvop_GetCombinerInputParameterivNV  1271
-#define X_GLvop_GetCombinerOutputParameterfvNV 1272
-#define X_GLvop_GetCombinerOutputParameterivNV 1273
-#define X_GLvop_GetFinalCombinerOutputParameterfvNV 1274
-#define X_GLvop_GetFinalCombinerOutputParameterivNV 1275
-#define X_GLvop_DeleteFenceNV                  1276
-#define X_GLvop_GenFencesNV                    1277
-#define X_GLvop_IsFenceNV                      1278
-#define X_GLvop_TestFenceNV                    1279
-#define X_GLvop_GetFenceivNV                   1280
-#define X_GLvop_AreProgramsResidentNV          1293
-#define X_GLvop_DeleteProgramARB               1294
-#define X_GLvop_GenProgramsARB                 1295
-#define X_GLvop_GetProgramEnvParameterfvARB    1296
-#define X_GLvop_GetProgramEnvParameterdvARB    1297
-#define X_GLvop_GetProgramEnvParameterivNV     1298
-#define X_GLvop_GetProgramStringNV             1299
-#define X_GLvop_GetTrackMatrixivNV             1300
-#define X_GLvop_GetVertexAttribdvARB           1301
-#define X_GLvop_GetVertexAttribfvARB           1302
-#define X_GLvop_GetVertexAttribivARB           1303
-#define X_GLvop_IsProgramARB                   1304
-#define X_GLvop_GetProgramLocalParameterfvARB  1305
-#define X_GLvop_GetProgramLocalParameterdvARB  1306
-#define X_GLvop_GetProgramivARB                1307
-#define X_GLvop_GetProgramStringARB            1308
-#define X_GLvop_GetProgramNamedParameter4fvNV  1310
-#define X_GLvop_GetProgramNamedParameter4dvNV  1311
-#define X_GLvop_SampleMaskSGIS                 2048
-#define X_GLvop_SamplePatternSGIS              2049
-#define X_GLvop_GetDetailTexFuncSGIS           4096
-#define X_GLvop_GetSharpenTexFuncSGIS          4097
-#define X_GLvop_GetColorTableSGI               4098
-#define X_GLvop_GetColorTableParameterfvSGI    4099
-#define X_GLvop_GetColorTableParameterivSGI    4100
-#define X_GLvop_GetTexFilterFuncSGIS           4101
-#define X_GLvop_GetInstrumentsSGIX             4102
-#define X_GLvop_InstrumentsBufferSGIX          4103
-#define X_GLvop_PollInstrumentsSGIX            4104
-#define X_GLvop_FlushRasterSGIX                4105
-
-/* Opcodes for GLX vendor private commands */
-
-#define X_GLXvop_QueryContextInfoEXT            1024
-#define X_GLXvop_BindTexImageEXT                1330
-#define X_GLXvop_ReleaseTexImageEXT             1331
-#define X_GLXvop_SwapIntervalSGI                65536
-#define X_GLXvop_MakeCurrentReadSGI             65537
-#define X_GLXvop_CreateGLXVideoSourceSGIX       65538
-#define X_GLXvop_DestroyGLXVideoSourceSGIX      65539
-#define X_GLXvop_GetFBConfigsSGIX               65540
-#define X_GLXvop_CreateContextWithConfigSGIX    65541
-#define X_GLXvop_CreateGLXPixmapWithConfigSGIX  65542
-#define X_GLXvop_CreateGLXPbufferSGIX           65543
-#define X_GLXvop_DestroyGLXPbufferSGIX          65544
-#define X_GLXvop_ChangeDrawableAttributesSGIX   65545
-#define X_GLXvop_GetDrawableAttributesSGIX      65546
-#define X_GLXvop_JoinSwapGroupSGIX              65547
-#define X_GLXvop_BindSwapBarrierSGIX            65548
-#define X_GLXvop_QueryMaxSwapBarriersSGIX       65549
-#define X_GLXvop_QueryHyperpipeNetworkSGIX      65550
-#define X_GLXvop_QueryHyperpipeConfigSGIX       65551
-#define X_GLXvop_HyperpipeConfigSGIX            65552
-#define X_GLXvop_DestroyHyperpipeConfigSGIX     65553
-
-/* ARB extension opcodes */
-
-/*  1. GL_ARB_multitexture - see GL 1.2 opcodes */
-/*  5. GL_ARB_multisample - see GL 1.3 opcodes */
-/* 12. GL_ARB_texture_compression - see GL 1.3 opcodes */
-/* 14. GL_ARB_point_parameters - see GL 1.4 opcodees */
-
-/* 15. GL_ARB_vertex_blend */
-#define X_GLrop_WeightbvARB                  220
-#define X_GLrop_WeightubvARB                 221
-#define X_GLrop_WeightsvARB                  222
-#define X_GLrop_WeightusvARB                 223
-#define X_GLrop_WeightivARB                  224
-#define X_GLrop_WeightuivARB                 225
-#define X_GLrop_VertexBlendARB               226
-#define X_GLrop_WeightfvARB                  227
-#define X_GLrop_WeightdvARB                  228
-
-/* 16. GL_ARB_matrix_palette */
-/* XXX opcodes not defined in the spec */
-
-/* 25. GL_ARB_window_pos - see GL 1.4 opcodes */
-
-/* 26. GL_ARB_vertex_program */
-#define X_GLrop_BindProgramARB              4180
-#define X_GLrop_ProgramEnvParameter4fvARB   4184
-#define X_GLrop_ProgramEnvParameter4dvARB   4185
-#define X_GLrop_VertexAttrib1svARB          4189
-#define X_GLrop_VertexAttrib2svARB          4190
-#define X_GLrop_VertexAttrib3svARB          4191
-#define X_GLrop_VertexAttrib4svARB          4192
-#define X_GLrop_VertexAttrib1fvARB          4193
-#define X_GLrop_VertexAttrib2fvARB          4194
-#define X_GLrop_VertexAttrib3fvARB          4195
-#define X_GLrop_VertexAttrib4fvARB          4196
-#define X_GLrop_VertexAttrib1dvARB          4197
-#define X_GLrop_VertexAttrib2dvARB          4198
-#define X_GLrop_VertexAttrib3dvARB          4199
-#define X_GLrop_ProgramLocalParameter4fvARB 4215
-#define X_GLrop_ProgramLocalParameter4dvARB 4216
-#define X_GLrop_ProgramStringARB            4217
-#define X_GLrop_VertexAttrib4dvARB          4200
-#define X_GLrop_VertexAttrib4NubvARB        4201
-#define X_GLrop_VertexAttrib4bvARB          4230
-#define X_GLrop_VertexAttrib4ivARB          4231
-#define X_GLrop_VertexAttrib4ubvARB         4232
-#define X_GLrop_VertexAttrib4usvARB         4233
-#define X_GLrop_VertexAttrib4uivARB         4234
-#define X_GLrop_VertexAttrib4NbvARB         4235
-#define X_GLrop_VertexAttrib4NsvARB         4236
-#define X_GLrop_VertexAttrib4NivARB         4237
-#define X_GLrop_VertexAttrib4NusvARB        4238
-#define X_GLrop_VertexAttrib4NuivARB        4239
-
-/* 27. GL_ARB_fragment_program - see GL_ARB_vertex_program opcodes */
-
-/* 29. GL_ARB_occlusion_query */
-/* XXX opcodes not defined in the spec */
-
-
-/* New extension opcodes */
-
-/* 145. GL_EXT_secondary_color - see GL 1.4 opcodes */
-
-/* 188. GL_EXT_vertex_weighting */
-#define X_GLrop_VertexWeightfvEXT           4135
-
-/* 191. GL_NV_register_combiners */
-#define X_GLrop_CombinerParameterfNV        4136
-#define X_GLrop_CombinerParameterfvNV       4137
-#define X_GLrop_CombinerParameteriNV        4138
-#define X_GLrop_CombinerParameterivNV       4139
-#define X_GLrop_CombinerInputNV             4140
-#define X_GLrop_CombinerOutputNV            4141
-#define X_GLrop_FinalCombinerInputNV        4142
-
-/* 222. GL_NV_fence */
-#define X_GLrop_SetFenceNV                  4143
-#define X_GLrop_FinishFenceNV               4144
-
-/* 227. GL_NV_register_combiners2 */
-/* XXX opcodes not defined in the spec */
-
-/* 233. GL_NV_vertex_program - see also GL_ARB_vertex_program opcodes */
-#define X_GLrop_ExecuteProgramNV            4181
-#define X_GLrop_RequestResidentProgramsNV   4182
-#define X_GLrop_LoadProgamNV                4183
-#define X_GLrop_ProgramParameters4fvNV      4186
-#define X_GLrop_ProgramParameters4dvNV      4187
-#define X_GLrop_TrackMatrixNV               4188
-#define X_GLrop_VertexAttribs1svNV          4202
-#define X_GLrop_VertexAttribs2svNV          4203
-#define X_GLrop_VertexAttribs3svNV          4204
-#define X_GLrop_VertexAttribs4svNV          4205
-#define X_GLrop_VertexAttribs1fvNV          4206
-#define X_GLrop_VertexAttribs2fvNV          4207
-#define X_GLrop_VertexAttribs3fvNV          4208
-#define X_GLrop_VertexAttribs4fvNV          4209
-#define X_GLrop_VertexAttribs1dvNV          4210
-#define X_GLrop_VertexAttribs2dvNV          4211
-#define X_GLrop_VertexAttribs3dvNV          4212
-#define X_GLrop_VertexAttribs4dvNV          4213
-#define X_GLrop_VertexAttribs4ubvNV         4214
-
-/* 261. GL_NV_occlusion_query */
-/* XXX opcodes not defined in the spec */
-
-/* 262. GL_NV_point_sprite - see GL 1.4 opcodes */
-
-/* 268. GL_EXT_stencil_two_side */
-#define X_GLrop_ActiveStencilFaceEXT        4220
-
-/* 282. GL_NV_fragment_program - see also GL_NV_vertex_program and GL_ARB_vertex_program opcodes */
-#define X_GLrop_ProgramNamedParameter4fvNV  4218
-#define X_GLrop_ProgramNamedParameter4dvNV  4219
-
-/* 285. GL_NV_primitive_restart */
-/* XXX opcodes not defined in the spec */
-
-/* 297. GL_EXT_depth_bounds_test */
-#define X_GLrop_DepthBoundsEXT              4229
-
-/* 299. GL_EXT_blend_equation_separate */
-#define X_GLrop_BlendEquationSeparateEXT    4228
-
-/* 310. GL_EXT_framebuffer_object */
-#define X_GLvop_IsRenderbufferEXT                      1422
-#define X_GLvop_GenRenderbuffersEXT                    1423
-#define X_GLvop_GetRenderbufferParameterivEXT          1424
-#define X_GLvop_IsFramebufferEXT                       1425
-#define X_GLvop_GenFramebuffersEXT                     1426
-#define X_GLvop_CheckFramebufferStatusEXT              1427
-#define X_GLvop_GetFramebufferAttachmentParameterivEXT 1428
-
-#endif /* _GLX_glxproto_h_ */
diff --git a/proto/glproto/glxtokens.h b/proto/glproto/glxtokens.h
deleted file mode 100644
index a95082e47..000000000
--- a/proto/glproto/glxtokens.h
+++ /dev/null
@@ -1,316 +0,0 @@
-#ifndef __GLX_glxtokens_h__
-#define __GLX_glxtokens_h__
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GLX_VERSION_1_1 1
-#define GLX_VERSION_1_2 1
-#define GLX_VERSION_1_3 1
-#define GLX_VERSION_1_4 1
-
-/*
-** Visual Config Attributes (glXGetConfig, glXGetFBConfigAttrib)
-*/
-#define GLX_USE_GL		1	/* support GLX rendering */
-#define GLX_BUFFER_SIZE		2	/* depth of the color buffer */
-#define GLX_LEVEL		3	/* level in plane stacking */
-#define GLX_RGBA		4	/* true if RGBA mode */
-#define GLX_DOUBLEBUFFER	5	/* double buffering supported */
-#define GLX_STEREO		6	/* stereo buffering supported */
-#define GLX_AUX_BUFFERS		7	/* number of aux buffers */
-#define GLX_RED_SIZE		8	/* number of red component bits */
-#define GLX_GREEN_SIZE		9	/* number of green component bits */
-#define GLX_BLUE_SIZE		10	/* number of blue component bits */
-#define GLX_ALPHA_SIZE		11	/* number of alpha component bits */
-#define GLX_DEPTH_SIZE		12	/* number of depth bits */
-#define GLX_STENCIL_SIZE	13	/* number of stencil bits */
-#define GLX_ACCUM_RED_SIZE	14	/* number of red accum bits */
-#define GLX_ACCUM_GREEN_SIZE	15	/* number of green accum bits */
-#define GLX_ACCUM_BLUE_SIZE	16	/* number of blue accum bits */
-#define GLX_ACCUM_ALPHA_SIZE	17	/* number of alpha accum bits */
-/*
-** FBConfig-specific attributes
-*/
-#define GLX_X_VISUAL_TYPE		0x22
-#define GLX_CONFIG_CAVEAT		0x20	/* Like visual_info VISUAL_CAVEAT_EXT */
-#define GLX_TRANSPARENT_TYPE		0x23
-#define GLX_TRANSPARENT_INDEX_VALUE	0x24
-#define GLX_TRANSPARENT_RED_VALUE	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_RENDER_TYPE			0x8011
-#define GLX_X_RENDERABLE		0x8012
-#define GLX_FBCONFIG_ID			0x8013
-#define GLX_MAX_PBUFFER_WIDTH		0x8016
-#define GLX_MAX_PBUFFER_HEIGHT		0x8017
-#define GLX_MAX_PBUFFER_PIXELS		0x8018
-#define GLX_VISUAL_ID			0x800B
-
-/* FBConfigSGIX Attributes */
-#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX	0x8019
-#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX	0x801A
-
-/*
-** Error return values from glXGetConfig.  Success is indicated by
-** a value of 0.
-*/
-#define GLX_BAD_SCREEN		1	/* screen # is bad */
-#define GLX_BAD_ATTRIBUTE	2	/* attribute to get is bad */
-#define GLX_NO_EXTENSION	3	/* no glx extension on server */
-#define GLX_BAD_VISUAL		4	/* visual # not known by GLX */
-#define GLX_BAD_CONTEXT		5	/* returned only by import_context EXT? */
-#define GLX_BAD_VALUE		6	/* returned only by glXSwapIntervalSGI? */
-#define GLX_BAD_ENUM		7	/* unused? */
-
-/* FBConfig attribute values */
-
-/*
-** Generic "don't care" value for glX ChooseFBConfig attributes (except
-** GLX_LEVEL)
-*/
-#define GLX_DONT_CARE			0xFFFFFFFF
-
-/* GLX_RENDER_TYPE bits */
-#define GLX_RGBA_BIT			0x00000001
-#define GLX_COLOR_INDEX_BIT		0x00000002
-#define GLX_RGBA_FLOAT_BIT_ARB          0x00000004
-#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008
-
-/* GLX_DRAWABLE_TYPE bits */
-#define GLX_WINDOW_BIT			0x00000001
-#define GLX_PIXMAP_BIT			0x00000002
-#define GLX_PBUFFER_BIT			0x00000004
-
-/* GLX_CONFIG_CAVEAT attribute values */
-#define GLX_NONE			0x8000
-#define GLX_SLOW_CONFIG			0x8001
-#define GLX_NON_CONFORMANT_CONFIG	0x800D
-
-/* GLX_X_VISUAL_TYPE attribute values */
-#define GLX_TRUE_COLOR			0x8002
-#define GLX_DIRECT_COLOR		0x8003
-#define GLX_PSEUDO_COLOR		0x8004
-#define GLX_STATIC_COLOR		0x8005
-#define GLX_GRAY_SCALE			0x8006
-#define GLX_STATIC_GRAY			0x8007
-
-/* GLX_TRANSPARENT_TYPE attribute values */
-/* #define GLX_NONE			   0x8000 */
-#define GLX_TRANSPARENT_RGB		0x8008
-#define GLX_TRANSPARENT_INDEX		0x8009
-
-/* glXCreateGLXPbuffer attributes */
-#define GLX_PRESERVED_CONTENTS		0x801B
-#define GLX_LARGEST_PBUFFER		0x801C
-#define GLX_PBUFFER_HEIGHT		0x8040	/* New for GLX 1.3 */
-#define GLX_PBUFFER_WIDTH		0x8041	/* New for GLX 1.3 */
-
-/* glXQueryGLXPBuffer attributes */
-#define GLX_WIDTH			0x801D
-#define GLX_HEIGHT			0x801E
-#define GLX_EVENT_MASK			0x801F
-
-/* glXCreateNewContext render_type attribute values */
-#define GLX_RGBA_TYPE			0x8014
-#define GLX_COLOR_INDEX_TYPE		0x8015
-
-/* glXQueryContext attributes */
-/* #define GLX_FBCONFIG_ID		  0x8013 */
-/* #define GLX_RENDER_TYPE		  0x8011 */
-#define GLX_SCREEN			0x800C
-
-/* glXSelectEvent event mask bits */
-#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
-#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK	0x04000000
-
-/* GLXPbufferClobberEvent event_type values */
-#define GLX_DAMAGED			0x8020
-#define GLX_SAVED			0x8021
-#define GLX_EXCHANGE_COMPLETE_INTEL	0x8180
-#define GLX_BLIT_COMPLETE_INTEL		0x8181
-#define GLX_FLIP_COMPLETE_INTEL		0x8182
-
-/* GLXPbufferClobberEvent draw_type values */
-#define GLX_WINDOW			0x8022
-#define GLX_PBUFFER			0x8023
-
-/* GLXPbufferClobberEvent buffer_mask bits */
-#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
-#define GLX_AUX_BUFFERS_BIT		0x00000010
-#define GLX_DEPTH_BUFFER_BIT		0x00000020
-#define GLX_STENCIL_BUFFER_BIT		0x00000040
-#define GLX_ACCUM_BUFFER_BIT		0x00000080
-
-/*
-** Extension return values from glXGetConfig.  These are also
-** accepted as parameter values for glXChooseVisual.
-*/
-
-#define GLX_X_VISUAL_TYPE_EXT	0x22	/* visual_info extension type */
-#define GLX_TRANSPARENT_TYPE_EXT 0x23	/* visual_info extension */
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24	/* visual_info extension */
-#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25	/* visual_info extension */
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26	/* visual_info extension */
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27	/* visual_info extension */
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28	/* visual_info extension */
-
-/* Property values for visual_type */
-#define GLX_TRUE_COLOR_EXT	0x8002
-#define GLX_DIRECT_COLOR_EXT	0x8003
-#define GLX_PSEUDO_COLOR_EXT	0x8004
-#define GLX_STATIC_COLOR_EXT	0x8005
-#define GLX_GRAY_SCALE_EXT	0x8006
-#define GLX_STATIC_GRAY_EXT	0x8007
-
-/* Property values for transparent pixel */
-#define GLX_NONE_EXT		0x8000
-#define GLX_TRANSPARENT_RGB_EXT		0x8008
-#define GLX_TRANSPARENT_INDEX_EXT	0x8009
-
-/* Property values for visual_rating */
-#define GLX_VISUAL_CAVEAT_EXT		0x20  /* visual_rating extension type */
-#define GLX_SLOW_VISUAL_EXT		0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT	0x800D
-
-/* Property values for swap method (GLX_OML_swap_method) */
-#define GLX_SWAP_METHOD_OML                0x8060
-#define GLX_SWAP_EXCHANGE_OML              0x8061
-#define GLX_SWAP_COPY_OML                  0x8062
-#define GLX_SWAP_UNDEFINED_OML             0x8063
-
-/* Property values for multi-sampling */
-#define GLX_VISUAL_SELECT_GROUP_SGIX	0x8028	/* visuals grouped by select priority */
-
-/*
-** Names for attributes to glXGetClientString.
-*/
-#define GLX_VENDOR		0x1
-#define GLX_VERSION		0x2
-#define GLX_EXTENSIONS		0x3
-
-/*
-** Names for attributes to glXQueryContextInfoEXT.
-*/
-#define GLX_SHARE_CONTEXT_EXT	0x800A	/* id of share context */
-#define GLX_VISUAL_ID_EXT	0x800B	/* id of context's visual */
-#define GLX_SCREEN_EXT		0x800C	/* screen number */
-
-/*
-** GLX_EXT_texture_from_pixmap
-*/
-#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
-#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
-#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
-#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
-#define GLX_Y_INVERTED_EXT                 0x20D4
-
-#define GLX_TEXTURE_FORMAT_EXT             0x20D5
-#define GLX_TEXTURE_TARGET_EXT             0x20D6
-#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
-
-#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
-#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
-#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
-
-#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
-#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
-#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
-
-#define GLX_TEXTURE_1D_EXT                 0x20DB
-#define GLX_TEXTURE_2D_EXT                 0x20DC
-#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
-
-#define GLX_FRONT_LEFT_EXT                 0x20DE
-#define GLX_FRONT_RIGHT_EXT                0x20DF
-#define GLX_BACK_LEFT_EXT                  0x20E0
-#define GLX_BACK_RIGHT_EXT                 0x20E1
-#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
-#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
-#define GLX_AUX0_EXT                       0x20E2
-#define GLX_AUX1_EXT                       0x20E3 
-#define GLX_AUX2_EXT                       0x20E4 
-#define GLX_AUX3_EXT                       0x20E5 
-#define GLX_AUX4_EXT                       0x20E6 
-#define GLX_AUX5_EXT                       0x20E7 
-#define GLX_AUX6_EXT                       0x20E8
-#define GLX_AUX7_EXT                       0x20E9 
-#define GLX_AUX8_EXT                       0x20EA 
-#define GLX_AUX9_EXT                       0x20EB
-
-/*
- * GLX 1.4 and later:
- */
-#define GLX_SAMPLE_BUFFERS_SGIS            100000
-#define GLX_SAMPLES_SGIS                   100001
-
-/*
- * GLX_EXT_framebuffer_SRGB
- */
-#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
-
-/*
- * GLX_ARB_create_context
- * GLX_ARB_create_context_profile
- * GLX_EXT_create_context_es2_profile
- */
-#define GLX_CONTEXT_MAJOR_VERSION_ARB      0x2091
-#define GLX_CONTEXT_MINOR_VERSION_ARB      0x2092
-#define GLX_CONTEXT_FLAGS_ARB              0x2094
-#define GLX_CONTEXT_PROFILE_MASK_ARB       0x9126
-
-#define GLX_CONTEXT_DEBUG_BIT_ARB          0x0001
-#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB          0x0002
-
-#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB   0x0001
-#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB   0x0002
-#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT    0x0004
-
-/*
- * GLX_ARB_create_context_robustness
- */
-#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB  0x0004
-#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
-#define GLX_NO_RESET_NOTIFICATION_ARB      0x8261
-#define GLX_LOSE_CONTEXT_ON_RESET_ARB      0x8252
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !__GLX_glxtokens_h__ */
diff --git a/proto/glproto/install-sh b/proto/glproto/install-sh
deleted file mode 100644
index 4d4a9519e..000000000
--- a/proto/glproto/install-sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# 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}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$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 $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # 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 test -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 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/proto/glproto/missing b/proto/glproto/missing
deleted file mode 100644
index 894e786e1..000000000
--- a/proto/glproto/missing
+++ /dev/null
@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, 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
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -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]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         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' $msg.  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 $msg.  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)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  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."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # 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 is $msg.
-         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
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End: