[clutter/wip/cogl-winsys-egl: 26/30] cogl/configure.ac: fix pkg-config checks
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/cogl-winsys-egl: 26/30] cogl/configure.ac: fix pkg-config checks
- Date: Wed, 20 Apr 2011 13:00:16 +0000 (UTC)
commit 71d85ef68cfd073ec30407b42fc09356085ca2eb
Author: Robert Bragg <robert linux intel com>
Date: Tue Apr 19 17:42:48 2011 +0100
cogl/configure.ac: fix pkg-config checks
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.
clutter/cogl/configure.ac | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/clutter/cogl/configure.ac b/clutter/cogl/configure.ac
index 5433b12..eed920f 100644
--- a/clutter/cogl/configure.ac
+++ b/clutter/cogl/configure.ac
@@ -214,9 +214,8 @@ AC_ARG_ENABLE(
[],
enable_gdk_pixbuf=yes
)
-
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
have_gdk_pixbuf=no
fi
@@ -615,7 +614,7 @@ AM_PATH_GLIB_2_0([glib_req_version],
[gobject gthread gmodule-no-export])
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)
PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]