--- cogl-1.8.0/tests/conform/Makefile.am-orig 2011-10-04 19:51:58.584334577 -0500

+++ cogl-1.8.0/tests/conform/Makefile.am 2011-10-04 19:52:03.938887679 -0500

@@ -113,7 +113,7 @@ test_conformance_CPPFLAGS = \

-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \

-DCLUTTER_COMPILATION

-test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)

+test_conformance_CFLAGS = -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS)

test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la

test_conformance_LDFLAGS = -export-dynamic

--- cogl-1.10.2/tests/conform/test-bitmask.c-orig 2012-05-03 00:28:43.539377854 -0500

+++ cogl-1.10.2/tests/conform/test-bitmask.c 2012-05-03 00:28:48.890781597 -0500

@@ -1,3 +1,5 @@

+#include "config.h"

+

#include <cogl/cogl.h>

#include <string.h>