dovecot-2.0-pigeonhole: Adjusted to changes in dovecot-config (p...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/790a59e93520
changeset: 1236:790a59e93520
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Feb 10 17:15:41 2010 +0100
description:
Adjusted to changes in dovecot-config (patch by Timo Sirainen).

diffstat:

 configure.in                                     |  4 ++--
 src/lib-sieve-tool/Makefile.am                   |  3 +--
 src/lib-sieve/Makefile.am                        |  2 +-
 src/lib-sieve/plugins/enotify/mailto/Makefile.am |  3 +--
 src/managesieve-login/Makefile.am                |  2 +-
 src/managesieve/Makefile.am                      |  4 ++--
 src/plugins/lda-sieve/Makefile.am                |  2 +-
 src/sieve-tools/Makefile.am                      |  1 -
 src/testsuite/Makefile.am                        |  3 +--
 9 files changed, 10 insertions(+), 14 deletions(-)

diffs (124 lines):

diff -r 9a08762faffe -r 790a59e93520 configure.in
--- a/configure.in	Sun Feb 07 17:45:55 2010 +0100
+++ b/configure.in	Wed Feb 10 17:15:41 2010 +0100
@@ -91,7 +91,7 @@
 fi
 eval `cat $dovecotdir/dovecot-config`
 
-AC_SUBST(moduledir)
+AC_SUBST(dovecot_moduledir)
 AC_SUBST(dovecot_pkgincludedir)
 AC_SUBST(dovecot_pkglibexecdir)
 AC_SUBST(dovecot_pkglibdir)
@@ -105,10 +105,10 @@
 AC_SUBST(LIBDOVECOT_STORAGE_DEPS)
 AC_SUBST(LIBDOVECOT_LOGIN_DEPS)
 
+LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE" 
 AC_SUBST(LIBDOVECOT_INCLUDE)
 AC_SUBST(LIBDOVECOT_LDA_INCLUDE)
 AC_SUBST(LIBDOVECOT_SERVICE_INCLUDE)
-AC_SUBST(LIBDOVECOT_STORAGE_INCLUDE)
 AC_SUBST(LIBDOVECOT_LOGIN_INCLUDE)
 
 AC_CONFIG_FILES([
diff -r 9a08762faffe -r 790a59e93520 src/lib-sieve-tool/Makefile.am
--- a/src/lib-sieve-tool/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/lib-sieve-tool/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -3,8 +3,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-sieve \
 	$(LIBDOVECOT_INCLUDE) \
-	$(LIBDOVECOT_SERVICE_INCLUDE) \
-	$(LIBDOVECOT_STORAGE_INCLUDE)
+	$(LIBDOVECOT_SERVICE_INCLUDE)
 
 libsieve_tool_la_SOURCES = \
 	sieve-tool.c \
diff -r 9a08762faffe -r 790a59e93520 src/lib-sieve/Makefile.am
--- a/src/lib-sieve/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/lib-sieve/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -4,7 +4,7 @@
 
 AM_CPPFLAGS = \
 	$(LIBDOVECOT_INCLUDE) \
-	-DMODULEDIR=\""$(moduledir)"\"
+	-DMODULEDIR=\""$(dovecot_moduledir)"\"
 
 tests = \
 	tst-truefalse.c \
diff -r 9a08762faffe -r 790a59e93520 src/lib-sieve/plugins/enotify/mailto/Makefile.am
--- a/src/lib-sieve/plugins/enotify/mailto/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/lib-sieve/plugins/enotify/mailto/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -3,8 +3,7 @@
 AM_CPPFLAGS = \
 	-I../ \
 	-I../../../ \
-	$(LIBDOVECOT_INCLUDE) \
-	$(LIBDOVECOT_STORAGE_INCLUDE)
+	$(LIBDOVECOT_INCLUDE)
 
 libsieve_ext_enotify_mailto_la_SOURCES = \
 	uri-mailto.c \
diff -r 9a08762faffe -r 790a59e93520 src/managesieve-login/Makefile.am
--- a/src/managesieve-login/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/managesieve-login/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -1,4 +1,4 @@
-settingsdir = $(moduledir)/settings
+settingsdir = $(dovecot_moduledir)/settings
 
 dovecot_pkglibexec_PROGRAMS = managesieve-login
 
diff -r 9a08762faffe -r 790a59e93520 src/managesieve/Makefile.am
--- a/src/managesieve/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/managesieve/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -1,11 +1,11 @@
-settingsdir = $(moduledir)/settings
+settingsdir = $(dovecot_moduledir)/settings
 
 dovecot_pkglibexec_PROGRAMS = managesieve
 
 AM_CPPFLAGS = \
 	$(LIBDOVECOT_INCLUDE) \
 	$(LIBDOVECOT_SERVICE_INCLUDE) \
-	-DMODULEDIR=\""$(moduledir)"\" \
+	-DMODULEDIR=\""$(dovecot_moduledir)"\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src/lib-sieve \
 	-I$(top_srcdir)/src/lib-managesieve \
diff -r 9a08762faffe -r 790a59e93520 src/plugins/lda-sieve/Makefile.am
--- a/src/plugins/lda-sieve/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/plugins/lda-sieve/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -6,7 +6,7 @@
 
 lib90_sieve_plugin_la_LDFLAGS = -module -avoid-version
 
-module_LTLIBRARIES = lib90_sieve_plugin.la
+dovecot_module_LTLIBRARIES = lib90_sieve_plugin.la
 
 lib90_sieve_plugin_la_LIBADD = \
 	$(top_srcdir)/src/lib-sieve/libdovecot-sieve.la
diff -r 9a08762faffe -r 790a59e93520 src/sieve-tools/Makefile.am
--- a/src/sieve-tools/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/sieve-tools/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -12,7 +12,6 @@
 	-I./debug \
 	$(LIBDOVECOT_INCLUDE) \
 	$(LIBDOVECOT_SERVICE_INCLUDE)
-	$(LIBDOVECOT_STORAGE_INCLUDE)
 
 libs = \
 	$(top_srcdir)/src/lib-sieve/libdovecot-sieve.la \
diff -r 9a08762faffe -r 790a59e93520 src/testsuite/Makefile.am
--- a/src/testsuite/Makefile.am	Sun Feb 07 17:45:55 2010 +0100
+++ b/src/testsuite/Makefile.am	Wed Feb 10 17:15:41 2010 +0100
@@ -4,8 +4,7 @@
 	-I$(top_srcdir)/src/lib-sieve \
 	-I$(top_srcdir)/src/lib-sieve-tool \
 	$(LIBDOVECOT_INCLUDE) \
-	$(LIBDOVECOT_SERVICE_INCLUDE) \
-	$(LIBDOVECOT_STORAGE_INCLUDE)
+	$(LIBDOVECOT_SERVICE_INCLUDE)
 
 testsuite_LDFLAGS = -export-dynamic