dovecot-2.2: dovecot-config: Removed unnecessary/duplicate ssl l...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/0e12a687f5bf
changeset: 15646:0e12a687f5bf
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Jan 15 08:30:57 2013 +0200
description:
dovecot-config: Removed unnecessary/duplicate ssl library links.

diffstat:

 Makefile.am  |  1 -
 configure.ac |  9 ---------
 2 files changed, 0 insertions(+), 10 deletions(-)

diffs (40 lines):

diff -r 970dc6b0760b -r 0e12a687f5bf Makefile.am
--- a/Makefile.am	Mon Jan 14 18:24:19 2013 +0200
+++ b/Makefile.am	Tue Jan 15 08:30:57 2013 +0200
@@ -66,7 +66,6 @@
 	-e "s|^\(LIBDOVECOT\)=.*$$|\1='-L$(pkglibdir) -ldovecot'|" \
 	-e "s|^\(LIBDOVECOT_LOGIN\)=.*$$|\1='-ldovecot-login $(SSL_LIBS)'|" \
 	-e "s|^\(LIBDOVECOT_SQL\)=.*$$|\1=-ldovecot-sql|" \
-	-e "s|^\(LIBDOVECOT_SSL\)=.*$$|\1=-ldovecot-ssl|" \
 	-e "s|^\(LIBDOVECOT_COMPRESS\)=.*$$|\1=-ldovecot-compression|" \
 	-e "s|^\(LIBDOVECOT_LDA\)=.*$$|\1=-ldovecot-lda|" \
 	-e "s|^\(LIBDOVECOT_STORAGE\)=.*$$|\1='-ldovecot-storage $(LINKED_STORAGE_LDADD)'|" \
diff -r 970dc6b0760b -r 0e12a687f5bf configure.ac
--- a/configure.ac	Mon Jan 14 18:24:19 2013 +0200
+++ b/configure.ac	Tue Jan 15 08:30:57 2013 +0200
@@ -2478,17 +2478,9 @@
   fi
   if test $storage = imapc; then
     mailbox_list_drivers="$mailbox_list_drivers imapc"
-    want_ssl_libs=yes
-  fi
-  if test $storage = pop3c; then
-    want_ssl_libs=yes
   fi
 done
 LINKED_STORAGE_LDADD=
-if test "$want_ssl_libs" = yes; then
-  LINKED_STORAGE_LIBS="$LINKED_STORAGE_LIBS \$(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la"
-  LINKED_STORAGE_LDADD="$SSL_LIBS"
-fi
 AC_SUBST(LINKED_STORAGE_LIBS)
 AC_SUBST(LINKED_STORAGE_LDADD)
 AC_SUBST(mailbox_list_drivers)
@@ -2528,7 +2520,6 @@
 AC_SUBST(LIBDOVECOT_STORAGE_DEPS)
 AC_SUBST(LIBDOVECOT_LOGIN)
 AC_SUBST(LIBDOVECOT_SQL)
-AC_SUBST(LIBDOVECOT_SSL)
 AC_SUBST(LIBDOVECOT_COMPRESS)
 AC_SUBST(LIBDOVECOT_LDA)