diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-11-29 15:48:27 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-11-29 15:49:06 +0100 |
| commit | 317cd9e4b501bb495e69912bf99398fdb0f0cf0b (patch) | |
| tree | 927ebb1f8c81463f049565d417602889cf44e387 | |
| parent | c8655024da08f5a9c4b2e8e6c811fe5c2d13277e (diff) | |
pc: add gudev and cheese as Requires if needed
https://bugzilla.gnome.org/show_bug.cgi?id=710919
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | telepathy-account-widgets-uninstalled.pc.in | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4662e6d8..7a5b070d 100644 --- a/configure.ac +++ b/configure.ac @@ -256,6 +256,13 @@ $UDEV_PKG_ERRORS]) fi AM_CONDITIONAL(HAVE_UDEV, test "x$have_gudev" = "xyes") +if test x${have_gudev} = x"yes" ; then + REQUIRE_UDEV=", gudev-1.0" +else + REQUIRE_UDEV="" +fi +AC_SUBST(REQUIRE_UDEV) + # ----------------------------------------------------------- # Cheese (optional dependency for avatar selection) # ----------------------------------------------------------- @@ -279,6 +286,13 @@ else fi AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) +if test x${have_cheese} = x"yes" ; then + REQUIRE_CHEESE=", cheese-gtk" +else + REQUIRE_CHEESE="" +fi +AC_SUBST(REQUIRE_CHEESE) + # ----------------------------------------------------------- # ubuntu-online-accounts support # ----------------------------------------------------------- diff --git a/telepathy-account-widgets-uninstalled.pc.in b/telepathy-account-widgets-uninstalled.pc.in index b6546bfa..1acc1fc1 100644 --- a/telepathy-account-widgets-uninstalled.pc.in +++ b/telepathy-account-widgets-uninstalled.pc.in @@ -8,6 +8,6 @@ uoa_provider=@TPAW_UOA_PROVIDER@ Name: telepathy-account-widgets (uninstalled copy) Description: Widgets and utility functions for configuring Telepathy accounts Version: @VERSION@ -Requires: pkg-config >= 0.21, glib-2.0 >= 2.33.3, gobject-2.0 >= 2.33.3, gtk+-3.0 >= 3.5.1, telepathy-glib >= 0.19.9, libxml-2.0, libsecret-1 >= 0.5 +Requires: pkg-config >= 0.21, glib-2.0 >= 2.33.3, gobject-2.0 >= 2.33.3, gtk+-3.0 >= 3.5.1, telepathy-glib >= 0.19.9, libxml-2.0, libsecret-1 >= 0.5@REQUIRE_CHEESE@@REQUIRE_UDEV@ Libs: ${abs_top_builddir}/tp-account-widgets/libtp-account-widgets.la Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} |