Changed dovecot-config file to contain useful content.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index c1936ce8eb9261e1451c3dc1bcbd5c51703e4db3..a63fd29e4bf42908d34606fdb0ae3459a637f9a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,29 @@ ChangeLog: .hg/dirstate
 endif
 
 dovecot-config: dovecot-config.in Makefile
+       old=`pwd` && cd $(top_builddir) && abs_builddir=`pwd` && cd $$old && \
+       cd $(top_srcdir) && abs_srcdir=`pwd` && cd $$old && \
        cat dovecot-config.in | sed \
+       -e "s|\$$(top_builddir)|$$abs_builddir|g" \
+       -e "s|\$$(incdir)|$$abs_srcdir|g" \
+       -e "s|\$$(LIBICONV)|$(LIBICONV)|g" \
        -e "s|^moduledir=|moduledir=$(moduledir)|" \
-       -e "s|^dovecot_incdir=|dovecot_incdir=$(pkgincludedir)|" > dovecot-config
+       -e "s|^dovecot_pkgincludedir=|dovecot_pkgincludedir=$(pkgincludedir)|" \
+       -e "s|^dovecot_pkglibdir=|dovecot_pkglibdir=$(pkglibdir)|" \
+       -e "s|^dovecot_pkglibexecdir=|dovecot_pkglibexecdir=$(pkglibexecdir)|" \
+       -e "s|^dovecot_docdir=|dovecot_docdir=$(docdir)|" \
+       > dovecot-config
 
-CLEANFILES = $(datafiles)
+if INSTALL_HEADERS
+install-exec-hook:
+       rm $(DESTDIR)$(pkglibdir)/dovecot-config && sed \
+       -e "s|^LIBDOVECOT=.*$$|LIBDOVECOT=$(pkglibdir)/libdovecot.la|" \
+       -e "s|^LIBDOVECOT_LOGIN=.*$$|LIBDOVECOT_LOGIN=$(pkglibdir)/libdovecot-login.la|" \
+       -e "s|^LIBDOVECOT_SQL=.*$$|LIBDOVECOT_SQL=$(pkglibdir)/libdovecot-sql.la|" \
+       -e "s|^LIBDOVECOT_STORAGE=.*$$|LIBDOVECOT_STORAGE=$(pkglibdir)/libdovecot-storage.la|" \
+       -e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
+       -e "s|^\(LIBDOVECOT_.*_INCLUDE\)=.*$$|\1=|" \
+       < dovecot-config > $(DESTDIR)$(pkglibdir)/dovecot-config
+endif
 
+CLEANFILES = $(datafiles)

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index efc7e3215ae13c9b09596091570a0e7df14785d0..59ed0329a6567b0053d3d9ce0a8e8826097c904d 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -1,10 +1,21 @@
 CFLAGS="@CFLAGS@"
 LIBS="@LIBS@"
 SSL_LIBS="@SSL_LIBS@"
-
-STORAGE_LIBS="@STORAGE_LIBS@"
-LIBICONV="@LIBICONV@"
 MODULE_LIBS="@MODULE_LIBS@"
 
-dovecot_incdir=
+LIBDOVECOT="@LIBDOVECOT@"
+LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@"
+LIBDOVECOT_SQL="@LIBDOVECOT_SQL@"
+LIBDOVECOT_STORAGE="@LIBDOVECOT_STORAGE@"
+
+LIBDOVECOT_INCLUDE="-I$(incdir) -I$(incdir)/src/lib -I$(incdir)/src/lib-dict -I$(incdir)/src/lib-mail -I$(incdir)/src/lib-storage -I$(incdir)/src/lib-imap -I$(incdir)/src/lib-charset"
+LIBDOVECOT_LDA_INCLUDE="-I$(incdir)/src/lib-lda -I$(incdir)/src/lda"
+LIBDOVECOT_SERVICE_INCLUDE="-I$(incdir)/src/lib-master -I$(incdir)/src/lib-settings"
+LIBDOVECOT_STORAGE_INCLUDE="-I$(incdir)/src/lib-index -I$(incdir)/src/lib-storage/index -I$(incdir)/src/lib-storage/index/raw"
+LIBDOVECOT_LOGIN_INCLUDE="-I$(incdir)/src/lib-auth -I$(incdir)/src/login-common"
+
+dovecot_pkgincludedir=
+dovecot_pkglibdir=
+dovecot_pkglibexecdir=
+dovecot_docdir=
 moduledir=