Merge pull request NVIDIA#10 from bnguyen0/master

Various libglvnd fixes/cleanups, and an ABI update

Makefile.am

@@ -1,2 +1,3 @@
 SUBDIRS = src tests
 noinst_HEADERS = include
+ACLOCAL_AMFLAGS = -I m4

configure.ac

@@ -1,7 +1,7 @@
 dnl configure.ac
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.68])
+AC_PREREQ([2.63])
 AC_INIT([libglvnd], [0.0.0], [[email protected]])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
@@ -99,14 +99,6 @@ fi
 dnl Various conditionals.
 AM_CONDITIONAL([GCC], [test x$GCC = xyes ])
 
-AM_CONDITIONAL(HAVE_VND_GLAPI, true)
-dnl HACK FIXME TODO
-AM_CONDITIONAL(HAVE_SHARED_GLAPI, false)
-AM_CONDITIONAL(HAVE_OPENGL, false)
-AM_CONDITIONAL(HAVE_OPENGL_ES1, false)
-AM_CONDITIONAL(HAVE_OPENGL_ES2, false)
-AM_CONDITIONAL(HAVE_OPENVG, false)
-
 dnl
 dnl mapi top-relative paths: defined here so mapi can be used elsewhere
 dnl

include/glheader.h

@@ -60,9 +60,8 @@ extern "C" {
 
 
 /**
- * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
+ * GL_FIXED is defined in glext.h version 64 but this typedef isn't (yet).
  */
-typedef int GLfixed;
 typedef int GLclampx;
 
 

src/GL/Makefile.am

@@ -44,6 +44,6 @@ glapitemp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
 libGL_la_CFLAGS = \
  -I$(top_srcdir)/include
 
-libGL_la_LDFLAGS = -shared -Wl,--auxiliary=libGLdispatch.so.0 -Wl,--auxiliary=libGLX.so.0
+libGL_la_LDFLAGS = -shared -Wl,--auxiliary=libGLdispatch.so.0 -Wl,--auxiliary=libGLX.so.0 -version-info 1
 
 libGL_la_LIBADD = ../GLX/libGLX.la ../GLdispatch/libGLdispatch.la

src/GLX/Makefile.am

@@ -29,7 +29,6 @@ noinst_HEADERS = \
  libglxabi.h \
  libglxabipriv.h \
  libglxcurrent.h \
- libglxgldispatch.h \
  libglxmapping.h \
  libglxnoop.h \
  libglxnoopdefs.h \
@@ -71,5 +70,4 @@ libGLX_la_LDFLAGS = -shared
 libGLX_la_SOURCES = \
  libglx.c \
  libglxmapping.c \
- libglxnoop.c \
- libglxgldispatch.c
+ libglxnoop.c