[cogl] egl-gdl: Correctly substitute COGL_CEX100_LIBGDL_PREFIX

[Damien Lespiau <dlespiau src gnome org>]

commit a53af153c35ef49eaf5cfdaa0699f969395c307b
Author: Damien Lespiau <damien lespiau intel com>
Date:   Fri Jul 22 18:36:54 2011 +0300

    egl-gdl: Correctly substitute COGL_CEX100_LIBGDL_PREFIX
    
    We weren't defining CLUTTER_CEX100_LIBGDL_PREFIX in the configure.ac and
    thus failing to compile when selecting the EGL/GDL winsys. Take the
    opportunity to rename that to COGL_CEX100_LIBGDL_PREFIX
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655355

 .gitignore                                 |    1 +
 cogl/{cogl-display.h => cogl-display.h.in} |    2 +-
 configure.ac                               |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb975f4..960b261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ stamp-marshal
 *.gir
 *.typelib
 /cogl/cogl-defines.h
+/cogl/cogl-display.h
 /cogl/cogl-enum-types.c
 /cogl/cogl-enum-types.h
 config.*
diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h.in
similarity index 98%
rename from cogl/cogl-display.h
rename to cogl/cogl-display.h.in
index b12041b..8294a8a 100644
--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h.in
@@ -37,7 +37,7 @@
 G_BEGIN_DECLS
 
 #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
-#include <@CLUTTER_CEX100_LIBGDL_PREFIX libgdl h>
+#include <@COGL_CEX100_LIBGDL_PREFIX libgdl h>
 #endif
 
 /**
diff --git a/configure.ac b/configure.ac
index abbe151..bfcdeda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,9 +652,13 @@ AS_IF([test "x$enable_gdl_egl_platform" == "xyes"],
           [
             AC_CHECK_HEADERS(
               [CE4100/libgdl.h],
-              [COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100"],
+              [
+               COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100",
+               COGL_CEX100_LIBGDL_PREFIX=CE4100/
+              ],
               [AC_MSG_ERROR([libgdl.h not found])])
           ])
+        AC_SUBST([COGL_CEX100_LIBGDL_PREFIX])
 
         COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT"
       ])
@@ -950,6 +954,7 @@ cogl/Makefile
 cogl/cogl-1.0.pc
 cogl/cogl-2.0-experimental.pc
 cogl/cogl-defines.h
+cogl/cogl-display.h
 cogl-pango/Makefile
 cogl-pango/cogl-pango-1.0.pc
 cogl-pango/cogl-pango-2.0-experimental.pc