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

cogl/configure.ac: fix pkg-config checks

Browse Source 
This fixes the gdk-pixbuf check to not mistakenly check for the "xi"
package instead of gdk-pixbuf and remove a spurious listing "gl" in
COGL_PKG_REQUIRES which should only be there when we are using using
opengl not if we are using gles.
This commit is contained in:
Robert Bragg 2011-04-19 17:42:48 +01:00
parent 8bde73529f
commit 2303e4d603
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/cogl/configure.ac
View File

@ -214,9 +214,8 @@ AC_ARG_ENABLE(
[], [],
enable_gdk_pixbuf=yes enable_gdk_pixbuf=yes
) )
if test "x$enable_gdk_pixbuf" = "xyes"; then if test "x$enable_gdk_pixbuf" = "xyes"; then
PKG_CHECK_EXISTS([xi], [have_gdk_pixbuf=yes], [have_gdk_pixbuf=no]) PKG_CHECK_EXISTS([gdk-pixbuf-2.0], [have_gdk_pixbuf=yes], [have_gdk_pixbuf=no])
else else
have_gdk_pixbuf=no have_gdk_pixbuf=no
fi fi
@ -615,7 +614,7 @@ AM_PATH_GLIB_2_0([glib_req_version],
[gobject gthread gmodule-no-export]) [gobject gthread gmodule-no-export])
AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required])) AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required]))
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0 pangocairo >= pangocairo_req_version gl" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0 pangocairo >= pangocairo_req_version"
AC_SUBST(COGL_PKG_REQUIRES) AC_SUBST(COGL_PKG_REQUIRES)
PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES]) PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES])