seed r793 - in trunk: . opengl-glib

[hortont svn gnome org]

Author: hortont
Date: Thu Jan 22 06:28:09 2009
New Revision: 793
URL: http://svn.gnome.org/viewvc/seed?rev=793&view=rev

Log:
Only build opengl-glib stuff if we have GLUT. Should fix to be more careful, but it's a good start.



Modified:
   trunk/config.h.in
   trunk/configure.ac
   trunk/opengl-glib/Makefile.am

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Thu Jan 22 06:28:09 2009
@@ -24,8 +24,8 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the `webkit-1.0 ' library (-lwebkit-1.0 ). */
-#undef HAVE_LIBWEBKIT_1_0_
+/* Define to 1 if you have the `webkit-1.0' library (-lwebkit-1.0). */
+#undef HAVE_LIBWEBKIT_1_0
 
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 22 06:28:09 2009
@@ -65,12 +65,25 @@
 	*)
 		save_LIBS=$LIBS
 		LIBS=`pkg-config --libs webkit-1.0`
-		AC_CHECK_LIB(webkit-1.0 ,JSContextGroupCreate,,
-					   AC_MSG_ERROR([The installed version of WebKit is too old. Install WebKit from SVN and try again.]))
+		AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate,,
+					 AC_MSG_ERROR([The installed version of WebKit is too old. Install WebKit from SVN and try again.]))
 		LIBS=$save_LIBS
 		;;
 esac
 
+dnl =============================GL/GLUT=======================================
+dnl We should actually be more careful (and modularly check for GL/GLUT/GLU)...
+
+AC_MSG_CHECKING(for GLUT)
+AC_TRY_CPP([#include <GL/glut.h>],
+			have_glut_h=yes,
+			have_glut_h=no)
+AC_MSG_RESULT([$have_glut_h])
+
+want_gl_typelibs=$have_glut_h
+AM_CONDITIONAL(BUILD_GL_TYPELIBS, test "x$want_gl_typelibs" = "xyes")
+AC_SUBST(BUILD_GL_TYPELIBS)
+
 dnl ==============================readline=====================================
 AC_MSG_CHECKING(for readline)
 AC_TRY_CPP([#include <readline/readline.h>],
@@ -271,6 +284,7 @@
 Installation:
    Prefix.....................$prefix
    Install examples...........$enable_examples
+   GL/GLUT bindings...........$want_gl_typelibs
 
 Modules:
    Canvas.....................$want_canvas_module

Modified: trunk/opengl-glib/Makefile.am
==============================================================================
--- trunk/opengl-glib/Makefile.am	(original)
+++ trunk/opengl-glib/Makefile.am	Thu Jan 22 06:28:09 2009
@@ -1,10 +1,11 @@
+if BUILD_GL_TYPELIBS
+
 girdir = $(datadir)/gir-1.0
 gir_DATA = GL-1.0.gir GLUT-1.0.gir GLTypes-1.0.gir GLU-1.0.gir
 
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = GL-1.0.typelib GLUT-1.0.typelib GLTypes-1.0.typelib GLU-1.0.typelib
 
-
 GL-1.0.typelib: GLTypes-1.0.typelib
 	g-ir-compiler --includedir=. GL-1.0.gir -o GL-1.0.typelib
 GLTypes-1.0.typelib:
@@ -13,4 +14,5 @@
 	g-ir-compiler --includedir=. GLUT-1.0.gir -o GLUT-1.0.typelib
 GLU-1.0.typelib: GL-1.0.typelib
 	g-ir-compiler --includedir=. GLU-1.0.gir -o GLU-1.0.typelib
-	
+
+endif