diff --git a/admin/zabbix/Config-build.in b/admin/zabbix/Config-build.in deleted file mode 100644 index 39ec1c6fba..0000000000 --- a/admin/zabbix/Config-build.in +++ /dev/null @@ -1,8 +0,0 @@ -config ZABBIX_BUILD_SUPPORT_BIN - bool - depends on (PACKAGE_zabbix-agentd || PACKAGE_zabbix-proxy || PACKAGE_zabbix-server) - default y - help - This option exists to prevent trying to build get and/or sender when none - of agentd, server, or proxy are being built. In that case get and sender are - not built by the Zabbix build system. diff --git a/admin/zabbix/Config-db.in b/admin/zabbix/Config-db.in deleted file mode 100644 index 6a6df600be..0000000000 --- a/admin/zabbix/Config-db.in +++ /dev/null @@ -1,13 +0,0 @@ -choice - prompt "Select Database Software for Zabbix" - default ZABBIX_POSTGRESQL - - config ZABBIX_MYSQL - bool "MySQL/MariaDB" - - config ZABBIX_POSTGRESQL - bool "PostgreSQL" - - config ZABBIX_SQLITE - bool "SQLite3" -endchoice diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index d0660f39c8..fb5b026192 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -42,11 +42,29 @@ define Package/zabbix-agentd/config endef define Package/zabbix-proxy/config - source "$(SOURCE)/Config-db.in" + choice + prompt "Select Database Software for Zabbix" + default ZABBIX_POSTGRESQL + + config ZABBIX_MYSQL + bool "MySQL/MariaDB" + + config ZABBIX_POSTGRESQL + bool "PostgreSQL" + + config ZABBIX_SQLITE + bool "SQLite3" + endchoice endef define Package/zabbix-get/config - source "$(SOURCE)/Config-build.in" + config ZABBIX_BUILD_SUPPORT_BIN + bool + default y + help + This option exists to prevent trying to build get and/or sender when none + of agentd, server, or proxy are being built. In that case get and sender are + not built by the Zabbix build system. endef define Package/zabbix/Default