From 46bed23302a56eec8cb873670396927d2739ce71 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 18 Jun 2010 00:29:12 +0100 Subject: [PATCH] tslib: Add USE_TSLIB conditional for clutter-event-tslib.c This adds an automake USE_TSLIB condition to decide when we should compile clutter-event-tslib.c. This is in preparation for consolidating the eglx and eglnative backends. --- clutter/eglnative/Makefile.am | 6 +++++- configure.ac | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clutter/eglnative/Makefile.am b/clutter/eglnative/Makefile.am index 0b1a703ea..980e6afad 100644 --- a/clutter/eglnative/Makefile.am +++ b/clutter/eglnative/Makefile.am @@ -17,9 +17,13 @@ noinst_LTLIBRARIES = libclutter-eglnative.la libclutter_eglnative_la_SOURCES = \ clutter-backend-egl.h \ clutter-backend-egl.c \ - clutter-event-tslib.c \ clutter-stage-egl.h \ clutter-stage-egl.c \ clutter-egl-headers.h + +if USE_TSLIB +libclutter_eglnative_la_SOURCES += clutter-event-tslib.c +endif + libclutter_eglnative_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) libclutter_eglnative_la_LIBADD = $(common_ldadd) diff --git a/configure.ac b/configure.ac index 1bba337b5..3336eaffc 100644 --- a/configure.ac +++ b/configure.ac @@ -424,6 +424,8 @@ AS_IF([test "x$COGL_DRIVER" = "xgles"], ] ) +AM_CONDITIONAL(USE_TSLIB, [test "x$have_tslib" = "xyes"]) + AM_CONDITIONAL(USE_GLES2_WRAPPER, [test "x$use_gles2_wrapper" = "xyes"]) # at this point we must have a GL header to check