From 124df19636f591bf4578da190b719892c6413337 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sun, 28 Dec 2008 01:48:32 +0100
Subject: [PATCH] Enotify: added enotify extension to default compile.
---
Makefile.am | 17 ++++++-----------
TODO | 2 --
configure.in | 16 +++++++++-------
dsieve-config.h.in | 2 +-
src/lib-sieve/Makefile.am | 6 +-----
src/lib-sieve/plugins/Makefile.am | 6 +-----
src/lib-sieve/sieve-extensions.c | 10 +++-------
7 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 33444572f..f969e5fab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,16 +20,6 @@ endif
# Testsuite tests
-if BUILD_ENOTIFY
-ENOTIFY_TESTS = \
- tests/extensions/enotify/basic.svtest \
- tests/extensions/enotify/encodeurl.svtest \
- tests/extensions/enotify/valid_notify_method.svtest \
- tests/extensions/enotify/notify_method_capability.svtest \
- tests/extensions/enotify/errors.svtest \
- tests/extensions/enotify/execute.svtest
-endif
-
TESTSUITE_BIN = $(top_srcdir)/src/testsuite/testsuite
if TESTSUITE_VALGRIND
@@ -81,7 +71,12 @@ test_cases = \
tests/extensions/vacation/errors.svtest \
tests/extensions/vacation/execute.svtest \
tests/extensions/vacation/references.svtest \
- $(ENOTIFY_TESTS)
+ tests/extensions/enotify/basic.svtest \
+ tests/extensions/enotify/encodeurl.svtest \
+ tests/extensions/enotify/valid_notify_method.svtest \
+ tests/extensions/enotify/notify_method_capability.svtest \
+ tests/extensions/enotify/errors.svtest \
+ tests/extensions/enotify/execute.svtest
if HAVE_DOVECOT_LIBS
diff --git a/TODO b/TODO
index ce9d1e456..b46743fec 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
Current:
-* Incorporate enotify extension into default compile.
-
Next (in order of descending priority/precedence):
* Fix remaining RFC deviations:
diff --git a/configure.in b/configure.in
index 57bcea034..f223589fa 100644
--- a/configure.in
+++ b/configure.in
@@ -54,18 +54,20 @@ AM_CONDITIONAL(HAVE_DOVECOT_LIBS, test "$have_dovecot_libs" = "yes")
# Extensions under development
#
-AC_ARG_WITH(enotify,
-[AC_HELP_STRING([--with-enotify], [Build enotify extension (under development) [default=no]])],
+AC_ARG_WITH(unfinished-features,
+[AC_HELP_STRING([--with-unfinished-features],
+ [Build unfinished new features/extensions [default=no]])],
if test x$withval = xno || test x$withval = xauto; then
- want_enotify=$withval
+ want_unfinished_features=$withval
else
- want_enotify=yes
+ want_unfinished_features=yes
fi,
want_enotify=no)
-AM_CONDITIONAL(BUILD_ENOTIFY, test "$want_enotify" = "yes")
+AM_CONDITIONAL(BUILD_UNFINISHED, test "$want_unfinished_features" = "yes")
-if test "$want_enotify" = "yes"; then
- AC_DEFINE(HAVE_SIEVE_ENOTIFY,,[Define to make Sieve enotify extension available to users.])
+if test "$want_unfinished_features" = "yes"; then
+ AC_DEFINE(HAVE_SIEVE_UNFINISHED,,
+ [Define to build Sieve unfinished features/extensions.])
fi
#
diff --git a/dsieve-config.h.in b/dsieve-config.h.in
index df9c26ca1..f65ccf5f7 100644
--- a/dsieve-config.h.in
+++ b/dsieve-config.h.in
@@ -6,4 +6,4 @@
#undef SIEVE_VERSION
/* Define to make Sieve enotify extension available to users. */
-#undef HAVE_SIEVE_ENOTIFY
+#undef HAVE_SIEVE_UNFINISHED
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index 0a118a9e7..f15b97c8f 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -42,10 +42,6 @@ comparators = \
cmp-i-octet.c \
cmp-i-ascii-casemap.c
-if BUILD_ENOTIFY
-PLUGIN_ENOTIFY = ./plugins/enotify/libsieve_ext_enotify.la
-endif
-
# These are not actual plugins just yet...
plugins = \
./plugins/vacation/libsieve_ext_vacation.la \
@@ -58,7 +54,7 @@ plugins = \
./plugins/include/libsieve_ext_include.la \
./plugins/body/libsieve_ext_body.la \
./plugins/variables/libsieve_ext_variables.la \
- $(PLUGIN_ENOTIFY)
+ ./plugins/enotify/libsieve_ext_enotify.la
libsieve_la_DEPENDENCIES = $(plugins)
libsieve_la_LIBADD = $(plugins)
diff --git a/src/lib-sieve/plugins/Makefile.am b/src/lib-sieve/plugins/Makefile.am
index 0aaa153b7..e6e065cfa 100644
--- a/src/lib-sieve/plugins/Makefile.am
+++ b/src/lib-sieve/plugins/Makefile.am
@@ -1,7 +1,3 @@
-if BUILD_ENOTIFY
-ENOTIFY = enotify
-endif
-
SUBDIRS = \
vacation \
subaddress \
@@ -13,5 +9,5 @@ SUBDIRS = \
include \
body \
variables \
- $(ENOTIFY)
+ enotify
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 28e71a0d3..f74d351e2 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -78,14 +78,13 @@ extern const struct sieve_extension copy_extension;
extern const struct sieve_extension include_extension;
extern const struct sieve_extension body_extension;
extern const struct sieve_extension variables_extension;
+extern const struct sieve_extension enotify_extension;
/*
* Extensions under development
*/
-#ifdef HAVE_SIEVE_ENOTIFY
-extern const struct sieve_extension enotify_extension;
-#endif
+// None
/*
* List of native extensions
@@ -103,16 +102,13 @@ const struct sieve_extension *sieve_core_extensions[] = {
&encoded_character_extension,
/* Extensions under development */
-#ifdef HAVE_SIEVE_ENOTIFY
- &enotify_extension,
-#endif
/* 'Plugins' */
&vacation_extension, &subaddress_extension,
&comparator_i_ascii_numeric_extension,
&relational_extension, ®ex_extension, &imapflags_extension,
©_extension, &include_extension, &body_extension,
- &variables_extension
+ &variables_extension, &enotify_extension
};
const unsigned int sieve_core_extensions_count =
--
GitLab