Index: configure
--- configure.orig
+++ configure
@@ -7634,6 +7634,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 #include <stdlib.h>
 #include <sys/queue.h>
+#include <sys/select.h>
 #include <sys/sensors.h>
 int
 main (void)
@@ -19143,16 +19144,16 @@ fi
 RANLIB="ranlib"
 
 
-SERVER_CONFIG_FILE="${sysconfdir}/zabbix_server.conf"
-PROXY_CONFIG_FILE="${sysconfdir}/zabbix_proxy.conf"
-AGENT_CONFIG_FILE="${sysconfdir}/zabbix_agentd.conf"
-AGENT2_CONFIG_FILE="${sysconfdir}/zabbix_agent2.conf"
-AGENT2_CONFIG_DIR="${sysconfdir}/zabbix_agent2.d"
+SERVER_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_server.conf"
+PROXY_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_proxy.conf"
+AGENT_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_agentd.conf"
+AGENT2_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_agent2.conf"
+AGENT2_CONFIG_DIR="${sysconfdir}/zabbix/zabbix_agent2.d"
 AGENT2_PLUGIN_CONFIG_DIR="${AGENT2_CONFIG_DIR}/plugins.d"
-WEBSERVICE_CONFIG_FILE="${sysconfdir}/zabbix_web_service.conf"
+WEBSERVICE_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_web_service.conf"
 
-EXTERNAL_SCRIPTS_PATH="${datadir}/zabbix/externalscripts"
-ALERT_SCRIPTS_PATH="${datadir}/zabbix/alertscripts"
+EXTERNAL_SCRIPTS_PATH="${sysconfdir}/zabbix/externalscripts"
+ALERT_SCRIPTS_PATH="${sysconfdir}/zabbix/alertscripts"
 
 CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs"
 CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys"
