- [ZBX-183] fixed compilation problem with undefined res_query() (Alexei)

   [svn merge -r5099:5109 svn://svn.zabbix.com/branches/1.4]


git-svn-id: svn://svn.zabbix.com/trunk@5111 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 28 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cfcc3cdf..62989d34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@ Changes for 1.5:
 
 Changes for 1.4.3:
 
+ - [ZBX-183] fixed compilation problem with undefined res_query() (Alexei)
  - [ZBX-34] fixed transaction related conflict in DBget_maxid (Sasha)
  - [ZBX-181] fixed Activate/Disable items from applications (Artem)
  - [ZBX-176] fixed static compilation of Jabber support (Alexei)
diff --git a/configure.in b/configure.in
index 9bf639f6..975af179 100644
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,29 @@ AC_CHECK_LIB(m, main)
 AC_CHECK_LIB(kvm, main)
 dnl AC_CHECK_LIB(pthread, main)
 
+dnl Check for function res_query
+AC_MSG_CHECKING(for function res_query)
+AC_TRY_COMPILE(
+[
+#include <resolv.h>
+#if !defined(C_IN)
+#       define C_IN     ns_c_in
+#endif /* C_IN */
+
+#if !defined(T_SOA)
+#       define T_SOA    ns_t_soa
+#endif /* T_SOA */
+],
+[
+	char zone[1024];
+	char respbuf[1024];
+	res_query(zone, C_IN, T_SOA, (unsigned char *)respbuf, sizeof(respbuf));
+],
+AC_DEFINE(HAVE_RES_QUERY, 1 ,[Define to 1 if function 'res_query' exist.])
+AC_MSG_RESULT(yes),
+AC_MSG_RESULT(no))
+
+
 dnl Check for union semun
 AC_MSG_CHECKING(for union semun)
 AC_TRY_COMPILE(
diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c
index bb993f5f..de4b100e 100644
--- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c
@@ -187,6 +187,8 @@ int	CHECK_DNS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *
 {
 #if !defined(_WINDOWS)
 
+#ifdef HAVE_RES_QUERY
+
 #if !defined(PACKETSZ)
 #	define PACKETSZ 512
 #endif /* PACKETSZ */
@@ -257,5 +259,7 @@ int	CHECK_DNS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *
 	return SYSINFO_RET_OK;
 #else
 	return SYSINFO_RET_FAIL;
+#endif /* not HAVE_RES_QUERY */
+	return SYSINFO_RET_FAIL;
 #endif /* not WINDOWS */
 }