Updated POTFILES.in

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ed9b560ec0a77a3531bb51e8d2ce29895027d12d..9575d684b25e1d71aca32a63f697d0d57574d358 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define(empathy_released, 0)
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [5])
 m4_define([empathy_micro_version], [4])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -217,7 +217,7 @@ PKG_CHECK_MODULES(EMPATHY,
    libpulse-mainloop-glib
    webkitgtk-3.0 >= $WEBKIT_REQUIRED
    libsoup-2.4
-   gee-0.8
+   gee-1.0
 ])
 
 PKG_CHECK_MODULES(EMPATHY_CALL,
@@ -458,12 +458,6 @@ if test "x$enable_goa" != "xno"; then
        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
@@ -518,13 +512,6 @@ if test "x$enable_ubuntu_online_accounts" != "xno"; then
        libsignon-glib >= $LIBSIGNON_REQUIRED
     ], have_uoa="yes", have_uoa="no")
 
-   # MC plugins dir
-   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)
-
    # provider plugin dir
    AC_MSG_CHECKING([Accounts provider plugin dir])
    ACCOUNTS_PROVIDER_PLUGIN_DIR=`pkg-config --variable=provider_plugindir account-plugin`
@@ -545,6 +532,14 @@ if test "x$enable_ubuntu_online_accounts" != "xno"; then
 
    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
@@ -561,6 +556,15 @@ 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
 
@@ -592,6 +596,9 @@ AC_CONFIG_FILES([
    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
    help/Makefile
    tests/Makefile
    tests/interactive/Makefile