diff options
| author | David King <amigadave@amigadave.com> | 2014-09-10 14:12:36 +0100 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2014-09-10 14:12:36 +0100 |
| commit | fb13dc2b221bdf1be4233c49218776b63f51d2fa (patch) | |
| tree | eecb3389208e57149417661096b8691cf00c6b7e | |
| parent | 6efd4960cfc57bea26fb7d169a5f600164f0bfd9 (diff) | |
Remove some unnecessary pkg-config dependencies
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 8 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index d6d98031..352c82d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -178,11 +178,7 @@ Cheese_3_0_gir_FILES = \ $(noinst_libcheese_headers) \ libcheese/cheese-enums.h Cheese_3_0_gir_INCLUDES = \ - GObject-2.0 \ - GLib-2.0 \ Gst-1.0 \ - GstBase-1.0 \ - cairo-1.0 \ Clutter-1.0 \ GdkPixbuf-2.0 Cheese_3_0_gir_LIBS = libcheese.la diff --git a/configure.ac b/configure.ac index f7e1af6a..c79d9c56 100644 --- a/configure.ac +++ b/configure.ac @@ -59,16 +59,10 @@ IT_PROG_INTLTOOL([0.50.0]) GLIB_REQUIRED="glib-2.0 >= 2.39.90" GTK_REQUIRED="gtk+-3.0 >= 3.13.4" GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0" -LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6" -GSTREAMER_VERSION=0.11.0 -GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION" -GSTREAMER_PLUGINS_BAD_VERSION=0.11.0 -GSTREAMER_PLUGINS_BAD_REQUIRED="gstreamer-plugins-bad-1.0 >= $GSTREAMER_PLUGINS_BAD_VERSION" -CAIRO_REQUIRED="cairo >= 1.10.0" -PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0" -LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0" +GSTREAMER_REQUIRED="gstreamer-pbutils-1.0" +LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0" CLUTTER_REQUIRED="clutter-1.0 >= 1.13.2" -CLUTTERGTK_REQUIRED="clutter-gtk-1.0 >= 0.91.8" +CLUTTERGTK_REQUIRED="clutter-gtk-1.0" CLUTTERGST_REQUIRED="clutter-gst-2.0 >= 1.9.0" LIBCANBERRA_REQUIRED="libcanberra-gtk3 >= 0.26" X11_REQUIRED="x11" @@ -103,21 +97,20 @@ PKG_CHECK_MODULES([CHEESE], $X11_REQUIRED $GDK_PIXBUF_REQUIRED $GSTREAMER_REQUIRED - $GSTREAMER_PLUGINS_BAD_REQUIRED $LIBGNOMEDESKTOP_REQUIRED - $CAIRO_REQUIRED - $PANGOCAIRO_REQUIRED $CLUTTER_REQUIRED $CLUTTERGST_REQUIRED $UDEV_REQUIRED]) PKG_CHECK_MODULES([CHEESE_GTK], [$GTK_REQUIRED - $LIBRSVG_REQUIRED $CLUTTERGTK_REQUIRED $LIBCANBERRA_REQUIRED - $UDEV_REQUIRED - $GNOME_VIDEO_EFFECTS_REQUIRED]) + $UDEV_REQUIRED]) + +PKG_CHECK_EXISTS([$GNOME_VIDEO_EFFECTS_REQUIRED], + [], + [AC_MSG_WARN([The $GNOME_VIDEO_EFFECTS_REQUIRED package is required at runtime for effects])]) # GLib programs. AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`]) |