diff options
Diffstat (limited to 'zabbix-out-of-tree.patch')
| -rw-r--r-- | zabbix-out-of-tree.patch | 1122 |
1 files changed, 79 insertions, 1043 deletions
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 59d3e6d..901d716 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,673 +1,42 @@ -diff -up zabbix-6.0.25/src/go/Makefile.am zabbix-6.0.25/src/go/Makefile.am ---- zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:18:10.203573218 +0800 -+++ zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:32:26.677126253 +0800 -@@ -59,7 +59,7 @@ - clean: clean-go-build clean-sbom +diff --git a/src/go/Makefile.am b/src/go/Makefile.am +index 3e24aa0..308e34b 100644 +--- a/src/go/Makefile.am ++++ b/src/go/Makefile.am +@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom clean-go-build: -- -go clean ./... -+ -go clean $(srcdir)/... + -$(GO) clean ./... ++ -$(GO) clean $(srcdir)/... -rm -f bin/mock_server -rm -f bin/zabbix_agent2 -rm -f bin/zabbix_web_service -@@ -76,8 +76,8 @@ - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} - $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" -- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -- for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ -+ test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "$(srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -+ for cfg in $(srcdir)conf/zabbix_agent2.d/plugins.d/*.conf; do \ - test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ - cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ - done -@@ -151,7 +151,7 @@ - sbom: sbom-apps sbom-mod - - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... - format: -diff -up zabbix-6.0.25/src/libs/zbxalgo/Makefile.am zabbix-6.0.25/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:18:10.998582084 +0800 -+++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalgo.a - - if SERVER -diff -up zabbix-6.0.25/src/libs/zbxaudit/Makefile.am zabbix-6.0.25/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:18:11.144583713 +0800 -+++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxaudit.a - - libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxavailability/Makefile.am zabbix-6.0.25/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:18:11.139583657 +0800 -+++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxavailability.a - - libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommon/Makefile.am zabbix-6.0.25/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:18:10.905581047 +0800 -+++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommon.a - - libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcomms/Makefile.am zabbix-6.0.25/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:18:10.984581928 +0800 -+++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcomms.a - - libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:18:11.130583556 +0800 -+++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommshigh.a - - libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcompress/Makefile.am zabbix-6.0.25/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:18:10.925581270 +0800 -+++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcompress.a - - libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxconf/Makefile.am zabbix-6.0.25/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:18:11.129583545 +0800 -+++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxconf.a - - libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:18:10.920581214 +0800 -+++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcrypto.a - - libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdb/Makefile.am zabbix-6.0.25/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:18:10.913581136 +0800 -+++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdb.a - - libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:18:11.006582173 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbcache.a - - libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:18:10.950581549 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - if DBSCHEMA - dbschema.c: $(top_srcdir)/create/src/schema.tmpl - $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c -diff -up zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:18:10.935581381 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbupgrade.a - - libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdiag/Makefile.am zabbix-6.0.25/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:18:11.137583635 +0800 -+++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a - - libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxembed/Makefile.am zabbix-6.0.25/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:18:10.959581649 +0800 -+++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxembed.a - - libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxeval/Makefile.am zabbix-6.0.25/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:18:10.988581973 +0800 -+++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxeval.a - - libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxexec/Makefile.am zabbix-6.0.25/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:18:10.992582017 +0800 -+++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxexec.a - - libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxha/Makefile.am zabbix-6.0.25/src/libs/zbxha/Makefile.am ---- zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:18:10.965581716 +0800 -+++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhistory/Makefile.am zabbix-6.0.25/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:18:11.149583768 +0800 -+++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhistory.a - - libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhttp/Makefile.am zabbix-6.0.25/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:18:10.908581080 +0800 -+++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttp.a - - libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:18:11.014582263 +0800 -+++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxicmpping.a - - libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:18:11.149583768 +0800 -+++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxipcservice.a - - libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxjson/Makefile.am zabbix-6.0.25/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:18:11.134583601 +0800 -+++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxjson.a - - libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxlog/Makefile.am zabbix-6.0.25/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:18:11.013582251 +0800 -+++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlog.a - - libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmedia/Makefile.am zabbix-6.0.25/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:18:11.010582218 +0800 -+++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmedia.a - - libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmemory/Makefile.am zabbix-6.0.25/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:18:10.923581248 +0800 -+++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmemory.a - - libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmodules/Makefile.am zabbix-6.0.25/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:18:10.910581103 +0800 -+++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmodules.a - - libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxnix/Makefile.am zabbix-6.0.25/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:18:10.981581895 +0800 -+++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxnix.a - - libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprof/Makefile.am zabbix-6.0.25/src/libs/zbxprof/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:18:10.994582040 +0800 -+++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprof.a - - libzbxprof_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:18:10.911581114 +0800 -+++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprometheus.a - - libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxregexp/Makefile.am zabbix-6.0.25/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:18:10.977581850 +0800 -+++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxregexp.a - - libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxrtc/Makefile.am zabbix-6.0.25/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:18:10.916581170 +0800 -+++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxrtc.a \ - libzbxrtc_service.a \ -diff -up zabbix-6.0.25/src/libs/zbxself/Makefile.am zabbix-6.0.25/src/libs/zbxself/Makefile.am ---- zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:18:11.019582318 +0800 -+++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a - - libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxserver/Makefile.am zabbix-6.0.25/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:18:10.972581794 +0800 -+++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a - - libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxservice/Makefile.am zabbix-6.0.25/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:18:10.990581995 +0800 -+++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxservice.a - - libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsys/Makefile.am zabbix-6.0.25/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:18:10.963581694 +0800 -+++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsys.a - - libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:18:11.101583233 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libagentsysinfo.a - - libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:18:11.122583467 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:21:13.373615946 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:18:11.110583333 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a - - libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:18:11.099583211 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:21:50.135025913 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:18:11.116583400 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:22:10.033247819 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:18:11.033582474 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:22:28.994459278 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:18:11.100583222 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - DIST_SUBDIRS = \ - agent \ - common \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:18:11.093583144 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:22:45.253640603 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:18:11.078582976 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:23:03.828847753 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:18:11.058582753 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:23:21.966050020 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:18:11.043582586 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:23:37.598224351 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:18:11.087583077 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libsimplesysinfo.a - - libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:18:11.084583043 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:23:54.055407887 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:18:11.066582843 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:24:13.363623213 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtasks/Makefile.am zabbix-6.0.25/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:18:10.924581259 +0800 -+++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtasks.a - - libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtrends/Makefile.am zabbix-6.0.25/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:18:11.017582296 +0800 -+++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxtrends.a \ - libzbxtrends_baseline.a -diff -up zabbix-6.0.25/src/libs/zbxvault/Makefile.am zabbix-6.0.25/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:18:11.148583757 +0800 -+++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvault.a - - libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxxml/Makefile.am zabbix-6.0.25/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:18:10.975581828 +0800 -+++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxxml.a - - libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:18:10.054571557 +0800 -+++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlogfiles.a - - libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/Makefile.am zabbix-6.0.25/src/zabbix_agent/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:18:10.050571512 +0800 -+++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - logfiles - -@@ -79,4 +81,4 @@ +@@ -89,9 +90,9 @@ install-bin/zabbix_agent2: bin/zabbix_agent2 + $(INSTALL) -d "$(DESTDIR)$(sbindir)" + $(INSTALL_PROGRAM) bin/zabbix_agent2 "$(DESTDIR)$(sbindir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- $(INSTALL_DATA) conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" ++ $(INSTALL_DATA) $(top_srcdir)/src/go/conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- (cd conf/zabbix_agent2.d/plugins.d && \ ++ (cd $(top_srcdir)/conf/zabbix_agent2.d/plugins.d && \ + for _f in *.conf; do \ + $(INSTALL_DATA) $${_f} "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)"; \ + done) +diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am +index b217fb5..945a673 100644 +--- a/src/zabbix_agent/Makefile.am ++++ b/src/zabbix_agent/Makefile.am +@@ -69,4 +69,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -Only in zabbix-6.0.25/src/zabbix_agent: Makefile.am.orig -diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am zabbix-6.0.25/src/zabbix_get/Makefile.am ---- zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:18:10.901581002 +0800 -+++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_get - - zabbix_get_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java/Makefile.am ---- zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:18:09.889569717 +0800 -+++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -9,22 +9,22 @@ +diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am +index 43f8f19..48214c9 100644 +--- a/src/zabbix_java/Makefile.am ++++ b/src/zabbix_java/Makefile.am +@@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar @@ -696,426 +65,93 @@ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.25/src/zabbix_js/Makefile.am zabbix-6.0.25/src/zabbix_js/Makefile.am ---- zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:18:10.899580980 +0800 -+++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,26 +1,28 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_js - +diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am +index 1e4fd93..2110656 100644 +--- a/src/zabbix_js/Makefile.am ++++ b/src/zabbix_js/Makefile.am +@@ -5,30 +5,30 @@ zabbix_js_SOURCES = zabbix_js.c zabbix_js_LDADD = \ - $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ -- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ - $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ - $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ - $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ -- $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ +- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \ +- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ +- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ - $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxip/libzbxip.a \ +- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ +- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ - $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ - $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ - $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ -- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a +- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \ +- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \ +- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \ +- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \ +- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \ +- $(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a + $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ -+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ + $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ + $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ + $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ -+ $(top_builddir)/src/libs/zbxsys/libzbxsys.a \ ++ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \ ++ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ ++ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ + $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxip/libzbxip.a \ ++ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ ++ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ + $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ + $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ + $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ -+ $(top_builddir)/src/libs/zbxxml/libzbxxml.a ++ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \ ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \ ++ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \ ++ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \ ++ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \ ++ $(top_builddir)/src/libs/zbxcurl/libzbxcurl.a zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) -diff -up zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:18:10.058571602 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdatasender.a - - libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:18:10.061571635 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxheart.a - - libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:18:10.064571668 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/Makefile.am zabbix-6.0.25/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:18:10.055571568 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - heart \ - housekeeper \ -@@ -112,4 +114,4 @@ +diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am +index b56f8a8..44800a0 100644 +--- a/src/zabbix_proxy/Makefile.am ++++ b/src/zabbix_proxy/Makefile.am +@@ -151,4 +151,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" + test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:18:10.064571668 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxyconfig.a - - libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:18:10.058571602 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_sender/Makefile.am zabbix-6.0.25/src/zabbix_sender/Makefile.am ---- zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:18:10.067571702 +0800 -+++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_sender - - zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:18:10.037571367 +0800 -+++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalerter.a - - libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/availability/Makefile.am zabbix-6.0.25/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:18:10.007571033 +0800 -+++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libavailability.a - - libavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:18:09.986570799 +0800 -+++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbconfig.a - - libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:18:09.911569962 +0800 -+++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbsyncer.a - - libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:18:09.992570866 +0800 -+++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiscoverer.a - - libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:18:09.943570319 +0800 -+++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxescalator.a - - libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ha/Makefile.am zabbix-6.0.25/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:18:10.040571401 +0800 -+++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:18:09.998570933 +0800 -+++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:18:09.917570029 +0800 -+++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttppoller.a - - libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:18:09.952570420 +0800 -+++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libipmi.a - - libipmi_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/lld/Makefile.am zabbix-6.0.25/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:18:09.975570676 +0800 -+++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlld.a - - libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/Makefile.am zabbix-6.0.25/src/zabbix_server/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:18:09.943570319 +0800 -+++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - alerter \ - dbsyncer \ -@@ -151,4 +153,4 @@ +diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am +index 0a55934..a7f6a28 100644 +--- a/src/zabbix_server/Makefile.am ++++ b/src/zabbix_server/Makefile.am +@@ -186,4 +186,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:18:10.041571412 +0800 -+++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxodbc.a - - libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:18:10.008571044 +0800 -+++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpinger.a - - libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/poller/Makefile.am zabbix-6.0.25/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:18:10.031571301 +0800 -+++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a - - libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:18:10.003570988 +0800 -+++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libpreprocessor.a - - libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:18:09.909569940 +0800 -+++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxypoller.a - - libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:18:10.006571022 +0800 -+++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxreporter.a - - libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:18:10.010571066 +0800 -+++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxscripts.a - - libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:18:09.963570542 +0800 -+++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxselfmon.a - - libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/service/Makefile.am zabbix-6.0.25/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:18:10.017571144 +0800 -+++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libservice.a - - libservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:18:09.986570799 +0800 -+++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsnmptrapper.a - - libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:18:09.959570498 +0800 -+++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/timer/Makefile.am zabbix-6.0.25/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:18:10.019571167 +0800 -+++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtimer.a - - libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:18:09.933570208 +0800 -+++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +--- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 ++++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 +@@ -24,7 +24,7 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a + AC_CONFIG_HEADERS(include/common/config.h) - libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:18:10.013571100 +0800 -+++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:26:48.426352490 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) ++AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvmware.a + AC_CANONICAL_HOST - libzbxvmware_a_SOURCES = \ |