diff options
| -rw-r--r-- | configure.ac | 60 | ||||
| -rw-r--r-- | extensions/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 4 |
4 files changed, 15 insertions, 55 deletions
diff --git a/configure.ac b/configure.ac index 6f965737..f0aeb2cb 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) diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 8ea05ae6..a60994b7 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(WARN_CFLAGS) \ - $(LIBEMPATHY_CFLAGS) + $(EMPATHY_CFLAGS) EXTRA_DIST = \ all.xml \ diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 43763d56..2a891bc7 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ - $(LIBEMPATHYGTK_CFLAGS) \ + $(EMPATHY_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ @@ -129,7 +129,7 @@ nodist_libempathy_gtk_la_SOURCES =\ $(BUILT_SOURCES) libempathy_gtk_la_LIBADD = \ - $(LIBEMPATHYGTK_LIBS) \ + $(EMPATHY_LIBS) \ $(LIBNOTIFY_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index d44d8afe..746803e0 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ -DG_LOG_DOMAIN=\"empathy\" \ - $(LIBEMPATHY_CFLAGS) \ + $(EMPATHY_CFLAGS) \ $(GEOCLUE_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ $(CONNMAN_CFLAGS) \ @@ -100,7 +100,7 @@ nodist_libempathy_la_SOURCES =\ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ - $(LIBEMPATHY_LIBS) \ + $(EMPATHY_LIBS) \ $(GEOCLUE_LIBS) \ $(NETWORK_MANAGER_LIBS) \ $(CONNMAN_LIBS) |