m4_define([empathy_major_version], [3])
m4_define([empathy_minor_version], [5])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_micro_version], [90])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
CLUTTER_GTK_REQUIRED=1.1.2
CLUTTER_GST_REQUIRED=1.5.2
-TELEPATHY_GLIB_REQUIRED=0.19.4
+TELEPATHY_GLIB_REQUIRED=0.19.6
AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_20, [Ignore post 0.20 deprecations])
AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
GSTREAMER_REQUIRED=0.10.32
-KEYRING_REQUIRED=2.26.0
+LIBSECRET_REQUIRED=0.5
GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
LIBNOTIFY_REQUIRED=0.7.0
NETWORK_MANAGER_REQUIRED=0.7.0
CHAMPLAIN_REQUIRED=0.12.1
CHEESE_GTK_REQUIRED=3.4.0
+LIBACCOUNTS_REQUIRED=1.1
+LIBSIGNON_REQUIRED=1.1
+MC_PLUGINS_REQUIRED=5.13.0
# Use --enable-maintainer-mode to disable deprecated symbols,
# disable single include and enable GSEAL. If this is not a released empathy,
glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
- gnome-keyring-1 >= $KEYRING_REQUIRED
+ libsecret-1 >= $LIBSECRET_REQUIRED
gnutls >= $GNUTLS_REQUIRED
gmodule-export-2.0
gobject-2.0
libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
libsoup-2.4
- gee-0.8
+ gee-1.0
])
PKG_CHECK_MODULES(EMPATHY_CALL,
AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
[Name of provider for accounts imported from GOA])
+AC_DEFINE(EMPATHY_UOA_PROVIDER,
+ "im.telepathy.Account.Storage.UOA",
+ [Name of provider for accounts imported from libaccounts])
+
# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
mission-control-plugins
goa-1.0 >= $GOA_REQUIRED
], have_goa="yes", have_goa="no")
-
- AC_MSG_CHECKING([Mission Control plugins dir])
- MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
-
- AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
- AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
else
have_goa=no
fi
PKG_CHECK_MODULES(UOA,
[
account-plugin
+ mission-control-plugins >= $MC_PLUGINS_REQUIRED
+ libaccounts-glib >= $LIBACCOUNTS_REQUIRED
+ libsignon-glib >= $LIBSIGNON_REQUIRED
], have_uoa="yes", have_uoa="no")
+
+ # provider plugin dir
+ AC_MSG_CHECKING([Accounts provider plugin dir])
+ ACCOUNTS_PROVIDER_PLUGIN_DIR=`pkg-config --variable=provider_plugindir account-plugin`
+
+ AC_MSG_RESULT([$ACCOUNTS_PROVIDER_PLUGIN_DIR])
+ AC_SUBST(ACCOUNTS_PROVIDER_PLUGIN_DIR)
+
+ # app plugin dir
+ AC_MSG_CHECKING([Accounts provider app plugin dir])
+ ACCOUNTS_APP_PLUGIN_DIR=`pkg-config --variable=application_plugindir account-plugin`
+
+ AC_MSG_RESULT([$ACCOUNTS_APP_PLUGIN_DIR])
+ AC_SUBST(ACCOUNTS_APP_PLUGIN_DIR)
+
+ # provider files dir
+ AC_MSG_CHECKING([Accounts provider files dir])
+ ACCOUNTS_PROVIDER_FILES_DIR=`pkg-config --variable=providerfilesdir libaccounts-glib`
+
+ AC_MSG_RESULT([$ACCOUNTS_PROVIDER_FILES_DIR])
+ AC_SUBST(ACCOUNTS_PROVIDER_FILES_DIR)
+
+ # service files dir
+ AC_MSG_CHECKING([Accounts service files dir])
+ ACCOUNTS_SERVICE_FILES_DIR=`pkg-config --variable=servicefilesdir libaccounts-glib`
+
+ AC_MSG_RESULT([$ACCOUNTS_SERVICE_FILES_DIR])
+ AC_SUBST(ACCOUNTS_SERVICE_FILES_DIR)
+
+ # application files dir
+ AC_MSG_CHECKING([Accounts applications files dir])
+ ACCOUNTS_APPLICATION_FILES_DIR=`pkg-config --variable=applicationfilesdir libaccounts-glib`
+
+ AC_MSG_RESULT([$ACCOUNTS_APPLICATION_FILES_DIR])
+ AC_SUBST(ACCOUNTS_APPLICATION_FILES_DIR)
+
else
have_uoa=no
fi
AM_CONDITIONAL(HAVE_UOA, test "x$have_uoa" = "xyes")
+if test "x$have_uoa" = "xyes" -o "x$have_goa" = "xyes"; then
+ AC_MSG_CHECKING([Mission Control plugins dir])
+ MISSION_CONTROL_PLUGINS_DIR=${libdir}/mission-control-plugins.`pkg-config --variable=MCP_ABI_VERSION mission-control-plugins`
+
+ AC_MSG_RESULT([$MISSION_CONTROL_PLUGINS_DIR])
+ AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
+fi
+
+
# Help documentation
YELP_HELP_INIT
Makefile
data/Makefile
data/empathy.desktop.in
- data/empathy-accounts.desktop.in
data/icons/Makefile
data/themes/Makefile
extensions/Makefile
src/Makefile
nautilus-sendto-plugin/Makefile
goa-mc-plugin/Makefile
+ ubuntu-online-accounts/Makefile
+ ubuntu-online-accounts/mc-plugin/Makefile
+ ubuntu-online-accounts/cc-plugins/Makefile
+ ubuntu-online-accounts/cc-plugins/providers/Makefile
+ ubuntu-online-accounts/cc-plugins/services/Makefile
+ ubuntu-online-accounts/cc-plugins/app-plugin/Makefile
help/Makefile
tests/Makefile
tests/interactive/Makefile