Add support for GTK 3

[grits] / configure.ac

diff --git a/configure.ac b/configure.ac
index b75ee4a3c34550f0c0b54256d4b75525244654e0..33758b7af2ba30d571fc0491d1640bd67f2d375e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,22 @@
-m4_define([gis_release], [0.4.2])
-m4_define([gis_version], [0:0:0])
-m4_define([gis_subdir],  [libgis0])
+m4_define([grits_release], [0.7])
+m4_define([grits_version], [4:0:0])
+m4_define([grits_subdir],  [grits4])

 
 # Init and options
 
 # 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
 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(LIB_VERSION)

-AC_SUBST(GIS_SUBDIR)
+AC_SUBST(GRITS_SUBDIR)
+
+# Fix broken libtool
+lt_cv_sys_lib_dlsearch_path_spec="/lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64"

 
 # Check for required programs
 AC_PROG_CC
 
 # Check for required programs
 AC_PROG_CC


@@ -23,22 +26,52 @@ PKG_PROG_PKG_CONFIG
 GTK_DOC_CHECK(1.9)
 
 # Check for required packages
 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(GLIB,  glib-2.0 >= 2.32 gobject-2.0 gthread-2.0 gmodule-2.0)

 PKG_CHECK_MODULES(CAIRO, cairo)
 PKG_CHECK_MODULES(CAIRO, cairo)

-PKG_CHECK_MODULES(GTK,   gtk+-2.0 >= 2.16 gtkglext-1.0)

 PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 
 PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 

-# Test for Windows vs. Unix
+# Check for gtk 3
+AC_ARG_ENABLE([gtk3],
+       AS_HELP_STRING([--enable-gtk3], [Build with gtk3 support]))
+AS_IF([test "$enable_gtk3" = "yes"],
+       [PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)],
+       [PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)])
+AS_IF([test "$enable_gtk3" = "yes"],
+       [GTK_VERSION=gtk+-3.0],
+       [GTK_VERSION=gtk+-2.0])
+AC_SUBST(GTK_VERSION)
+
+# Check for glut for example plugin
+AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut")
+AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "")
+AC_SUBST(GLUT_LIBS)
+
+# Test for windowing system

 case "${host}" in
 case "${host}" in

-       *mingw32*) WIN32="yes" ;;
-       *cygwin*)  WIN32="yes" ;;
-       *)         WIN32="no"  ;;
+       *mingw32*) SYS="WIN" ;;
+       *cygwin*)  SYS="WIN" ;;
+       *apple*)   SYS="MAC" ;;
+       *)         SYS="X11" ;;

 esac
 esac

-if test "$WIN32" = yes; then
-       ac_default_prefix="/"
-fi
-AM_CONDITIONAL([WIN32],    test "$WIN32" = "yes")
-AM_CONDITIONAL([NOTWIN32], test "$WIN32" = "no")
+AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
+AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
+AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
+
+# OpenGL flags
+GL_CFLAGS="-DSYS_$SYS"
+case "$SYS" in
+       "WIN") GL_LIBS="-lglu32 -lopengl32" ;;
+       "MAC") GL_LIBS="-framework OpenGL" ;;
+       "X11") GL_LIBS="-lX11 -lGL -lGLU" ;;
+esac
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
+
+# Check for relative build
+AC_ARG_ENABLE(relative, [AS_HELP_STRING([--enable-relative],
+       [enable runtime search paths @<:@default=no@:>@])],
+       [DOTS=".."; ac_default_prefix="/"])
+AC_SUBST([DOTS])

 
 # Output 
 AC_CONFIG_FILES([
 
 # Output 
 AC_CONFIG_FILES([


@@ -47,7 +80,7 @@ AC_CONFIG_FILES([
        src/data/Makefile
        src/objects/Makefile
        src/plugins/Makefile
        src/data/Makefile
        src/objects/Makefile
        src/plugins/Makefile

-       src/libgis.pc
+       src/grits.pc

        docs/Makefile
        docs/api/Makefile
 ])
        docs/Makefile
        docs/api/Makefile
 ])