diff --git a/.gitignore b/.gitignore index 5061a5ebd..5a17a47b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ 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.in b/cogl/cogl-display.h similarity index 98% rename from cogl/cogl-display.h.in rename to cogl/cogl-display.h index 11db8650b..15f580ed9 100644 --- a/cogl/cogl-display.h.in +++ b/cogl/cogl-display.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT -#include <@COGL_CEX100_LIBGDL_PREFIX@libgdl.h> +#include #endif /** diff --git a/configure.ac b/configure.ac index 5bb4980d9..0efb9535a 100644 --- a/configure.ac +++ b/configure.ac @@ -653,14 +653,12 @@ 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_CEX100_LIBGDL_PREFIX=CE4100/ + COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -I/usr/include/CE4100" ], [AC_MSG_ERROR([libgdl.h not found])]) ]) - AC_SUBST([COGL_CEX100_LIBGDL_PREFIX]) - COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lgdl" + COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lgdl" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_GDL_SUPPORT" ]) @@ -956,7 +954,6 @@ 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