gir-repository r235 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Tue Nov 25 21:17:03 2008
New Revision: 235
URL: http://svn.gnome.org/viewvc/gir-repository?rev=235&view=rev

Log:
2008-11-25  Johan Dahlin  <jdahlin async com br>

        Bug 562031 â gir repository fails to libxml2 typelib
        without libxml2 installed

        * configure.ac:
        * gir/Makefile.am:
        Patch by Tom Parker.



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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 25 21:17:03 2008
@@ -51,6 +51,11 @@
 		  have_xfixes=true, have_xfixes=false)
 AM_CONDITIONAL(BUILD_XFIXES, $have_xfixes)
 
+dnl xml
+PKG_CHECK_MODULES(XML, libxml2,
+		  have_libxml=true, have_libxml=false)
+AM_CONDITIONAL(BUILD_LIBXML, $have_libxml)
+
 dnl GL
 AC_CHECK_LIB(GL, glInitNames,
 	     have_gl=true, have_gl=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Nov 25 21:17:03 2008
@@ -6,8 +6,7 @@
 CUSTOM_GIRSOURCES = 	\
 	cairo-1.0.gir 	\
 	fontconfig-2.0.gir	\
-	freetype2-2.0.gir	\
-	libxml2-2.0.gir
+	freetype2-2.0.gir
 BUILT_GIRSOURCES =
 
 XPATH_TESTS =
@@ -20,6 +19,10 @@
 CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
 endif
 
+if BUILD_LIBXML
+CUSTOM_GIRSOURCES += libxml2-2.0.gir
+endif
+
 if BUILD_GL
 CUSTOM_GIRSOURCES += GL-1.0.gir
 endif