From 934729dca1e5c66359366d1ee2b5080b3711d436 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Wed, 19 Jan 2011 12:43:13 +0100
Subject: Depend on cairo-gobject if available

And set library-name and package accordingly in the cairo .gir

https://bugzilla.gnome.org/show_bug.cgi?id=639831
---
 configure.ac         | 26 +++++++++++++++----
 gir/cairo-1.0.gir    | 68 --------------------------------------------------
 gir/cairo-1.0.gir.in | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 73 deletions(-)
 delete mode 100644 gir/cairo-1.0.gir
 create mode 100644 gir/cairo-1.0.gir.in

diff --git a/configure.ac b/configure.ac
index 3c78c0d1..91e6e999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,14 +126,29 @@ AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue)
 
 AC_ARG_ENABLE(tests,[  --disable-tests           disable test libraries ], enable_tests=$enableval,enable_tests=yes)
 have_cairo=no
-if test x$enable_tests != xno; then
-  PKG_CHECK_MODULES(CAIRO, [cairo], have_cairo=yes, have_cairo=no)
-  if test x$have_cairo != xyes; then
-    AC_MSG_ERROR([Tests enabled but cairo not found; pass --disable-tests or install cairo])
-  fi
+PKG_CHECK_MODULES(CAIRO, [cairo], have_cairo=yes, have_cairo=no)
+if test x$have_cairo != xyes && test x$enable_tests != xno; then
+  AC_MSG_ERROR([Tests enabled but cairo not found; pass --disable-tests or install cairo])
+fi
+
+have_cairo_gobject=no
+if test x$have_cairo = xyes; then
+  PKG_CHECK_MODULES(CAIRO_GOBJECT, [cairo-gobject], have_cairo_gobject=yes, have_cairo_gobject=no)
 fi
+
+if test x$have_cairo_gobject = xyes; then
+  CAIRO_SHARED_LIBRARY="libcairo-gobject.so"
+  CAIRO_GIR_PACKAGE="cairo-gobject"
+elif test x$have_cairo = xyes; then
+  CAIRO_SHARED_LIBRARY="libcairo.so"
+  CAIRO_GIR_PACKAGE="cairo"
+fi
+AC_SUBST(CAIRO_SHARED_LIBRARY)
+AC_SUBST(CAIRO_GIR_PACKAGE)
+
 AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests != xno)
 AM_CONDITIONAL(HAVE_CAIRO, test x$have_cairo != xno)
+AM_CONDITIONAL(HAVE_CAIRO_GOBJECT, test x$have_cairo_gobject != xno)
 
 PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0 gio-2.0])
 
@@ -241,6 +256,7 @@ AC_MSG_RESULT([$GLIBSRC])
 
 AC_CONFIG_FILES([
 Makefile
+gir/cairo-1.0.gir
 giscanner/config.py
 m4/Makefile
 tests/Makefile
diff --git a/gir/cairo-1.0.gir b/gir/cairo-1.0.gir
deleted file mode 100644
index 0c9f24a5..00000000
--- a/gir/cairo-1.0.gir
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<repository version="1.2"
-            xmlns="http://www.gtk.org/introspection/core/1.0"
-            xmlns:c="http://www.gtk.org/introspection/c/1.0"
-            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <namespace name="cairo" version="1.0"
-	     c:identifier-prefixes="cairo"
-	     c:symbol-prefixes="cairo">
-    <record name="Context" c:type="cairo_t" foreign="1"
-	    glib:type-name="CairoContext"
-	    glib:get-type="cairo_gobject_context_get_type"/>
-    <record name="Surface" c:type="cairo_surface_t" foreign="1"
-	    glib:type-name="CairoSurface"
-	    glib:get-type="cairo_gobject_surface_get_type"/>
-    <record name="Matrix" c:type="cairo_matrix_t" foreign="1"/>
-    <record name="Pattern" c:type="cairo_pattern_t" foreign="1"
-	    glib:type-name="CairoPattern"
-	    glib:get-type="cairo_gobject_pattern_get_type"/>
-    <record name="Region" c:type="cairo_region_t" foreign="1"
-	    glib:type-name="CairoRegion"
-	    glib:get-type="cairo_gobject_region_get_type"/>
-    <enumeration name="Content" c:type="cairo_content_t"
-		 glib:type-name="CairoContent"
-		 glib:get-type="cairo_gobject_content_get_type">
-      <member name="COLOR"
-              value="4096"
-              c:identifier="CAIRO_CONTENT_COLOR"/>
-      <member name="ALPHA"
-              value="8192"
-              c:identifier="CAIRO_CONTENT_ALPHA"/>
-      <member name="COLOR_ALPHA"
-              value="12288"
-              c:identifier="CAIRO_CONTENT_COLOR_ALPHA"/>
-    </enumeration>
-    <record name="FontOptions" c:type="cairo_font_options_t" foreign="1"/>
-    <record name="FontType" c:type="cairo_font_type_t" foreign="1"/>
-    <record name="FontFace" c:type="cairo_font_face_t" foreign="1"
-		 glib:type-name="CairoFontFace"
-		 glib:get-type="cairo_gobject_font_face_get_type"/>
-    <record name="ScaledFont" c:type="cairo_scaled_font_t" foreign="1"
-		 glib:type-name="CairoScaledFont"
-		 glib:get-type="cairo_gobject_scaled_font_get_type"/>
-    <record name="Path" c:type="cairo_path_t" foreign="1"/>
-    <record name="RectangleInt" c:type="cairo_rectangle_int_t"
-	    glib:type-name="CairoRectangleInt"
-	    glib:get-type="cairo_gobject_rectangle_int_get_type">
-      <field name="x" writable="1">
-	<type name="gint" c:type="gint"/>
-      </field>
-      <field name="y" writable="1">
-	<type name="gint" c:type="gint"/>
-      </field>
-      <field name="width" writable="1">
-	<type name="gint" c:type="gint"/>
-      </field>
-      <field name="height" writable="1">
-	<type name="gint" c:type="gint"/>
-      </field>
-    </record>
-    <function name="image_surface_create" c:identifier="cairo_image_surface_create">
-      <return-value transfer-ownership="none">
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-      </parameters>
-    </function>
-  </namespace>
-</repository>
diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in
new file mode 100644
index 00000000..2c29406d
--- /dev/null
+++ b/gir/cairo-1.0.gir.in
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<repository version="1.2"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+  <package name="@CAIRO_GIR_PACKAGE@"/>
+  <namespace name="cairo" version="1.0"
+	     shared-library="@CAIRO_SHARED_LIBRARY@"
+	     c:identifier-prefixes="cairo"
+	     c:symbol-prefixes="cairo">
+    <record name="Context" c:type="cairo_t" foreign="1"
+	    glib:type-name="CairoContext"
+	    glib:get-type="cairo_gobject_context_get_type"/>
+    <record name="Surface" c:type="cairo_surface_t" foreign="1"
+	    glib:type-name="CairoSurface"
+	    glib:get-type="cairo_gobject_surface_get_type"/>
+    <record name="Matrix" c:type="cairo_matrix_t" foreign="1"/>
+    <record name="Pattern" c:type="cairo_pattern_t" foreign="1"
+	    glib:type-name="CairoPattern"
+	    glib:get-type="cairo_gobject_pattern_get_type"/>
+    <record name="Region" c:type="cairo_region_t" foreign="1"
+	    glib:type-name="CairoRegion"
+	    glib:get-type="cairo_gobject_region_get_type"/>
+    <enumeration name="Content" c:type="cairo_content_t"
+		 glib:type-name="CairoContent"
+		 glib:get-type="cairo_gobject_content_get_type">
+      <member name="COLOR"
+              value="4096"
+              c:identifier="CAIRO_CONTENT_COLOR"/>
+      <member name="ALPHA"
+              value="8192"
+              c:identifier="CAIRO_CONTENT_ALPHA"/>
+      <member name="COLOR_ALPHA"
+              value="12288"
+              c:identifier="CAIRO_CONTENT_COLOR_ALPHA"/>
+    </enumeration>
+    <record name="FontOptions" c:type="cairo_font_options_t" foreign="1"/>
+    <record name="FontType" c:type="cairo_font_type_t" foreign="1"/>
+    <record name="FontFace" c:type="cairo_font_face_t" foreign="1"
+		 glib:type-name="CairoFontFace"
+		 glib:get-type="cairo_gobject_font_face_get_type"/>
+    <record name="ScaledFont" c:type="cairo_scaled_font_t" foreign="1"
+		 glib:type-name="CairoScaledFont"
+		 glib:get-type="cairo_gobject_scaled_font_get_type"/>
+    <record name="Path" c:type="cairo_path_t" foreign="1"/>
+    <record name="RectangleInt" c:type="cairo_rectangle_int_t"
+	    glib:type-name="CairoRectangleInt"
+	    glib:get-type="cairo_gobject_rectangle_int_get_type">
+      <field name="x" writable="1">
+	<type name="gint" c:type="gint"/>
+      </field>
+      <field name="y" writable="1">
+	<type name="gint" c:type="gint"/>
+      </field>
+      <field name="width" writable="1">
+	<type name="gint" c:type="gint"/>
+      </field>
+      <field name="height" writable="1">
+	<type name="gint" c:type="gint"/>
+      </field>
+    </record>
+    <function name="image_surface_create" c:identifier="cairo_image_surface_create">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+      </parameters>
+    </function>
+  </namespace>
+</repository>
-- 
cgit v1.2.1