diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-01-31 11:33:47 +0000 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-01-31 14:19:43 +0000 |
| commit | dc2d3c0aaea0d06759a797ff1f5425e0851d5df5 (patch) | |
| tree | 247b8f35899a1a2ccfb4a5c31ee318222be88a38 /configure.ac | |
| parent | bbe7e01f09003093c8b04248a8b2597e43d36214 (diff) | |
| download | clutter-gst-dc2d3c0aaea0d06759a797ff1f5425e0851d5df5.tar.gz | |
Bump Cogl dependency to 1.10
Cogl 1.10 introduced new boilerplate for shaders. This commit cleans
up our shaders.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 5e7f373..481896c 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AC_SUBST([CLUTTER_GST_RELEASE_STATUS], [clutter_gst_release_status]) # pkg-config requirements GLIB_REQ_VERSION=2.18.0 +COGL_REQ_VERSION=1.10.0 CLUTTER_REQ_VERSION=1.6.0 GSTREAMER_REQ_VERSION=1.0.0 GST_PLUGINS_BAD_REQ_VERSION=1.0.0 @@ -140,6 +141,7 @@ dnl ======================================================================== PKG_CHECK_MODULES(CLUTTER_GST, [clutter-1.0 >= $CLUTTER_REQ_VERSION + cogl-1.0 >= $COGL_REQ_VERSION gio-2.0 >= $GLIB_REQ_VERSION]) dnl ======================================================================== @@ -193,15 +195,10 @@ PKG_CHECK_EXISTS([clutter-osx-1.0], [ AC_DEFINE([HAVE_CLUTTER_OSX], [1], ["Defined if building Clutter for OS X"]) - ]) -PKG_CHECK_EXISTS([cogl-1.0 >= 1.8.0], - [ - have_cogl_1_8=yes - AC_DEFINE([HAVE_COGL_1_8], [1], - ["Defined if cogl-1.0 >= 1.8.0 is available"]) + have_cogl_osx=yes ]) -AS_IF([test "x$have_cogl_1_8" != xyes], +AS_IF([test "x$have_cogl_osx" = xyes], [ clutter_soname=`$PKG_CONFIG --variable soname_infix clutter-1.0` AS_CASE([$clutter_soname], |