brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-04-29 Robert Bragg <bob@o-hand.com>

Browse Source 
* 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.
This commit is contained in:
Robert Bragg 2008-04-29 12:22:39 +00:00
parent 122e1dafd1
commit cc24c99df2
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-04-29 Robert Bragg <bob@o-hand.com>
* 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 <neil@o-hand.com> 2008-04-28 Neil Roberts <neil@o-hand.com>
Fixed 'make dist' Fixed 'make dist'

17
configure.ac
View File

@ -136,7 +136,7 @@ if test x$have_x11 = xno; then
fi fi
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 if test x$have_xfixes = xyes; then
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension]) AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
X11_LIBS="$X11_LIBS -lXfixes" X11_LIBS="$X11_LIBS -lXfixes"
@ -192,11 +192,18 @@ case $glesversion in
AC_CHECK_LIB(GLES_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no) AC_CHECK_LIB(GLES_CM, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no)
if test "x$HAVE_LIBGLES" = "xno"; then 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 if test "x$HAVE_LIBGLES" = "xno"; then
AC_MSG_ERROR([GLES library not found and egl backend requested.]);
fi AC_CHECK_LIB(gles_cm, eglInitialize, HAVE_LIBGLES=yes, HAVE_LIBGLES=no)
GLES_LIBS="-lgles_cm" 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 else
GLES_LIBS="-lGLES_CM" GLES_LIBS="-lGLES_CM"