lots of autoconf updates

diff --git a/docs/VERSIONS b/docs/VERSIONS
index 258a0fc5e3e8de40e013904e284e65fd536d7dfe..80f4010afac8622c49058649be7ff9f5abb51e05 100644 (file)
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1,4 +1,4 @@
-$Id: VERSIONS,v 1.12 1999/09/15 16:34:43 brianp Exp $
+$Id: VERSIONS,v 1.13 1999/09/19 20:09:00 tanner Exp $
 
 
 Mesa Version History
@@ -658,3 +658,4 @@ Mesa Version History
        - New library names:  "libGL" instead of "libMesaGL"
        - New library numbering: libGL.so.1.2.310
        - New subdirectories:  docs/ and bin/
+       - New Makefile-system (autoconf,automake,libtool)

diff --git a/include/GL/Makefile.am b/include/GL/Makefile.am
index 61af039384a6d3ed3f5c7be81ba48fb7217c6674..16b4913e4707cfffb7dc3f98cc359fe7cd02acf0 100644 (file)
--- a/include/GL/Makefile.am
+++ b/include/GL/Makefile.am
@@ -22,9 +22,13 @@ if HAVE_X11
 INC_X11 = glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
 endif
 
+if NEED_GLUT
+INC_GLUT = glut.h
+endif
+
 EXTRA_DIST = fxmesa.h ggimesa.h osmesa.h svgamesa.h \
        glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
 
 GLinclude_HEADERS = gl.h gl_mangle.h glu.h glu_mangle.h \
-       $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11)
+       $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
 

diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c
index 497b105a880cd52353d19a68c05a45cedd895083..c0d0242b2e8f0329d313f310b0333d30b0580d05 100644 (file)
--- a/progs/demos/tessdemo.c
+++ b/progs/demos/tessdemo.c
@@ -1,4 +1,4 @@
-/* $Id: tessdemo.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */
+/* $Id: tessdemo.c,v 1.2 1999/09/19 20:09:00 tanner Exp $ */
 
 /*
  * A demo of the GLU polygon tesselation functions written by Bogdan Sikorski.
@@ -11,8 +11,12 @@
 
 /*
  * $Log: tessdemo.c,v $
- * Revision 1.1  1999/08/19 00:55:40  jtg
- * Initial revision
+ * Revision 1.2  1999/09/19 20:09:00  tanner
+ *
+ * lots of autoconf updates
+ *
+ * Revision 1.1.1.1  1999/08/19 00:55:40  jtg
+ * Imported sources
  *
  * Revision 3.5  1999/03/28 18:24:37  brianp
  * minor clean-up
@@ -148,7 +152,7 @@ void set_screen_wh(GLsizei w, GLsizei h)
 
 void tesse(void)
 {
-       GLUtriangulatorObj *tobj;
+       GLUtesselator *tobj;
        GLdouble data[3];
        GLuint i,j,point_cnt;