.......... [DEV-2142] update from master

1 files changed, 185 insertions, 342 deletions

diff --git a/configure.ac b/configure.ac
index 012058ab14a..5b47f73777c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION])
 
 AC_PROG_MAKE_SET
 
-AM_CONFIG_HEADER(include/common/config.h)
+AC_CONFIG_HEADERS(include/common/config.h)
 
 AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include'])
 
@@ -48,7 +48,8 @@ dnl *                   Checks for header files                     *
 dnl *                                                               *
 dnl *****************************************************************
 
-AC_HEADER_STDC
+AC_PROG_EGREP
+
 AC_CHECK_HEADERS(stdio.h stdlib.h string.h unistd.h netdb.h signal.h \
   syslog.h time.h errno.h sys/types.h sys/stat.h netinet/in.h \
   math.h sys/socket.h dirent.h ctype.h \
@@ -105,12 +106,11 @@ AC_MSG_CHECKING(whether compiler supports -Werror=cpp)
 checked_werror_cpp_CFLAGS=""
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Werror=cpp"
-AC_TRY_COMPILE(,[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
   void f() {};
-],checked_werror_cpp_CFLAGS="-Werror=cpp"
-  AC_MSG_RESULT(yes),
-  AC_MSG_RESULT(no)
-)
+]])],[checked_werror_cpp_CFLAGS="-Werror=cpp"
+  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+])
 CFLAGS="$saved_CFLAGS"
 
 saved_CFLAGS="$CFLAGS"
@@ -214,20 +214,18 @@ AC_C_CONST
 AC_TYPE_PID_T
 
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/socket.h>
-],[socklen_t s;],
-AC_MSG_RESULT(yes),
-[AC_DEFINE(socklen_t, int, [Define socklen_t type.])
+]], [[socklen_t s;]])],[AC_MSG_RESULT(yes)],[AC_DEFINE(socklen_t, int, [Define socklen_t type.])
 AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for actual socklen_t parameter type in socket functions)
 zbx_socklen_t=
 for arg2 in "struct sockaddr" void; do
   for arg3 in socklen_t size_t int; do
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
@@ -235,13 +233,13 @@ for arg2 in "struct sockaddr" void; do
 #  include <sys/socket.h>
 #endif
       extern int getpeername(int sockfd, $arg2 *addr, $arg3 *addrlen);
-    ],[
+    ]], [[
       $arg3 addrlen;
       getpeername(0, 0, &addrlen);
-    ],[
+    ]])],[
       zbx_socklen_t="$arg3"
       break 2
-    ])
+    ],[])
   done
 done
 if test "x$zbx_socklen_t" != "x"; then
@@ -254,17 +252,17 @@ fi
 AC_MSG_CHECKING(for integer field name in union sigval of struct siginfo_t)
 zbx_sival_int=
 for field in sival_int sigval_int; do
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>
 #endif
-  ],[
+  ]], [[
     siginfo_t siginfo;
     siginfo.si_value.$field = 0;
-  ],[
+  ]])],[
     zbx_sival_int="$field"
     break
-  ])
+  ],[])
 done
 if test "x$zbx_sival_int" != "x"; then
   AC_MSG_RESULT($zbx_sival_int)
@@ -274,8 +272,7 @@ else
 fi
 
 AC_MSG_CHECKING(for res_ninit)
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -294,19 +291,15 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	struct __res_state	res_state_local;
 
 	res_ninit(&res_state_local);
-],
-AC_DEFINE(HAVE_RES_NINIT,1,[Define to 1 if 'res_ninit' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_NINIT,1,Define to 1 if 'res_ninit' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for res_ndestroy)
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -325,20 +318,16 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	struct __res_state	res_state_local;
 
 	res_ninit(&res_state_local);
 	res_ndestroy(&res_state_local);
-],
-AC_DEFINE(HAVE_RES_NDESTROY,1,[Define to 1 if 'res_ndestroy' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_NDESTROY,1,Define to 1 if 'res_ndestroy' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for _res._u._ext.nsaddrs[])
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -357,19 +346,15 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	struct sockaddr_in6	*sockaddrin6;
 
 	sockaddrin6 = _res._u._ext.nsaddrs[0];
-],
-AC_DEFINE(HAVE_RES_U_EXT,1,[Define to 1 if '_res._u._ext.nsaddrs[]' exists. /Linux/])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_U_EXT,1,Define to 1 if '_res._u._ext.nsaddrs[]' exists. /Linux/)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for _res._u._ext.ext)
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -388,19 +373,15 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	struct __res_state_ext	*ext;
 
 	ext = _res._u._ext.ext;
-],
-AC_DEFINE(HAVE_RES_U_EXT_EXT,1,[Define to 1 if '_res._u._ext.ext' exists. /BSD/])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_U_EXT_EXT,1,Define to 1 if '_res._u._ext.ext' exists. /BSD/)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for _res._ext.ext.nsaddrs[])
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -419,19 +400,15 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	union res_sockaddr_union	*na;
 
 	na = &_res._ext.ext.nsaddrs[0];
-],
-AC_DEFINE(HAVE_RES_EXT_EXT,1,[Define to 1 if '_res._ext.ext.nsaddrs[]' exists. /AIX/])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_EXT_EXT,1,Define to 1 if '_res._ext.ext.nsaddrs[]' exists. /AIX/)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for struct sockaddr_in6.sin6_len)
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
@@ -450,32 +427,24 @@ AC_TRY_LINK(
 #ifndef T_SOA
 #	define T_SOA	ns_t_soa
 #endif	/* T_SOA */
-],
-[
+]], [[
 	struct sockaddr_in6	sin6;
 	unsigned int		len;
 
 	len = sin6.sin6_len;
-],
-AC_DEFINE(HAVE_RES_SIN6_LEN,1,[Define to 1 if 'sockaddr_in6.sin6_len' exists. /BSD/])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_RES_SIN6_LEN,1,Define to 1 if 'sockaddr_in6.sin6_len' exists. /BSD/)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for union semun)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
-],
-[union semun foo;],
-AC_DEFINE(HAVE_SEMUN, 1, [Define to 1 if union 'semun' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]], [[union semun foo;]])],[AC_DEFINE(HAVE_SEMUN, 1, Define to 1 if union 'semun' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for struct swaptable in sys/swap.h)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
@@ -484,8 +453,7 @@ AC_TRY_COMPILE(
 #ifndef NULL
 #define NULL (void *)0
 #endif
-],
-[
+]], [[
     register int cnt, i;
     register int t, f;
     struct swaptable *swt;
@@ -535,154 +503,111 @@ point
     /* fill in the results */
     free(swt);
 
-],
-AC_DEFINE(HAVE_SYS_SWAP_SWAPTABLE,1,[Define to 1 if struct 'swaptable' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYS_SWAP_SWAPTABLE,1,Define to 1 if struct 'swaptable' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for struct sensordev in sys/sensors.h)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdlib.h>
 #include <sys/queue.h>
-#include <sys/sensors.h>],
-[struct sensordev sensordev;
+#include <sys/sensors.h>]], [[struct sensordev sensordev;
 sensordev.xname[0]='\0';
 sensordev.maxnumt[0]=0;
-],
-AC_DEFINE(HAVE_SENSORDEV,1,[Define to 1 if struct 'sensordev' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SENSORDEV,1,Define to 1 if struct 'sensordev' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for struct statvfs64 in sys/statvfs.h)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STATVFS_H
 #	include <sys/statvfs.h>
 #endif
-],
-[
+]], [[
 	struct statvfs64	s;
 	s.f_frsize = s.f_blocks = s.f_bfree = s.f_bavail = 0;
 	statvfs64("/", &s);
-],
-AC_DEFINE(HAVE_SYS_STATVFS64, 1, [Define to 1 if struct 'statvfs64' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYS_STATVFS64, 1, Define to 1 if struct 'statvfs64' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for struct statfs64 in sys/statfs.h)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #	include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STATFS_H
 #	include <sys/statfs.h>
 #endif
-],
-[
+]], [[
 	struct statfs64	s;
 	s.f_bsize = s.f_blocks = s.f_bfree = s.f_bavail = 0;
 	statfs64("/", &s);
-],
-AC_DEFINE(HAVE_SYS_STATFS64, 1, [Define to 1 if struct 'statfs64' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYS_STATFS64, 1, Define to 1 if struct 'statfs64' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field ss_family in struct sockaddr_storage)
-AC_TRY_COMPILE([#include <sys/socket.h>],
-[struct sockaddr_storage ss;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>]], [[struct sockaddr_storage ss;
 ss.ss_family = 0;
-],
-AC_DEFINE(HAVE_SOCKADDR_STORAGE_SS_FAMILY, 1, [Define to 1 if 'sockaddr_storage.ss_family' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SOCKADDR_STORAGE_SS_FAMILY, 1, Define to 1 if 'sockaddr_storage.ss_family' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field mem_unit in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.mem_unit=0;
-],
-AC_DEFINE(HAVE_SYSINFO_MEM_UNIT,1,[Define to 1 if 'sysinfo.mem_unit' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_MEM_UNIT,1,Define to 1 if 'sysinfo.mem_unit' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field freeswap in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.freeswap=0;
-],
-AC_DEFINE(HAVE_SYSINFO_FREESWAP,1,[Define to 1 if 'sysinfo.freeswap' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_FREESWAP,1,Define to 1 if 'sysinfo.freeswap' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field totalswap in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.totalswap=0;
-],
-AC_DEFINE(HAVE_SYSINFO_TOTALSWAP,1,[Define to 1 if 'sysinfo.totalswap' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_TOTALSWAP,1,Define to 1 if 'sysinfo.totalswap' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field totalram in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.totalram=0;
-],
-AC_DEFINE(HAVE_SYSINFO_TOTALRAM,1,[Define to 1 if 'sysinfo.totalram' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_TOTALRAM,1,Define to 1 if 'sysinfo.totalram' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field sharedram in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.sharedram=0;
-],
-AC_DEFINE(HAVE_SYSINFO_SHAREDRAM,1,[Define to 1 if 'sysinfo.sharedram' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_SHAREDRAM,1,Define to 1 if 'sysinfo.sharedram' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field bufferram in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.bufferram=0;
-],
-AC_DEFINE(HAVE_SYSINFO_BUFFERRAM,1,[Define to 1 if 'sysinfo.bufferram' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_BUFFERRAM,1,Define to 1 if 'sysinfo.bufferram' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field freeram in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.freeram=0;
-],
-AC_DEFINE(HAVE_SYSINFO_FREERAM,1,[Define to 1 if 'sysinfo.freeram' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_FREERAM,1,Define to 1 if 'sysinfo.freeram' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field uptime in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.uptime=0;
-],
-AC_DEFINE(HAVE_SYSINFO_UPTIME,1,[Define to 1 if 'sysinfo.uptime' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_UPTIME,1,Define to 1 if 'sysinfo.uptime' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field procs in struct sysinfo)
-AC_TRY_COMPILE([#include <sys/sysinfo.h>],
-[struct sysinfo sysinfo;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/sysinfo.h>]], [[struct sysinfo sysinfo;
 sysinfo.procs=0;
-],
-AC_DEFINE(HAVE_SYSINFO_PROCS,1,[Define to 1 if 'sysinfo.procs' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_SYSINFO_PROCS,1,Define to 1 if 'sysinfo.procs' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for field tm_gmtoff in struct tm)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif	/* HAVE_SYS_TIME_H */
@@ -690,43 +615,33 @@ AC_TRY_COMPILE([
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif	/* HAVE_TIME_H */
-],
-[
+]], [[
 	struct tm tm;
 	tm.tm_gmtoff;
-],
-AC_DEFINE(HAVE_TM_TM_GMTOFF,1,[Define to 1 if 'tm.tm_gmtoff' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_TM_TM_GMTOFF,1,Define to 1 if 'tm.tm_gmtoff' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for linker options --start-group/--end-group)
 saved_LDFLAGS="$LDFLAGS"
 LDFLAGS="-Wl,--start-group -Wl,--end-group"
-AC_TRY_LINK([], [],
-HAVE_START_GROUP="yes"
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no)
-)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[HAVE_START_GROUP="yes"
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+])
 LDFLAGS="$saved_LDFLAGS"
 
 AC_MSG_CHECKING(for '__thread' compiler support)
-AC_TRY_COMPILE([#include <stdio.h>],[static __thread int a = 0;],
-AC_DEFINE(HAVE_THREAD_LOCAL,1,[Define to 1 if compiler keyword '__thread' supported.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no)
-HAVE_THREAD_LOCAL="no")
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[static __thread int a = 0;]])],[AC_DEFINE(HAVE_THREAD_LOCAL,1,Define to 1 if compiler keyword '__thread' supported.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+HAVE_THREAD_LOCAL="no"])
 
 AC_MSG_CHECKING(for field updates in struct vminfo_t)
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/sysinfo.h>
-],
-[
+]], [[
 	vminfo_t vminfo;
 	vminfo.updates;
-],
-AC_DEFINE(HAVE_VMINFO_T_UPDATES,1,[Define to 1 if 'vminfo.updates' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_VMINFO_T_UPDATES,1,Define to 1 if 'vminfo.updates' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 dnl *****************************************************************
 dnl *                                                               *
@@ -735,63 +650,46 @@ dnl *                                                               *
 dnl *****************************************************************
 
 AC_MSG_CHECKING(for function sysconf() in unistd.h)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <unistd.h>
-],
-[	int i;
+]], [[	int i;
 
 	i=sysconf(_SC_PHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
 	i=sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PHYS_PAGES);
-],
-AC_DEFINE(HAVE_UNISTD_SYSCONF,1,[Define to 1 if function 'sysconf' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_UNISTD_SYSCONF,1,Define to 1 if function 'sysconf' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function initgroups())
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <grp.h>
-],
-[
+]], [[
 	char	*user = "zabbix";
 	initgroups(user, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_INITGROUPS,1,[Define to 1 if function 'initgroups' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_INITGROUPS,1,Define to 1 if function 'initgroups' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for functions seteuid() and setegid())
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <unistd.h>
-],
-[
+]], [[
 	seteuid(0);
 	setegid(0);
-],
-AC_DEFINE(HAVE_FUNCTION_SETEUID,1,[Define to 1 if functions 'seteuid' and 'setegid' exist.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SETEUID,1,Define to 1 if functions 'seteuid' and 'setegid' exist.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function setproctitle())
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <unistd.h>
-],
-[
+]], [[
 	setproctitle("Test %d", 1);
-],
-AC_DEFINE(HAVE_FUNCTION_SETPROCTITLE,1,[Define to 1 if function 'setproctitle' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SETPROCTITLE,1,Define to 1 if function 'setproctitle' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctlbyname())
-AC_TRY_LINK(
-[
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
@@ -801,17 +699,13 @@ AC_TRY_LINK(
 #endif /* HAVE_SYS_PARAM_H */
 
 #include <sys/sysctl.h>
-],
-[
+]], [[
 	sysctlbyname("", 0, 0, 0, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTLBYNAME,1,[Define to 1 if 'sysctlbyname' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTLBYNAME,1,Define to 1 if 'sysctlbyname' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctl (KERN_BOOTTIME))
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
@@ -824,8 +718,7 @@ AC_TRY_COMPILE(
 #include <unistd.h>
 #include <time.h>
 #include <sys/time.h>
-],
-[
+]], [[
 	size_t		len;
 	struct timeval	uptime;
         int		mib[2];
@@ -835,14 +728,11 @@ AC_TRY_COMPILE(
 
         len = sizeof(uptime);
         sysctl(mib, 2, &uptime, &len, 0, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME,1,[Define to 1 if 'KERN_BOOTTIME' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_BOOTTIME,1,Define to 1 if 'KERN_BOOTTIME' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctl (HW_NCPU))
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
@@ -852,8 +742,7 @@ AC_TRY_COMPILE(
 #endif /* HAVE_SYS_PARAM_H */
 
 #include <sys/sysctl.h>
-],
-[
+]], [[
 	size_t	len;
 	int	mib[2], ncpu;
 
@@ -862,14 +751,11 @@ AC_TRY_COMPILE(
 
 	len = sizeof(ncpu);
 	sysctl(mib, 2, &ncpu, &len, 0, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTL_HW_NCPU,1,[Define to 1 if 'HW_NCPU' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTL_HW_NCPU,1,Define to 1 if 'HW_NCPU' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctl (KERN_MAXFILES))
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
@@ -879,8 +765,7 @@ AC_TRY_COMPILE(
 #endif /* HAVE_SYS_PARAM_H */
 
 #include <sys/sysctl.h>
-],
-[
+]], [[
 	size_t	len;
         int	mib[2], maxfiles;
 
@@ -889,14 +774,11 @@ AC_TRY_COMPILE(
 
         len = sizeof(maxfiles);
         sysctl(mib, 2, &maxfiles, &len, 0, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_MAXFILES,1,[Define to 1 if 'KERN_MAXFILES' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_MAXFILES,1,Define to 1 if 'KERN_MAXFILES' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctl (KERN_MAXPROC))
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
@@ -906,8 +788,7 @@ AC_TRY_COMPILE(
 #endif /* HAVE_SYS_PARAM_H */
 
 #include <sys/sysctl.h>
-],
-[
+]], [[
 	size_t	len;
 	int	mib[2], maxproc;
 
@@ -916,14 +797,11 @@ AC_TRY_COMPILE(
 
         len = sizeof(maxproc);
         sysctl(mib, 2, &maxproc, &len, 0, 0);
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_MAXPROC,1,[Define to 1 if 'KERN_MAXPROC' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_MAXPROC,1,Define to 1 if 'KERN_MAXPROC' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function sysctl (KERN_CPTIME,KERN_CPTIME2))
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #if defined(HAVE_SYS_DKSTAT_H)
@@ -931,8 +809,7 @@ AC_TRY_COMPILE(
 #elif defined(HAVE_SYS_SCHED_H)
 #	include <sys/sched.h>
 #endif
-],
-[
+]], [[
 size_t	sz;
 int	i[] = {CP_USER, CP_NICE, CP_SYS, CP_INTR, CP_IDLE};
 
@@ -951,25 +828,20 @@ int	i[] = {CP_USER, CP_NICE, CP_SYS, CP_INTR, CP_IDLE};
 	sz = sizeof(states);
 	sysctl(mib, 3, &states, &sz, NULL, 0);
 }
-],
-AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_CPTIME,1,[Define to 1 if 'KERN_CPTIME,KERN_CPTIME2' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_FUNCTION_SYSCTL_KERN_CPTIME,1,Define to 1 if 'KERN_CPTIME,KERN_CPTIME2' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for function clock_gettime in time.h)
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_TIME_H
 #	include <time.h>
 #elif HAVE_SYS_TIME_H
 #	include <sys/time.h>
 #endif	/* HAVE_SYS_TIME_H */
-],
-[struct timespec tp;
+]], [[struct timespec tp;
 clock_gettime(CLOCK_REALTIME, &tp);
-],
-AC_DEFINE(HAVE_TIME_CLOCK_GETTIME,1,[Define to 1 if function 'clock_gettime' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_TIME_CLOCK_GETTIME,1,Define to 1 if function 'clock_gettime' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 dnl *****************************************************************
 dnl *                                                               *
@@ -978,33 +850,25 @@ dnl *                                                               *
 dnl *****************************************************************
 
 AC_MSG_CHECKING(for macro __va_copy() in stdarg.h)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdarg.h>
-],
-[
+]], [[
 	va_list	src,dst;
 
 	__va_copy(dst,src);
-],
-AC_DEFINE(HAVE___VA_COPY,1,[Define to 1 if macro '__va_copy' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE___VA_COPY,1,Define to 1 if macro '__va_copy' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for macro __VA_ARGS__)
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #define ZBX_CONST_STRING(str)   str
 int test(const char *fmt, ...) { return 0; }
-],
-[
+]], [[
 #define TEST(fmt, ...) test(ZBX_CONST_STRING(fmt), ##__VA_ARGS__)
 TEST("%s","test");
 TEST("test");
-],
-AC_DEFINE(HAVE___VA_ARGS__,1,[Define to 1 if macro '__VA_ARGS__' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE___VA_ARGS__,1,Define to 1 if macro '__VA_ARGS__' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 dnl *****************************************************************
 dnl *                                                               *
@@ -1012,7 +876,6 @@ dnl *                 Checks for library functions                  *
 dnl *                                                               *
 dnl *****************************************************************
 
-AC_TYPE_SIGNAL
 AC_REPLACE_FUNCS(getloadavg)
 AC_CHECK_FUNCS(hstrerror)
 AC_CHECK_FUNCS(getenv)
@@ -1087,8 +950,7 @@ dnl *****************************************************************
 dnl Check for %qu format (FreeBSD 4.x)
 dnl FreeBSD 4.x does not support %llu
 AC_MSG_CHECKING(for long long format)
-AC_TRY_RUN(
-[
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 int main()
 {
@@ -1099,24 +961,18 @@ int main()
         if (i == 200000000010020) return 0;
         else return -1;
 }
-],
-AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,Define to 1 if format '%qu' exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
 
 dnl option -rdynamic is needed for readable backtraces
 AC_MSG_CHECKING(for -rdynamic linking option)
 saved_LDFLAGS="$LDFLAGS"
 LDFLAGS="-rdynamic $LDFLAGS"
-AC_TRY_LINK([#include <execinfo.h>],
-[void *bcktrc[6];
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <execinfo.h>]], [[void *bcktrc[6];
 (void)backtrace(bcktrc, 6);
-],
-LDFLAGS="-rdynamic $saved_LDFLAGS"
-AC_MSG_RESULT(yes),
-LDFLAGS="$saved_LDFLAGS"
-AC_MSG_RESULT(no))
+]])],[LDFLAGS="-rdynamic $saved_LDFLAGS"
+AC_MSG_RESULT(yes)],[LDFLAGS="$saved_LDFLAGS"
+AC_MSG_RESULT(no)])
 
 dnl *****************************************************************
 dnl *                                                               *
@@ -1125,28 +981,22 @@ dnl *                                                               *
 dnl *****************************************************************
 
 AC_MSG_CHECKING(for libperfstat 5.2.0.40 fileset)
-AC_TRY_COMPILE([#include <sys/protosw.h>
-#include <libperfstat.h>],
-[perfstat_memory_total_t	memstats;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/protosw.h>
+#include <libperfstat.h>]], [[perfstat_memory_total_t	memstats;
 memstats.virt_active = 0;
-],
-AC_DEFINE(HAVE_AIXOSLEVEL_520004,1,[Define to 1 if libperfstat 5.2.0.40 fileset exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_AIXOSLEVEL_520004,1,Define to 1 if libperfstat 5.2.0.40 fileset exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING(for libperfstat 5.3.0.60 fileset)
-AC_TRY_COMPILE([#include <sys/protosw.h>
-#include <libperfstat.h>],
-[perfstat_partition_total_t	lparstats;
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/protosw.h>
+#include <libperfstat.h>]], [[perfstat_partition_total_t	lparstats;
 lparstats.type.b.donate_enabled = 0;
 lparstats.idle_donated_purr = 0;
 lparstats.busy_donated_purr = 0;
 lparstats.idle_stolen_purr = 0;
 lparstats.busy_stolen_purr = 0;
-],
-AC_DEFINE(HAVE_AIXOSLEVEL_530006,1,[Define to 1 if libperfstat 5.3.0.60 fileset exists.])
-AC_MSG_RESULT(yes),
-AC_MSG_RESULT(no))
+]])],[AC_DEFINE(HAVE_AIXOSLEVEL_530006,1,Define to 1 if libperfstat 5.3.0.60 fileset exists.)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 case "$host_os" in
 linux*)
@@ -1212,12 +1062,9 @@ if test "x$ARCH" = "xsolaris"; then
 	AC_MSG_CHECKING(for -m64 compilation flag)
 	saved_CFLAGS="$CFLAGS"
 	CFLAGS="-m64"
-	AC_TRY_RUN(
-	[int main(void) {return 0;}],
-	CFLAGS="-m64 $saved_CFLAGS"
-	AC_MSG_RESULT(yes),
-	CFLAGS="$saved_CFLAGS"
-	AC_MSG_RESULT(no))
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(void) {return 0;}]])],[CFLAGS="-m64 $saved_CFLAGS"
+	AC_MSG_RESULT(yes)],[CFLAGS="$saved_CFLAGS"
+	AC_MSG_RESULT(no)],[])
 	CFLAGS="${CFLAGS} -DZBX_OLD_SOLARIS"
 fi
 
@@ -1235,8 +1082,7 @@ if test "x$ARCH" = "xhpux"; then
 	AC_MSG_CHECKING(for -D_HPUX_API_LEVEL=20040821 compilation flag)
 	saved_CFLAGS="$CFLAGS"
 	CFLAGS="-D_HPUX_API_LEVEL=20040821"
-	AC_TRY_RUN(
-[
+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef HAVE_DLFCN_H
 #	include <dlfcn.h>
 #endif
@@ -1261,11 +1107,9 @@ int main(void)
 
 	return -1 == uname(&name) ? 1 : 0;
 }
-],
-	CFLAGS="-D_HPUX_API_LEVEL=20040821 $saved_CFLAGS"
-	AC_MSG_RESULT(yes),
-	CFLAGS="$saved_CFLAGS"
-	AC_MSG_RESULT(no))
+]])],[CFLAGS="-D_HPUX_API_LEVEL=20040821 $saved_CFLAGS"
+	AC_MSG_RESULT(yes)],[CFLAGS="$saved_CFLAGS"
+	AC_MSG_RESULT(no)],[])
 fi
 
 AC_DEFINE_UNQUOTED([ARCH], "${ARCH}", [Define to OS name for code managing])
@@ -1499,13 +1343,10 @@ if test "x$server" = "xyes" || test "x$proxy" = "xyes"; then
 			LDFLAGS="$LDFLAGS $SQLITE3_LDFLAGS $SQLITE3_LIBS"
 
 			AC_MSG_CHECKING([for function sqlite3_open_v2() in sqlite3.h])
-			AC_TRY_LINK([#include <sqlite3.h>],
-				[sqlite3 *conn = 0;
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sqlite3.h>]], [[sqlite3 *conn = 0;
 				sqlite3_open_v2("dbname", &conn, SQLITE_OPEN_READWRITE, 0);
-				],
-				AC_DEFINE(HAVE_FUNCTION_SQLITE3_OPEN_V2,1,[Define to 1 if function 'sqlite3_open_v2' exists.])
-				AC_MSG_RESULT(yes),
-				AC_MSG_RESULT(no))
+				]])],[AC_DEFINE(HAVE_FUNCTION_SQLITE3_OPEN_V2,1,Define to 1 if function 'sqlite3_open_v2' exists.)
+				AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
 
 			CPPFLAGS="$saved_CPPFLAGS"
 			LDFLAGS="$saved_LDFLAGS"
@@ -2089,7 +1930,7 @@ dnl *****************************************************************
 
 m4_ifdef([CONF_TESTS],[CONF_TESTS])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
 	database/Makefile
@@ -2184,6 +2025,7 @@ AC_OUTPUT([
 	src/zabbix_proxy/diag/Makefile
 	src/zabbix_proxy/housekeeper/Makefile
 	src/zabbix_proxy/proxyconfig/Makefile
+	src/zabbix_proxy/rtc/Makefile
 	src/zabbix_proxy/proxyconfigwrite/Makefile
 	src/zabbix_proxy/stats/Makefile
 	src/zabbix_proxy/taskmanager/Makefile
@@ -2208,8 +2050,8 @@ AC_OUTPUT([
 	src/zabbix_server/proxyconfigread/Makefile
 	src/zabbix_server/proxypoller/Makefile
 	src/zabbix_server/reporter/Makefile
+	src/zabbix_server/rtc/Makefile
 	src/zabbix_server/scripts/Makefile
-	src/zabbix_server/selfmon/Makefile
 	src/zabbix_server/service/Makefile
 	src/zabbix_server/snmptrapper/Makefile
 	src/zabbix_server/stats/Makefile
@@ -2219,6 +2061,7 @@ AC_OUTPUT([
 	src/zabbix_server/vmware/Makefile
 	man/Makefile
 	])
+AC_OUTPUT
 
 dnl The following variables use autoconf variables such as
 dnl ${sysconfdir} and ${datadir} . Which in turn contain