diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
| commit | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (patch) | |
| tree | c191578379fbc693b0616b4fd933f8f3322d4dd2 /configure.ac | |
| parent | 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd (diff) | |
| parent | 2b263049bd152504227c9ade7e7b6e17cbc95f11 (diff) | |
| download | gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.gz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.bz2 gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.lz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.xz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.zst gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.zip | |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-accounts.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5d6905e38..0ff4ea8ca 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ ISO_CODES_REQUIRED=0.35 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 CHAMPLAIN_REQUIRED=0.12.1 +CHEESE_GTK_REQUIRED=3.4.0 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -477,7 +478,7 @@ AC_ARG_WITH([cheese], with_cheese=auto) if test x"$with_cheese" != x"no" ; then - PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no]) + PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= CHEESE_GTK_REQUIRED, [have_cheese=yes], [have_cheese=no]) if test x${have_cheese} = xyes; then AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support]) fi |