diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-04-17 01:51:06 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-04-17 07:00:26 +0800 |
| commit | d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f (patch) | |
| tree | 2c16a43a7e54957b65f64c74f3a1534810ec61c7 /configure.ac | |
| parent | f6d4d6db614917b9c69a6ef540c4aabfa4486f6a (diff) | |
| download | gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar.gz gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar.bz2 gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar.lz gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar.xz gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.tar.zst gsoc2013-evolution-d9fc5e4912aabfd8db5a81ea9e22c2bba77a632f.zip | |
Remove backward-compatibility cruft for goa-1.0 < 3.8.
In particular, GOA's Google provider uses OAuth 2.0 now, so we can drop
the OAuth 1.0a support in CamelSaslXOAuth which was GMail-specific, and
with it the entire "online-accounts" module in Evolution. Evolution no
longer links to libgoa-1.0 at all.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 414b2cffbf..496da14f09 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ m4_define([champlain_minimum_version], [0.12]) m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.12.0]) m4_define([gladeui_minimum_version], [3.10.0]) -m4_define([goa_minimum_version], [3.2]) m4_define([gweather_minimum_version], [3.5.0]) m4_define([libcanberra_gtk_minimum_version], [0.25]) m4_define([libnotify_minimum_version], [0.7]) @@ -1060,23 +1059,6 @@ fi AM_CONDITIONAL([ENABLE_TNEF], [test "$tnef_ok" = "yes"]) AC_SUBST(TNEF_CFLAGS) -dnl ******************************* -dnl Check for GNOME Online Accounts -dnl ******************************* -AC_ARG_ENABLE([goa], - [AS_HELP_STRING([--enable-goa], - [enable GNOME Online Accounts support (default=yes)])], - [enable_goa=$enableval], [enable_goa=yes]) -AC_MSG_CHECKING([if GNOME Online Accounts support is enabled]) -AC_MSG_RESULT([$enable_goa]) -if test "x$enable_goa" = xyes; then - PKG_CHECK_MODULES([GOA], [goa-1.0 >= goa_minimum_version],, - [AC_MSG_ERROR([goa-1.0 not found (or version < goa_minimum_version), - If you want to disable GNOME Online Accounts support, - please append --disable-goa to configure.])]) -fi -AM_CONDITIONAL([ENABLE_ONLINE_ACCOUNTS], [test "x$enable_goa" = xyes]) - if test "x$mozilla_nss" != "x"; then EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss` @@ -1658,7 +1640,6 @@ modules/composer-autosave/Makefile modules/mail-config/Makefile modules/mailto-handler/Makefile modules/mdn/Makefile -modules/online-accounts/Makefile modules/offline-alert/Makefile modules/plugin-lib/Makefile modules/plugin-manager/Makefile |