gir-repository r165 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:29:04 2008
New Revision: 165
URL: http://svn.gnome.org/viewvc/gir-repository?rev=165&view=rev

Log:
Build GL conditionally

	* configure.ac (BUILD_GL):
	* gir/Makefile.am: Build GL conditionally

Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:29:04 2008
@@ -47,6 +47,11 @@
 		  have_xft=true, have_xft=false)
 AM_CONDITIONAL(BUILD_XFT, $have_xft)
 
+dnl GL
+AC_CHECK_LIB(GL, glInitNames,
+	     have_gl=true, have_gl=false)
+AM_CONDITIONAL(BUILD_GL, $have_gl)
+
 dnl atk
 PKG_CHECK_MODULES(ATK, atk >= 1.12.0,
                   have_atk=true, have_atk=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:29:04 2008
@@ -8,8 +8,7 @@
 	DBus-1.0.gir	\
 	fontconfig-2.0.gir	\
 	freetype2-2.0.gir	\
-	libxml2-2.0.gir	\
-	GL-1.0.gir
+	libxml2-2.0.gir
 BUILT_GIRSOURCES =
 
 XPATH_TESTS =
@@ -18,6 +17,10 @@
 CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
 endif
 
+if BUILD_GL
+CUSTOM_GIRSOURCES += GL-1.0.gir
+endif
+
 if BUILD_MISSIONCONTROL
 CUSTOM_GIRSOURCES += DBusGLib.gir \
 	TelepathyGLib.gir \