[SCM] grits branch, upstream, updated. upstream/0.5.1-1-g86a5c1a

[Andy Spencer]

The following commit has been merged in the upstream branch:
commit 86a5c1a2c07cac50771acddb9143855409e59c78
Author: Andy Spencer <andy753421 at gmail.com>
Date:   Mon Sep 12 01:20:57 2011 +0000

    Imported Upstream version 0.5.2

diff --git a/configure b/configure
index ed8e5cb..d40d034 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for grits 0.5.1.
+# Generated by GNU Autoconf 2.65 for grits 0.5.2.
 #
 # Report bugs to <andy753421 at gmail.com>.
 #
@@ -562,8 +562,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='grits'
 PACKAGE_TARNAME='grits'
-PACKAGE_VERSION='0.5.1'
-PACKAGE_STRING='grits 0.5.1'
+PACKAGE_VERSION='0.5.2'
+PACKAGE_STRING='grits 0.5.2'
 PACKAGE_BUGREPORT='andy753421 at gmail.com'
 PACKAGE_URL=''
 
@@ -1326,7 +1326,7 @@ 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 grits 0.5.1 to adapt to many kinds of systems.
+\`configure' configures grits 0.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of grits 0.5.1:";;
+     short | recursive ) echo "Configuration of grits 0.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1513,7 +1513,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-grits configure 0.5.1
+grits configure 0.5.2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1791,7 +1791,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by grits $as_me 0.5.1, which was
+It was created by grits $as_me 0.5.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2599,7 +2599,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='grits'
- VERSION='0.5.1'
+ VERSION='0.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2645,7 +2645,7 @@ ac_config_headers="$ac_config_headers config.h"
 #AM_SILENT_RULES([yes])
 
 # For library versioning
-LIB_VERSION=1:1:1
+LIB_VERSION=1:2:1
 GRITS_SUBDIR=grits0
 
 
@@ -12074,7 +12074,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by grits $as_me 0.5.1, which was
+This file was extended by grits $as_me 0.5.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12140,7 +12140,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-grits config.status 0.5.1
+grits config.status 0.5.2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ad20745..89d989e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-m4_define([grits_release], [0.5.1])
-m4_define([grits_version], [1:1:1])
+m4_define([grits_release], [0.5.2])
+m4_define([grits_version], [1:2:1])
 m4_define([grits_subdir],  [grits0])
 
 # Init and options
diff --git a/src/Makefile.am b/src/Makefile.am
index 66e5718..c4ad298 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ libgrits_la_SOURCES = grits.h \
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
 	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
-libgrits_la_LIBADD  = $(AM_LDADD) \
+libgrits_la_LIBADD  = $(AM_LDADD) -lm \
 	objects/libgrits-objects.la \
 	data/libgrits-data.la
 libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
diff --git a/src/Makefile.in b/src/Makefile.in
index 60be488..51708b5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -339,7 +339,7 @@ libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
 	-DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
 
-libgrits_la_LIBADD = $(AM_LDADD) \
+libgrits_la_LIBADD = $(AM_LDADD) -lm \
 	objects/libgrits-objects.la \
 	data/libgrits-data.la
 
diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 865d288..67e39e5 100644
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -34,9 +34,9 @@ static void grits_poly_tess(gdouble (**points)[3])
 
 	/* Tesselate */
 	GLUtesselator *tess = gluNewTess();
-	gluTessCallback(tess, GLU_TESS_BEGIN,  glBegin);
-	gluTessCallback(tess, GLU_TESS_VERTEX, glVertex3dv);
-	gluTessCallback(tess, GLU_TESS_END,    glEnd);
+	gluTessCallback(tess, GLU_TESS_BEGIN,  (_GLUfuncptr)glBegin);
+	gluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv);
+	gluTessCallback(tess, GLU_TESS_END,    (_GLUfuncptr)glEnd);
 	gluTessBeginPolygon(tess, NULL);
 	for (int pi = 0; points[pi]; pi++) {
 		gluTessBeginContour(tess);

-- 
A Virtual Globe library