aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-11-04 12:31:31 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-11-04 12:31:31 +0800
commit5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea (patch)
tree0064eb194765ec08ed49c26d0a3745280f2d21f8
parent1bc519d787fe359caf0b9416d0a606e417a7c901 (diff)
downloadgsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar.gz
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar.bz2
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar.lz
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar.xz
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.tar.zst
gsoc2013-evolution-5b69bc3cd86bdb62cf4383a21d21e08faa48e8ea.zip
modified base vs optional logic slightly and added a warning if you build
2004-11-04 Not Zed <NotZed@Ximian.com> * configure.in: modified base vs optional logic slightly and added a warning if you build with --enable-plugins=no. 2004-11-04 David Trowbridge <David.Trowbridge@Colorado.edu> * configure.in: Added calendar-http module, and setup a mechanism for base vs optional plugins. svn path=/trunk/; revision=27831
-rw-r--r--ChangeLog10
-rw-r--r--configure.in36
2 files changed, 32 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index bf411e70af..3e74b027ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-04 Not Zed <NotZed@Ximian.com>
+
+ * configure.in: modified base vs optional logic slightly and added
+ a warning if you build with --enable-plugins=no.
+
+2004-11-04 David Trowbridge <David.Trowbridge@Colorado.edu>
+
+ * configure.in: Added calendar-http module, and setup a mechanism
+ for base vs optional plugins.
+
2004-11-03 JP Rosevear <jpr@novell.com>
* configure.in: fix the logic
diff --git a/configure.in b/configure.in
index c920a25a0a..35cef61448 100644
--- a/configure.in
+++ b/configure.in
@@ -1337,23 +1337,30 @@ AC_SUBST(plugindir)
EVO_PLUGIN_RULE=$srcdir/plugin.mk
AC_SUBST_FILE(EVO_PLUGIN_RULE)
-AC_ARG_ENABLE(plugins, [ --enable-plugins=[no/all/list] Enable plugins.],enable_plugins="$enableval",enable_plugins=no)
+AC_ARG_ENABLE(plugins, [ --enable-plugins=[no/all/list] Enable plugins.],enable_plugins="$enableval",enable_plugins=base)
dnl Add any new plugins here
-plugins_all="bbdb subject-thread save-attachments prefer-plain save-calendar select-one-source copy-tool mail-to-meeting mail-to-task folder-unsubscribe mark-calendar-offline audio-inline plugin-manager"
+plugins_base="calendar-http plugin-manager"
+plugins_all="bbdb subject-thread save-attachments prefer-plain save-calendar select-one-source copy-tool mail-to-meeting mail-to-task folder-unsubscribe mark-calendar-offline audio-inline"
-if test x"$enable_plugins" = "xno"; then
+case x"$enable_plugins" in
+xno)
plugins_enabled=""
- msg_plugins="no"
-else
- if test x"$enable_plugins" = "xyes" -o x"$enable_plugins" = "xall"; then
- plugins_enabled="$plugins_all"
- msg_plugins="yes (all)"
- else
- plugins_enabled="$enable_plugins"
- msg_plugins="yes ($enable_plugins)"
- fi
-fi
+ msg_plugins="no (some core functionality will not be available)"
+ ;;
+xall | x | xyes)
+ plugins_enabled="$plugins_base $plugins_all"
+ msg_plugins="yes (all)"
+ ;;
+xbase)
+ plugins_enabled="$plugins_base"
+ msg_plugins="yes ($plugins_base)"
+ ;;
+*)
+ plugins_enabled="$enable_plugins"
+ msg_plugins="yes ($enable_plugins)"
+ ;;
+esac
AC_SUBST(plugins_enabled)
AC_SUBST(plugins_all)
@@ -1550,6 +1557,8 @@ mail/default/Makefile
mail/default/C/Makefile
mail/importers/Makefile
plugins/Makefile
+plugins/calendar-http/Makefile
+plugins/plugin-manager/Makefile
plugins/bbdb/Makefile
plugins/audio-inline/Makefile
plugins/mail-to-meeting/Makefile
@@ -1562,7 +1571,6 @@ plugins/mark-calendar-offline/Makefile
plugins/prefer-plain/Makefile
plugins/copy-tool/Makefile
plugins/folder-unsubscribe/Makefile
-plugins/plugin-manager/Makefile
smime/Makefile
smime/lib/Makefile
smime/gui/Makefile