From 0681a25825b02dd661ffe0aa72661e6b12ee8dc4 Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Mon, 31 Dec 2007 11:22:11 +0000 Subject: [PATCH] 2007-12-31 Tomas Frydrych * configure.ac: * clutter.pc.in: Added CLUTTER_REQUIRES automake var to allow deps in clutter.pc to be backend-specific. --- ChangeLog | 9 ++++++++- clutter.pc.in | 3 ++- configure.ac | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06712bacc..83b1a3eb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-12-31 Tomas Frydrych + + * configure.ac: + * clutter.pc.in: + Added CLUTTER_REQUIRES automake var to allow deps in clutter.pc to + be backend-specific. + 2007-12-28 Emmanuele Bassi * clutter/clutter-texture.c: @@ -21,7 +28,7 @@ * clutter/clutter-script.c: (warn_missing_attribute): Fix for emacs-style warnings - + (clutter_script_parse_node): Remove an ifdeffed out section (clutter_script_construct_parameters), diff --git a/clutter.pc.in b/clutter.pc.in index a9a8f775f..7a2124c31 100644 --- a/clutter.pc.in +++ b/clutter.pc.in @@ -4,10 +4,11 @@ libdir=${exec_prefix}/lib includedir=${prefix}/include backend=@clutterbackend@ apiversion=@CLUTTER_API_VERSION@ +requires=@CLUTTER_REQUIRES@ Name: Clutter Description: Clutter Core Library (${backend} backend) Version: @VERSION@ Libs: -L${libdir} -lclutter-${backend}-${apiversion} Cflags: -I${includedir}/clutter-${apiversion} -Requires: glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 pangoft2 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 +Requires: ${requires} \ No newline at end of file diff --git a/configure.ac b/configure.ac index a4b7b1bef..fa3007ca9 100644 --- a/configure.ac +++ b/configure.ac @@ -304,8 +304,10 @@ AC_SUBST([clutterbackendlib]) dnl ======================================================================== -pkg_modules="pangoft2 glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 gdk-pixbuf-2.0 $BACKEND_PC_FILES" -PKG_CHECK_MODULES(CLUTTER_DEPS, [$pkg_modules]) +CLUTTER_REQUIRES="pangoft2 glib-2.0 >= 2.14 gobject-2.0 gthread-2.0 gdk-pixbuf-2.0 $BACKEND_PC_FILES" +PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES]) + +AC_SUBST(CLUTTER_REQUIRES) dnl ========================================================================