From cc24c99df28faee9bf598efe18bbee4fb09fb758 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 29 Apr 2008 12:22:39 +0000 Subject: [PATCH] 2008-04-29 Robert Bragg * clutter/configure.ac: When looking for a GLES 1 library, also try the name "GLESv1_CM". This also reduces the xfixes version requirement to v3, since we dont need support for Show/HideCursor. --- ChangeLog | 8 ++++++++ configure.ac | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e90e0239..ed6b8c378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-29 Robert Bragg + + * clutter/configure.ac: + When looking for a GLES 1 library, also try the name "GLESv1_CM". + + This also reduces the xfixes version requirement to v3, since we dont + need support for Show/HideCursor. + 2008-04-28 Neil Roberts Fixed 'make dist' diff --git a/configure.ac b/configure.ac index 14bd6a655..2e5ed4bdd 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,7 @@ if test x$have_x11 = xno; then fi fi -PKG_CHECK_MODULES(XFIXES, xfixes >= 4, [have_xfixes=yes], [have_xfixes=no]) +PKG_CHECK_MODULES(XFIXES, xfixes >= 3, [have_xfixes=yes], [have_xfixes=no]) if test x$have_xfixes = xyes; then AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) X11_LIBS="$X11_LIBS -lXfixes" @@ -192,11 +192,18 @@ case $glesversion in AC_CHECK_LIB(GLES_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) if test "x$HAVE_LIBGLES" = "xno"; then - AC_CHECK_LIB(gles_cm, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) + AC_CHECK_LIB(GLESv1_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) if test "x$HAVE_LIBGLES" = "xno"; then - AC_MSG_ERROR([GLES library not found and egl backend requested.]); - fi - GLES_LIBS="-lgles_cm" + + AC_CHECK_LIB(gles_cm, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) + if test "x$HAVE_LIBGLES" = "xno"; then + AC_MSG_ERROR([GLES library not found and egl backend requested.]); + else + GLES_LIBS="-lgles_cm" + fi + else + EGL_LIBS="GLESv1_CM" + fi else GLES_LIBS="-lGLES_CM"