dovecot-2.0-sslstream: dovecot-config: Don't rely on installed ....

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/89928f671350
changeset: 10614:89928f671350
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Jan 31 17:57:13 2010 +0200
description:
dovecot-config: Don't rely on installed .la files.

diffstat:

2 files changed, 14 insertions(+), 9 deletions(-)
Makefile.am          |   15 ++++++++-------
dovecot-config.in.in |    8 ++++++--

diffs (48 lines):

diff -r 6b3dc91ae0c5 -r 89928f671350 Makefile.am
--- a/Makefile.am	Sun Jan 31 16:13:07 2010 +0200
+++ b/Makefile.am	Sun Jan 31 17:57:13 2010 +0200
@@ -43,14 +43,15 @@ dovecot-config: dovecot-config.in Makefi
 
 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 -r 6b3dc91ae0c5 -r 89928f671350 dovecot-config.in.in
--- a/dovecot-config.in.in	Sun Jan 31 16:13:07 2010 +0200
+++ b/dovecot-config.in.in	Sun Jan 31 17:57:13 2010 +0200
@@ -1,12 +1,16 @@ CFLAGS="@CFLAGS@"
 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"