dovecot-config: Don't rely on installed .la files.

--HG--
branch : HEAD

diff --git a/Makefile.am b/Makefile.am
index a63fd29e4bf42908d34606fdb0ae3459a637f9a5..42389773db1143196421930cdc86561d8bb4e9ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,14 +43,15 @@ dovecot-config: dovecot-config.in Makefile
 
 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|" \
+       rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
+       grep -v '^LIBDOVECOT.*_INCLUDE' dovecot-config | \
+       grep -v '^LIBDOVECOT.*_DEPS' | sed \
+       -e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
+       -e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1=-ldovecot-login|" \
+       -e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
+       -e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1=-ldovecot-storage|" \
        -e "s|^\(LIBDOVECOT_INCLUDE\)=.*$$|\1=-I$(pkgincludedir)|" \
-       -e "s|^\(LIBDOVECOT_.*_INCLUDE\)=.*$$|\1=|" \
-       < dovecot-config > $(DESTDIR)$(pkglibdir)/dovecot-config
+       > $(DESTDIR)$(pkglibdir)/dovecot-config
 endif
 
 CLEANFILES = $(datafiles)

diff --git a/dovecot-config.in.in b/dovecot-config.in.in
index 59ed0329a6567b0053d3d9ce0a8e8826097c904d..c38164dcd97bf70185dc1c63834dadfc2b89e673 100644 (file)
--- a/dovecot-config.in.in
+++ b/dovecot-config.in.in
@@ -1,13 +1,17 @@
 CFLAGS="@CFLAGS@"
 LIBS="@LIBS@"
 SSL_LIBS="@SSL_LIBS@"
-MODULE_LIBS="@MODULE_LIBS@"
 
-LIBDOVECOT="@LIBDOVECOT@"
+LIBDOVECOT="@LIBDOVECOT@ @MODULE_LIBS@"
 LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@"
 LIBDOVECOT_SQL="@LIBDOVECOT_SQL@"
 LIBDOVECOT_STORAGE="@LIBDOVECOT_STORAGE@"
 
+LIBDOVECOT_DEPS="@LIBDOVECOT@"
+LIBDOVECOT_LOGIN_DEPS="@LIBDOVECOT_LOGIN@"
+LIBDOVECOT_SQL_DEPS="@LIBDOVECOT_SQL@"
+LIBDOVECOT_STORAGE_DEPS="@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"