diff options
| -rw-r--r-- | Config.in.legacy | 14 | ||||
| -rw-r--r-- | package/dovecot/Config.in | 12 | ||||
| -rw-r--r-- | package/dovecot/dovecot.mk | 4 |
3 files changed, 16 insertions, 14 deletions
diff --git a/Config.in.legacy b/Config.in.legacy index 2fda9f8307..081bacdd3d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,20 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_PACKAGE_DOVECOT_BZIP2 + bool "bzip2 support option has been removed" + select BR2_LEGACY + select BR2_PACKAGE_BZIP2 + help + Bzip2 support is built if the bzip2 package is selected. + +config BR2_PACKAGE_DOVECOT_ZLIB + bool "zlib support option has been removed" + select BR2_LEGACY + select BR2_PACKAGE_ZLIB + help + Zlib support is built if the zlib package is selected. + config BR2_PACKAGE_E2FSPROGS_FINDFS bool "e2fsprogs findfs option has been removed" select BR2_LEGACY diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 3baae6e561..194efb6bc3 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -13,12 +13,6 @@ config BR2_PACKAGE_DOVECOT if BR2_PACKAGE_DOVECOT -config BR2_PACKAGE_DOVECOT_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support. - config BR2_PACKAGE_DOVECOT_MYSQL bool "mysql support" select BR2_PACKAGE_MYSQL @@ -43,12 +37,6 @@ config BR2_PACKAGE_DOVECOT_SQLITE help Enable SQLite support. -config BR2_PACKAGE_DOVECOT_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support. - source package/dovecot-pigeonhole/Config.in endif # BR2_PACKAGE_DOVECOT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 8451e52342..eea9efcc2f 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL)$(BR2_PACKAGE_DOVECOT_SQLITE),) DOVECOT_CONF_OPTS += --without-sql endif -ifeq ($(BR2_PACKAGE_DOVECOT_BZIP2),y) +ifeq ($(BR2_PACKAGE_BZIP2),y) DOVECOT_CONF_OPTS += --with-bzlib DOVECOT_DEPENDENCIES += bzip2 else @@ -76,7 +76,7 @@ else DOVECOT_CONF_OPTS += --without-sqlite endif -ifeq ($(BR2_PACKAGE_DOVECOT_ZLIB),y) +ifeq ($(BR2_PACKAGE_ZLIB),y) DOVECOT_CONF_OPTS += --with-zlib DOVECOT_DEPENDENCIES += zlib else |
