[clutter] build: include <cairo.h> not <cairo/cairo.h>

[Robert Bragg <rbragg src gnome org>]

commit 7b4f7cd3e054121a64c113cb696502faaa90540b
Author: Robert Bragg <robert linux intel com>
Date:   Fri Jun 10 17:48:54 2011 +0100

    build: include <cairo.h> not <cairo/cairo.h>
    
    cairo.h is intended to be included as <cairo.h> not <cairo/cairo.h> as
    is the style for clutter.h. If you have installed cairo to a custom
    prefix then using cairo/cairo.h can result in unintentional use of the
    system cairo headers, or if they aren't installed then it will result in
    a failure to find the header.

 clutter/clutter-stage.c              |    2 +-
 tests/conform/test-path.c            |    2 +-
 tests/interactive/test-bin-layout.c  |    2 +-
 tests/interactive/test-flow-layout.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 25c5f84..220e00e 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -53,7 +53,7 @@
 #include "config.h"
 #endif
 
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 #include "clutter-stage.h"
 
diff --git a/tests/conform/test-path.c b/tests/conform/test-path.c
index b2de235..9790c0e 100644
--- a/tests/conform/test-path.c
+++ b/tests/conform/test-path.c
@@ -1,5 +1,5 @@
 #include <clutter/clutter.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/tests/interactive/test-bin-layout.c b/tests/interactive/test-bin-layout.c
index 7414b7a..d5aa4d3 100644
--- a/tests/interactive/test-bin-layout.c
+++ b/tests/interactive/test-bin-layout.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <gmodule.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <clutter/clutter.h>
 
 static const ClutterColor bg_color = { 0xcc, 0xcc, 0xcc, 0x99 };
diff --git a/tests/interactive/test-flow-layout.c b/tests/interactive/test-flow-layout.c
index e0d6024..82c2f30 100644
--- a/tests/interactive/test-flow-layout.c
+++ b/tests/interactive/test-flow-layout.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <gmodule.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <clutter/clutter.h>
 
 #define N_RECTS         20