diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-04-19 17:42:48 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-05-03 11:43:24 +0100 |
| commit | ba22f80e019b14e510ba45e916c589e023edf6ac (patch) | |
| tree | 347da78d3b3de4992a876d929d4d6d32797f70bc | |
| parent | 42d888a08337676e8cbc8bfa4aa1c82c1843ccaa (diff) | |
| download | clutter-ba22f80e019b14e510ba45e916c589e023edf6ac.tar.gz | |
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.
| -rw-r--r-- | 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 c8006ac54..f79ec9d47 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]) |