Mercurial > dovecot > core-2.2

changeset 4343:407e6c620d70 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dovecot-config now contains module_dir
author Timo Sirainen <tss@iki.fi>
date Fri, 16 Jun 2006 12:25:19 +0300
parents b668848fff11
children 34179afd158a
files .cvsignore Makefile.am configure.in dovecot-config.in dovecot-config.in.in
diffstat 5 files changed, 20 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.cvsignore	Fri Jun 16 12:23:15 2006 +0300
+++ b/.cvsignore	Fri Jun 16 12:25:19 2006 +0300
@@ -28,3 +28,5 @@
 build-stamp
 configure-stamp
 dovecot.spec
+dovecot-config
+dovecot-config.in
--- a/Makefile.am	Fri Jun 16 12:23:15 2006 +0300
+++ b/Makefile.am	Fri Jun 16 12:25:19 2006 +0300
@@ -13,3 +13,11 @@
 	COPYING.LGPL \
 	COPYING.MIT \
 	$(conf_DATA)
+
+noinst_DATA = dovecot-config
+
+dovecot-config: dovecot-config.in
+	cat dovecot-config.in|sed "s|moduledir=|moduledir=$(moduledir)|" > dovecot-config
+
+CLEANFILES = $(noinst_DATA)
+
--- a/configure.in	Fri Jun 16 12:23:15 2006 +0300
+++ b/configure.in	Fri Jun 16 12:25:19 2006 +0300
@@ -1713,7 +1713,7 @@
 src/plugins/trash/Makefile
 src/plugins/zlib/Makefile
 stamp.h
-dovecot-config])
+dovecot-config.in])
 
 AC_OUTPUT
 
--- a/dovecot-config.in	Fri Jun 16 12:23:15 2006 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-CFLAGS="@CFLAGS@"
-LIBS="@LIBS@"
-
-STORAGE_LIBS="@STORAGE_LIBS@"
-LIBICONV="@LIBICONV@"
-RAND_LIBS="@RAND_LIBS@"
-MODULE_LIBS="@MODULE_LIBS@"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dovecot-config.in.in	Fri Jun 16 12:25:19 2006 +0300
@@ -0,0 +1,9 @@
+CFLAGS="@CFLAGS@"
+LIBS="@LIBS@"
+
+STORAGE_LIBS="@STORAGE_LIBS@"
+LIBICONV="@LIBICONV@"
+RAND_LIBS="@RAND_LIBS@"
+MODULE_LIBS="@MODULE_LIBS@"
+
+moduledir=