diff -NurdB evolution-2.2.3/configure.in evolution-2.2.3-patched/configure.in --- evolution-2.2.3/configure.in 2005-06-04 05:38:53.000000000 -0500 +++ evolution-2.2.3-patched/configure.in 2005-07-17 07:58:33.000000000 -0500 @@ -1330,7 +1330,11 @@ EVO_PLUGIN_RULE=$srcdir/plugin.mk AC_SUBST_FILE(EVO_PLUGIN_RULE) -AC_ARG_ENABLE(plugins, [ --enable-plugins=[no/base/all/experimental/list] Enable plugins.],enable_plugins="$enableval",enable_plugins=all) +AC_ARG_ENABLE(plugins, +[ --enable-plugins=extension1,extension2,... + build the specified plugins. + You can also use the aliases base, all, and experimental], + enable_plugins="$enableval",enable_plugins=all) dnl Add any new plugins here plugins_base="calendar-file calendar-http calendar-weather groupwise-account-setup itip-formatter plugin-manager send-options shared-folder groupwise-send-options exchange-account-setup groupwise-status-tracking default-source addressbook-file addressbook-groupwise startup-wizard" @@ -1339,28 +1343,33 @@ plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting" -case x"$enable_plugins" in -xno) - plugins_enabled="" - msg_plugins="no (some core functionality will not be available)" - ;; -xall | x | xyes) - plugins_enabled="$plugins_base $plugins_standard" - msg_plugins="yes (all)" - ;; -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)" - ;; -esac +plugins_all="$plugins_base $plugins_standard $plugins_experimental" +plugins_enabled="" + +IFS="${IFS= }"; evoext_save_ifs="$IFS"; IFS="," +for plugin in $enable_plugins; do + if echo "$plugins_all" | egrep "(^| )$plugin(\$| )" > /dev/null; then + plugins_enabled="$plugins_enabled $plugin" + elif test "x$plugin" = "xall" || test "x$plugin" = "xyes"; then + plugins_enabled="$plugins_enabled $plugins_base $plugins_standard" + elif test "x$plugin" = "xbase"; then + plugins_enabled="$plugins_enabled $plugins_base" + elif test "x$plugin" = "xexperimental"; then + plugins_enabled="$plugins_enabled $plugins_all" + else + AC_MSG_ERROR([the specified plugin $plugin does not exist]) + fi +done +IFS="$evoext_save_ifs" + +if test "x$plugins_enabled" = "x"; then + msg_plugins="no (some core functionality will not be available)" +else + msg_plugins="yes ($plugins_enabled)" +fi + +plugins_enabled=`echo $plugins_enabled | tr ' ' '\n' | sort | uniq | tr '\n' ' '` + AC_SUBST(plugins_enabled) AC_SUBST(plugins_base) AC_SUBST(plugins_standard)