3 files changed, 18 insertions, 18 deletions
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 01321679..9621628d 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -22,8 +22,6 @@ zabbix_server_SOURCES = \
 	functions.c functions.h \
 	server.c
 
-zabbix_server_CPPFLAGS = -DZABBIX_DAEMON $(DB_CPPFLAGS) $(SNMP_INCLUDE) $(LIBCURL_CPPFLAGS)
-
 zabbix_server_LDADD = \
 	alerter/libzbxalerter.a \
 	pinger/libzbxpinger.a \
@@ -34,18 +32,20 @@ zabbix_server_LDADD = \
 	nodewatcher/libzbxnodewatcher.a \
 	utils/libzbxutils.a \
 	httppoller/libzbxhttppoller.a \
-	../libs/zbxsysinfo/libzbxsysinfo.a \
-	../libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
-	../libs/zbxlog/libzbxlog.a \
-	../libs/zbxnix/libzbxnix.a \
-	../libs/zbxsys/libzbxsys.a \
-	../libs/zbxconf/libzbxconf.a \
-	../libs/zbxemail/libzbxemail.a \
-	../libs/zbxnet/libzbxnet.a \
-	../libs/zbxsms/libzbxsms.a \
-	../libs/zbxdbhigh/libzbxdbhigh.a \
-	../libs/zbxcommon/libzbxcommon.a \
-	../libs/zbxcrypto/libzbxcrypto.a \
-	../libs/zbxcomms/libzbxcomms.a
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/$(ARCH)/libzbxsysinfo2.a \
+	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
+	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
+	$(top_srcdir)/src/libs/zbxemail/libzbxemail.a \
+	$(top_srcdir)/src/libs/zbxnet/libzbxnet.a \
+	$(top_srcdir)/src/libs/zbxsms/libzbxsms.a \
+	$(top_srcdir)/src/libs/zbxdbhigh/libzbxdbhigh.a \
+	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a
+
+zabbix_server_CPPFLAGS = -DZABBIX_DAEMON $(DB_CPPFLAGS) $(SNMP_CPPFLAGS) $(LDAP_CPPFLAGS) $(LIBCURL_CPPFLAGS)
 
-zabbix_server_LDFLAGS = $(DB_LDFLAGS) $(SNMP_LIBS) $(LDAP_LIBS) $(LIBCURL)
+zabbix_server_LDFLAGS = $(DB_LDFLAGS) $(SNMP_LDFLAGS) $(LDAP_LDFLAGS) $(LIBCURL_LDFLAGS)
diff --git a/src/zabbix_server/httppoller/Makefile.am b/src/zabbix_server/httppoller/Makefile.am
index 03d3b1f4..ef6b8432 100644
--- a/src/zabbix_server/httppoller/Makefile.am
+++ b/src/zabbix_server/httppoller/Makefile.am
@@ -7,4 +7,4 @@ libzbxhttppoller_a_SOURCES = \
 	httptest.c httptest.h \
 	httppoller.c httppoller.h
 
-libzbxhttppoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
+libzbxhttppoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_CPPFLAGS)
diff --git a/src/zabbix_server/poller/Makefile.am b/src/zabbix_server/poller/Makefile.am
index 3a0261cb..9148464d 100644
--- a/src/zabbix_server/poller/Makefile.am
+++ b/src/zabbix_server/poller/Makefile.am
@@ -10,4 +10,4 @@ libzbxpoller_a_SOURCES = \
 	checks_aggregate.c checks_aggregate.h \
 	poller.c poller.h
 
-libzbxpoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_INCLUDE)
+libzbxpoller_a_CPPFLAGS = $(DB_CPPFLAGS) $(SNMP_CPPFLAGS)