2007-02-14 Matthew Allum <mallum@openedhand.com>

        * clutter/Makefile.am:
        * clutter/clutter-main.c:
        * clutter/clutter-stage.c:
        * clutter/clutter-version.h.in:
        * configure.ac:
        * examples/super-oh.c:
        Add CLUTTER_FLAVOUR define.

diff --git a/ChangeLog b/ChangeLog
index 2c1568d..e060026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-14  Matthew Allum  <mallum@openedhand.com>
+
+       * clutter/Makefile.am:
+       * clutter/clutter-main.c:
+       * clutter/clutter-stage.c:
+       * clutter/clutter-version.h.in:
+       * configure.ac:
+       * examples/super-oh.c:
+       Add CLUTTER_FLAVOUR define.
+
 2007-02-13  Matthew Allum  <mallum@openedhand.com>
 
        * examples/super-oh.c: (screensaver_setup):

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 6a838f7..61f0a97 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -141,8 +141,7 @@ INCLUDES = \
        -DG_LOG_DOMAIN=\"Clutter\" \
        $(GCC_FLAGS) \
        $(CLUTTER_CFLAGS) \
-       $(CLUTTER_DEBUG_CFLAGS) \
-       -DCLUTTER_BACKEND_GLX
+       $(CLUTTER_DEBUG_CFLAGS) 
 
 lib_LTLIBRARIES = libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
 

diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index cc53a24..2006acc 100644 (file)
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -42,8 +42,9 @@
 #include "clutter-stage.h"
 #include "clutter-private.h"
 #include "clutter-debug.h"
+#include "clutter-version.h"   /* For flavour define */
 
-#ifdef CLUTTER_BACKEND_GLX
+#ifdef CLUTTER_FLAVOUR_GLX
 #include <clutter/clutter-backend-glx.h>
 #endif
 

diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 123c758..7dc3a85 100644 (file)
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -41,12 +41,13 @@
 #include "clutter-enum-types.h"
 #include "clutter-private.h"
 #include "clutter-debug.h"
+#include "clutter-version.h"   /* For flavour */
 
-#ifdef CLUTTER_BACKEND_GLX
+#ifdef CLUTTER_FLAVOUR_GLX
 #include <clutter/clutter-stage-glx.h>
 #endif
 
-#ifdef CLUTTER_BACKEND_EGL
+#ifdef CLUTTER_FLAVOUR_EGL
 #include <clutter/clutter-stage-egl.h>
 #endif
 

diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index 2bebb82..9eba853 100644 (file)
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -41,4 +41,6 @@
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION > (micro)))
 
+#define @CLUTTER_FLAVOUR_DEFINE@
+
 #endif /* __CLUTTER_VERSION_H__ */

diff --git a/configure.ac b/configure.ac
index 1796de1..10a423b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,9 @@ fi
 GLX_CFLAGS="$X11_CFLAGS"
 
 CLUTTER_FLAVOUR="glx"
+CLUTTER_FLAVOUR_DEFINE="CLUTTER_FLAVOUR_GLX"
 AC_SUBST(CLUTTER_FLAVOUR)
+AC_SUBST(CLUTTER_FLAVOUR_DEFINE)
 
 dnl ========================================================================
 

diff --git a/examples/super-oh.c b/examples/super-oh.c
index 881fec4..aa601b8 100644 (file)
--- a/examples/super-oh.c
+++ b/examples/super-oh.c
@@ -1,5 +1,7 @@
 #include <clutter/clutter.h>
+#ifdef CLUTTER_FLAVOUR_GLX
 #include <clutter/clutter-backend-glx.h>
+#endif
 #include <math.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -38,6 +40,7 @@ get_radius (void)
 void
 screensaver_setup (void)
 {
+#ifdef CLUTTER_FLAVOUR_GLX
   Window         remote_xwindow;
   const char    *preview_xid;
   gboolean       foreign_success = FALSE;
@@ -60,6 +63,7 @@ screensaver_setup (void)
 
   if (!foreign_success)
     clutter_actor_set_size (clutter_stage_get_default(), 800, 600);
+#endif
 }
 
 /* input handler */