X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=configure.ac;h=b166c38ebe9724fc30ad11b629e645a51614509c;hp=b75ee4a3c34550f0c0b54256d4b75525244654e0;hb=5d4daa2b86d30c77c9828447ca1828a45713b5d6;hpb=c2e55f28ba50e19fbf792a27009778e9dcca6fbb

diff --git a/configure.ac b/configure.ac
index b75ee4a..b166c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,19 @@
-m4_define([gis_release], [0.4.2])
-m4_define([gis_version], [0:0:0])
-m4_define([gis_subdir],  [libgis0])
+m4_define([grits_release], [0.5])
+m4_define([grits_version], [1:0:1])
+m4_define([grits_subdir],  [grits0])
 
 # Init and options
-AC_INIT([libgis], [gis_release], [andy753421@gmail.com])
+AC_INIT([grits], [grits_release], [andy753421@gmail.com])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 #AM_SILENT_RULES([yes])
 
 # For library versioning
-LIB_VERSION=gis_version
-GIS_SUBDIR=gis_subdir
+LIB_VERSION=grits_version
+GRITS_SUBDIR=grits_subdir
 AC_SUBST(LIB_VERSION)
-AC_SUBST(GIS_SUBDIR)
+AC_SUBST(GRITS_SUBDIR)
 
 # Check for required programs
 AC_PROG_CC
@@ -25,7 +25,7 @@ GTK_DOC_CHECK(1.9)
 # Check for required packages
 PKG_CHECK_MODULES(GLIB,  glib-2.0 >= 2.14 gobject-2.0 gthread-2.0)
 PKG_CHECK_MODULES(CAIRO, cairo)
-PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16 gtkglext-1.0)
+PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16)
 PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 
 # Test for Windows vs. Unix
@@ -40,6 +40,17 @@ fi
 AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
 AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
 
+# Configure GL flags
+if test "$WIN32" = yes; then
+	GL_CFLAGS=""
+	GL_LIBS="-lglu32 -lopengl32"
+else
+	GL_CFLAGS=""
+	GL_LIBS="-lGL -lGLU"
+fi
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
+
 # Output 
 AC_CONFIG_FILES([
 	Makefile
@@ -47,7 +58,7 @@ AC_CONFIG_FILES([
 	src/data/Makefile
 	src/objects/Makefile
 	src/plugins/Makefile
-	src/libgis.pc
+	src/grits.pc
 	docs/Makefile
 	docs/api/Makefile
 ])