From 81e8c8dec902e1e3b6277ebad5804f2321535332 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 13 Jul 2011 14:20:47 +0100
Subject: [PATCH] build: Detect the appropriate default flavour

If we're building on/for Windows, set 'win32' as the default flavour; if
we're building on OS X, set 'osx' as the default flavour. For everything
else, use 'glx'.
---
 clutter/clutter-actor.c |  8 ++++++++
 clutter/clutter-actor.h | 16 +++++++++++++---
 configure.ac            |  8 +++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index ce0b94d85..87d826873 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -6110,6 +6110,8 @@ clutter_actor_get_allocation_box (ClutterActor    *self,
  * The returned rectangle is in pixels.
  *
  * Since: 0.8
+ *
+ * Deprecated: 1.8: Use clutter_actor_get_allocation_box() instead.
  */
 void
 clutter_actor_get_allocation_geometry (ClutterActor    *self,
@@ -6244,6 +6246,9 @@ clutter_actor_allocate (ClutterActor           *self,
  * size, in pixels. This means the untransformed actor will have the
  * given geometry. This is the same as calling clutter_actor_set_position()
  * and clutter_actor_set_size().
+ *
+ * Deprecated: 1.8: Use clutter_actor_set_position() and
+ *   clutter_actor_set_size() instead.
  */
 void
 clutter_actor_set_geometry (ClutterActor          *self,
@@ -6266,6 +6271,9 @@ clutter_actor_set_geometry (ClutterActor          *self,
  * actor. This is the same as calling clutter_actor_get_position() and
  * clutter_actor_get_size(). It tries to "do what you mean" and get the
  * requested size and position if the actor's allocation is invalid.
+ *
+ * Deprecated: 1.8: Use clutter_actor_get_position() and
+ *   clutter_actor_get_size() instead.
  */
 void
 clutter_actor_get_geometry (ClutterActor    *self,
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 832d901af..3110a486f 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -385,15 +385,25 @@ void                  clutter_actor_allocate_align_fill       (ClutterActor
                                                                ClutterAllocationFlags flags);
 void                  clutter_actor_get_allocation_box        (ClutterActor          *self,
                                                                ClutterActorBox       *box);
+
+#ifndef CLUTTER_DISABLE_DEPRECATED
 void                  clutter_actor_get_allocation_geometry   (ClutterActor          *self,
-                                                               ClutterGeometry       *geom);
+                                                               ClutterGeometry       *geom)
+                                                               G_GNUC_DEPRECATED_FOR(clutter_actor_get_allocation_box);
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 void                  clutter_actor_get_allocation_vertices   (ClutterActor          *self,
 							       ClutterActor          *ancestor,
                                                                ClutterVertex          verts[]);
+#ifndef CLUTTER_DISABLE_DEPRECATED
 void                  clutter_actor_set_geometry              (ClutterActor          *self,
-                                                               const ClutterGeometry *geometry);
+                                                               const ClutterGeometry *geometry)
+                                                               G_GNUC_DEPRECATED;
 void                  clutter_actor_get_geometry              (ClutterActor          *self,
-                                                               ClutterGeometry       *geometry);
+                                                               ClutterGeometry       *geometry)
+                                                               G_GNUC_DEPRECATED;
+#endif /* CLUTTER_DISABLE_DEPRECATED */
+
 void                  clutter_actor_set_size                  (ClutterActor          *self,
                                                                gfloat                 width,
                                                                gfloat                 height);
diff --git a/configure.ac b/configure.ac
index 50d4a55f4..09972d687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,9 @@ AS_CASE([$host],
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
 
+AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no])
+AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
+
 AC_SUBST(CLUTTER_LT_VERSION)
 AC_SUBST(CLUTTER_LT_LDFLAGS)
 
@@ -167,7 +170,10 @@ AC_SUBST(CLUTTER_LINK_FLAGS)
 dnl ========================================================================
 
 # defaults
-CLUTTER_FLAVOUR=glx
+AS_IF([test "x$platform_win32" = "xyes"],  [CLUTTER_FLAVOUR=win32],
+      [test "x$platform_quartz" = "xyes"], [CLUTTER_FLAVOUR=osx],
+      [CLUTTER_FLAVOUR=glx])
+
 FLAVOUR_LIBS=""
 FLAVOUR_CFLAGS=""
 CLUTTER_WINSYS_BASE=