aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-18 23:04:04 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-18 23:04:04 +0800
commit0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45 (patch)
tree4401b5e634c41248fd38c2ba92efcde4186320ec
parent09fb1eb5151f551210ef4848463dc4caabf11911 (diff)
downloadgsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar.gz
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar.bz2
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar.lz
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar.xz
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.tar.zst
gsoc2013-evolution-0252395e8e3a7fe24eeb2b1420e0e1db03bb0c45.zip
No more experimental plugins.
We don't have any experimental plugins left. Remove the slot for it in configure.ac so we don't pick up anymore. EPlugin is deprecated anyway.
-rw-r--r--configure.ac12
-rw-r--r--plugins/Makefile.am2
2 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 87ac0276b1..2b985e4cd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1282,7 +1282,7 @@ EVO_PLUGIN_RULE=$srcdir/plugin.mk
AC_SUBST_FILE(EVO_PLUGIN_RULE)
AC_ARG_ENABLE([plugins],
- AS_HELP_STRING([--enable-plugins=[no/base/all/experimental/list]],
+ AS_HELP_STRING([--enable-plugins=[no/base/all/list]],
[Enable plugins.]),
[enable_plugins="$enableval"],[enable_plugins=all])
@@ -1297,11 +1297,6 @@ plugins_standard_always="bbdb save-calendar mail-to-task mailing-list-actions ma
plugins_standard="$plugins_standard_always"
dist_plugins_standard="$plugins_standard image-inline pst-import"
-plugins_experimental_always=""
-
-plugins_experimental="$plugins_experimental_always"
-dist_plugins_experimental="$plugins_experimental_always"
-
dnl ******************************************************************
dnl The following plugins have additional library dependencies.
dnl They must be explicitly disabled if the libraries are not present.
@@ -1445,10 +1440,6 @@ xbase)
plugins_enabled="$plugins_base"
msg_plugins="yes ($plugins_base)"
;;
-xexperimental)
- plugins_enabled="$plugins_base $plugins_standard $plugins_experimental"
- msg_plugins="yes ($plugins_base $plugins_standard $plugins_experimental)"
- ;;
*)
plugins_enabled="$enable_plugins"
msg_plugins="yes ($enable_plugins)"
@@ -1458,7 +1449,6 @@ esac
AC_SUBST(plugins_enabled)
AC_SUBST(dist_plugins_base)
AC_SUBST(dist_plugins_standard)
-AC_SUBST(dist_plugins_experimental)
dnl ******************
dnl Sub-version number
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0aa7857f6f..2152e3437f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,4 +1,4 @@
SUBDIRS = $(plugins_enabled)
-DIST_SUBDIRS = $(dist_plugins_base) $(dist_plugins_standard) $(dist_plugins_experimental)
+DIST_SUBDIRS = $(dist_plugins_base) $(dist_plugins_standard)
-include $(top_srcdir)/git.mk