diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-08 16:13:49 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-01-08 16:13:49 +0000 |
| commit | ea6bdbcf952e5ac4696cb91364c1923f6ab96321 (patch) | |
| tree | 06184b10a3e0231b7c18d9cf6a66f2a3a6f97f8c /src/zabbix_server/httppoller | |
| parent | 8f08a8271468cf8285f000ac4c0b25e12f1d596b (diff) | |
| download | zabbix-ea6bdbcf952e5ac4696cb91364c1923f6ab96321.tar.gz zabbix-ea6bdbcf952e5ac4696cb91364c1923f6ab96321.tar.xz zabbix-ea6bdbcf952e5ac4696cb91364c1923f6ab96321.zip | |
- improved databases determination of configuration script (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3664 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/httppoller')
| -rw-r--r-- | src/zabbix_server/httppoller/Makefile.am | 2 | ||||
| -rw-r--r-- | src/zabbix_server/httppoller/httptest.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/zabbix_server/httppoller/Makefile.am b/src/zabbix_server/httppoller/Makefile.am index 19d1a9bc..90ce0fd6 100644 --- a/src/zabbix_server/httppoller/Makefile.am +++ b/src/zabbix_server/httppoller/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS= -INCLUDES=-I@top_srcdir@/include @MYSQL_INCLUDE@ @ORACLE_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@ +INCLUDES=-I@top_srcdir@/include @MYSQL_CFLAGS@ @ORACLE_INCLUDE@ @POSTGRESQL_CFLAGS@ @SNMP_INCLUDE@ lib_LIBRARIES=libzbxhttppoller.a libzbxhttppoller_a_SOURCES=httptest.c httppoller.c diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index dc98eef2..e01d2528 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -51,6 +51,7 @@ size_t HEADERFUNCTION( void *ptr, size_t size, size_t nmemb, void *stream) void process_http_data() { +#ifdef HAVE_LIBCURL DB_RESULT result; DB_ROW row; char server_esc[MAX_STRING_LEN]; @@ -77,6 +78,7 @@ void process_http_data() DBfree_result(result); DBfree_result(result); +#endif /* HAVE_LIBCURL */ } @@ -98,6 +100,7 @@ void process_http_data() ******************************************************************************/ int process_httptest(zbx_uint64_t httptestid) { +#ifdef HAVE_LIBCURL DB_RESULT result; DB_ROW row; int ret = SUCCEED; @@ -199,6 +202,7 @@ int process_httptest(zbx_uint64_t httptestid) (void)curl_easy_cleanup(easyhandle); return ret; +#endif /* HAVE_LIBCURL */ } /****************************************************************************** @@ -218,6 +222,7 @@ int process_httptest(zbx_uint64_t httptestid) ******************************************************************************/ void process_httptests(int now) { +#ifdef HAVE_LIBCURL DB_RESULT result; DB_ROW row; @@ -234,4 +239,5 @@ void process_httptests(int now) DBexecute("update httptest set nextcheck=%d+delay where httptestid=" ZBX_FS_UI64, now, httptestid); } DBfree_result(result); +#endif /* HAVE_LIBCURL */ } |