diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-07 21:09:02 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-07 21:49:19 +0800 |
| commit | 9fd5a0d64710c248045f245317f8d9e4ddbf005b (patch) | |
| tree | 8393d01bb541207a0e973718de9823632f282c78 /configure.ac | |
| parent | b9ae519cbeec01245b6f589a60d6fb63d730d19a (diff) | |
| download | gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar.gz gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar.bz2 gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar.lz gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar.xz gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.tar.zst gsoc2013-empathy-9fd5a0d64710c248045f245317f8d9e4ddbf005b.zip | |
Simplify checking of the deps
The empathy/libempathy/libempathy-gtk border is less clear than it used to be
so there is not point continuing checking deps separately.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 60 |
1 files changed, 10 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac index 6f965737e..f0aeb2cb6 100644 --- a/configure.ac +++ b/configure.ac @@ -139,67 +139,27 @@ AC_SUBST(ERROR_CFLAGS) # Pkg-Config dependency checks # ----------------------------------------------------------- -PKG_CHECK_MODULES(LIBEMPATHY, +PKG_CHECK_MODULES(EMPATHY, [ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 + dbus-glib-1 + farsight2-0.10 + gconf-2.0 >= $GCONF_REQUIRED + gdk-x11-2.0 gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED - libxml-2.0 - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - telepathy-farsight - farsight2-0.10 - gstreamer-0.10 - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(LIBEMPATHYGTK, -[ - glib-2.0 >= $GLIB_REQUIRED + gnome-keyring-1 >= $KEYRING_REQUIRED gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED - x11 - gtk+-2.0 >= $GTK_REQUIRED - libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - farsight2-0.10 gstreamer-0.10 gstreamer-interfaces-0.10 - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(EMPATHY, -[ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gdk-x11-2.0 gtk+-2.0 >= $GTK_REQUIRED + libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 - dbus-glib-1 - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + libxml-2.0 telepathy-farsight - farsight2-0.10 - gstreamer-0.10 - unique-1.0 >= $UNIQUE_REQUIRED - gnome-keyring-1 >= $KEYRING_REQUIRED - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(LIBEMPATHY_ACCOUNTS_PANEL, -[ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gdk-x11-2.0 - gtk+-2.0 >= $GTK_REQUIRED - libebook-1.2 - dbus-glib-1 telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - unique-1.0 >= $UNIQUE_REQUIRED - gnome-keyring-1 >= $KEYRING_REQUIRED telepathy-logger-0.1 >= $TELEPATHY_LOGGER + unique-1.0 >= $UNIQUE_REQUIRED + x11 ]) PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) |