54 lines
1.9 KiB
Text
54 lines
1.9 KiB
Text
Index: configure
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -7582,6 +7582,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)
|
|
@@ -13273,7 +13274,7 @@ if test ${with_libevent+y}
|
|
then :
|
|
withval=$with_libevent;
|
|
if test "x$withval" = "xyes"; then
|
|
- if test -f /usr/local/include/event.h; then withval=/usr/local; else withval=/usr; fi
|
|
+ if test -f /usr/local/include/event2/event.h; then withval=/usr/local; else withval=/usr; fi
|
|
fi
|
|
|
|
LIBEVENT_CFLAGS="-I$withval/include"
|
|
@@ -13344,7 +13345,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
#include <stdlib.h>
|
|
-#include <event.h>
|
|
+#include <event2/event.h>
|
|
#include <event2/thread.h>
|
|
|
|
int
|
|
@@ -18824,16 +18825,16 @@ printf "%s\n" "no" >&6; }
|
|
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_PATH="${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_PATH="${sysconfdir}/zabbix/zabbix_agent2.d"
|
|
AGENT2_CONFIG_PLUGINS_PATH="${AGENT2_CONFIG_PATH}/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"
|