diff --git a/.gitignore b/.gitignore index cb975f476..960b261ce 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 b12041bff..8294a8a24 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 abbe151c3..bfcdeda70 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