diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 35 | ||||
| -rw-r--r-- | plugin.mk | 2 |
4 files changed, 47 insertions, 3 deletions
@@ -1,3 +1,15 @@ +2004-10-20 JP Rosevear <jpr@novell.com> + + * Makefile.am: list plugins as a subdir + + * plugins/Makefile.am: build enabled plugins + + * plugin.mk: simple rule for creating .eplug files + + * configure.in: add plugin foo; --enable-plugins=all turns them + all on, or you can --enable-plugins="<plugin dir> <plugin dir>" to + list specific ones + 2004-10-15 Sarfraaz Ahmed <asarfraaz@novell.com> * camel.pc.in : Change gal-2.2 to gal-2.4 diff --git a/Makefile.am b/Makefile.am index 4391bc6672..7b074364f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,7 @@ SUBDIRS = \ art \ composer \ mail \ + plugins \ ui \ views \ tools \ diff --git a/configure.in b/configure.in index 6e4adfe4df..e508650d39 100644 --- a/configure.in +++ b/configure.in @@ -1269,9 +1269,6 @@ AC_SUBST(camel_providerdir) componentdir="$privlibdir/components" AC_SUBST(componentdir) -plugindir="$privlibdir/plugins" -AC_SUBST(plugindir) - idldir="$datadir/idl/evolution-$BASE_VERSION" AC_SUBST(idldir) @@ -1331,6 +1328,35 @@ AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface versi EVO_SERVER_RULE=$srcdir/server.mk AC_SUBST_FILE(EVO_SERVER_RULE) +dnl ************************ +dnl Plugins +dnl ************************ + +plugindir="$privlibdir/plugins" +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) + +dnl Add any new plugins here +plugins_all="subject-thread" + +if test x"$enable_plugins" = "xno"; then + plugins_enabled="" + msg_plugins="no" +else + if test x"$enable_plugins" = "xall"; then + plugins_enabled="$plugins_all" + else + plugins_enabled="$enable_plugins" + fi + msg_plugins="$enable_plugins" +fi +AC_SUBST(plugins_enabled) +AC_SUBST(plugins_all) + ################################################## # Check for gtk-doc. ################################################## @@ -1506,6 +1532,8 @@ mail/Makefile mail/default/Makefile mail/default/C/Makefile mail/importers/Makefile +plugins/Makefile +plugins/subject-thread/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile @@ -1537,6 +1565,7 @@ echo "\ IPv6 support: $msg_ipv6 Dot Locking: $msg_dot File Locking: $msg_file + Plugins: $msg_plugins Gtk-doc: $enable_gtk_doc" if test x$enable_gtk_doc = xyes; then diff --git a/plugin.mk b/plugin.mk new file mode 100644 index 0000000000..bacbb420f2 --- /dev/null +++ b/plugin.mk @@ -0,0 +1,2 @@ +%.eplug: %.eplug.in + sed -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@ |