diff options
| -rw-r--r-- | package/dovecot/Config.in | 9 | ||||
| -rw-r--r-- | package/dovecot/dovecot.mk | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 194efb6bc3..d1ff7bce91 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB help Dovecot is an open source IMAP and POP3 email server for Linux/UNIX- like systems, written with security primarily in mind. Dovecot is an @@ -24,13 +26,6 @@ config BR2_PACKAGE_DOVECOT_MYSQL comment "mysql support needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_DOVECOT_OPENSSL - bool "openssl support" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - Enable OpenSSL support. - config BR2_PACKAGE_DOVECOT_SQLITE bool "sqlite support" select BR2_PACKAGE_SQLITE diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 3dd231a1d0..fe0afa5064 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -10,7 +10,10 @@ DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT -DOVECOT_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBICONV),libiconv) +DOVECOT_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + openssl DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ @@ -27,7 +30,7 @@ DOVECOT_CONF_ENV = \ lib_cv___va_copy=yes \ lib_cv_va_val_copy=yes -DOVECOT_CONF_OPTS = --without-docs +DOVECOT_CONF_OPTS = --without-docs --with-ssl=openssl ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL)$(BR2_PACKAGE_DOVECOT_SQLITE),) DOVECOT_CONF_OPTS += --without-sql @@ -62,13 +65,6 @@ else DOVECOT_CONF_OPTS += --without-mysql endif -ifeq ($(BR2_PACKAGE_DOVECOT_OPENSSL),y) -DOVECOT_CONF_OPTS += --with-ssl=openssl -DOVECOT_DEPENDENCIES += openssl -else -DOVECOT_CONF_OPTS += --with-ssl=no -endif - ifeq ($(BR2_PACKAGE_DOVECOT_SQLITE),y) DOVECOT_CONF_OPTS += --with-sqlite DOVECOT_DEPENDENCIES += sqlite |
