From 59ffa9abdd9f08df99c184b34a54cb452bcbc268 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 18 May 2012 11:02:49 +0100 Subject: [PATCH] Don't build cogl-gles2-gears if configured with --disable-cogl-gles2 The cogl-gles2-gears example will fail to build unless --enable-cogl-gles2 is enabled in the configure script because it depends on libcogl-gles2. This patch makes it only conditionally build the example depending on the BUILD_COGL_GLES2 automake conditional. Reviewed-by: Robert Bragg (cherry picked from commit 7f57e9c444b6353ac17e920ea4fc63ebe3cc29d3) --- examples/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7dedee41d..cb2964083 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -24,7 +24,7 @@ cogl_info_SOURCES = cogl-info.c cogl_info_LDADD = $(common_ldadd) if USE_GLIB -programs += cogl-hello cogl-msaa cogl-gles2-context cogl-gles2-gears +programs += cogl-hello cogl-msaa cogl-gles2-context examples_datadir = $(pkgdatadir)/examples-data examples_data_DATA = @@ -66,9 +66,12 @@ endif cogl_gles2_context_SOURCES = cogl-gles2-context.c cogl_gles2_context_LDADD = $(common_ldadd) +if BUILD_COGL_GLES2 +programs += cogl-gles2-gears cogl_gles2_gears_SOURCES = cogl-gles2-gears.c cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS) cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la +endif endif #USE_GLIB