2007-12-31 Tomas Frydrych <tf@openedhand.com>
authorTomas Frydrych <tf@openedhand.com>
Mon, 31 Dec 2007 11:22:11 +0000 (11:22 +0000)
committerTomas Frydrych <tf@openedhand.com>
Mon, 31 Dec 2007 11:22:11 +0000 (11:22 +0000)
* configure.ac:
* clutter.pc.in:
Added CLUTTER_REQUIRES automake var to allow deps in clutter.pc to
be backend-specific.

ChangeLog
clutter.pc.in
configure.ac

index 06712ba..83b1a3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-31  Tomas Frydrych  <tf@openedhand.com>
+
+       * 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  <ebassi@openedhand.com>
 
        * 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),
index a9a8f77..7a2124c 100644 (file)
@@ -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
index a4b7b1b..fa3007c 100644 (file)
@@ -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 ========================================================================