diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | include/sysinc.h | 8 | ||||
| -rw-r--r-- | include/zbxicmpping.h | 1 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/simple/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/simple/simple.c | 8 |
6 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 7cdad9dbff1..0be52ca2369 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ New features: A.F....... [ZBX-1357] updated Czech, Italian, Japanese, Georgian, Korean, Polish, Portuguese (Brazil), Russian, Slovak, Ukrainian translations; thanks to Zabbix translators (zalex_ua) Bug fixes: +....I..... [ZBX-4069] fixed LDAP and Oracle DB compilation conflict (viktors) ..F....... [ZBX-10297] fixed changing web scenario status from list view (Cemeris) ..F....... [ZBX-10158] fixed template "JMX Generic" (Gunars) ..F....... [ZBXNEXT-2662] added escaping of the HTML entities and tags in the GUI notifications (Sasha) diff --git a/configure.ac b/configure.ac index 46d4fdff700..ac86435f1a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1236,12 +1236,14 @@ if test "x$server" = "xyes" || test "x$proxy" = "xyes"; then DB_CPPFLAGS="$IBM_DB2_CPPFLAGS $MYSQL_CFLAGS $ORACLE_CPPFLAGS $POSTGRESQL_CFLAGS $SQLITE3_CPPFLAGS" DB_LDFLAGS="$IBM_DB2_LDFLAGS $MYSQL_LDFLAGS $ORACLE_LDFLAGS $POSTGRESQL_LDFLAGS $SQLITE3_LDFLAGS" DB_LIBS="$IBM_DB2_LIBS $MYSQL_LIBS $ORACLE_LIBS $POSTGRESQL_LIBS $SQLITE3_LIBS" + + AM_CPPFLAGS=$DB_CPPFLAGS AC_SUBST(DB_CPPFLAGS) AC_SUBST(DB_LDFLAGS) AC_SUBST(DB_LIBS) + AC_SUBST(AM_CPPFLAGS) - CFLAGS="${CFLAGS} ${DB_CPPFLAGS}" SERVER_LDFLAGS="${SERVER_LDFLAGS} ${DB_LDFLAGS}" SERVER_LIBS="${SERVER_LIBS} ${DB_LIBS}" diff --git a/include/sysinc.h b/include/sysinc.h index b8a254f007a..4891be3a860 100644 --- a/include/sysinc.h +++ b/include/sysinc.h @@ -165,10 +165,6 @@ # include <kstat.h> #endif -#ifdef HAVE_LDAP -# include <ldap.h> -#endif - #ifdef HAVE_WINLDAP_H # undef SEC_I_INCOMPLETE_CREDENTIALS # undef SEC_E_INCOMPLETE_CREDENTIALS @@ -332,10 +328,6 @@ # include <unistd.h> #endif -#ifdef HAVE_LBER_H -# include <lber.h> -#endif - #ifdef HAVE_SYS_IPC_H # include <sys/ipc.h> #endif diff --git a/include/zbxicmpping.h b/include/zbxicmpping.h index ad7428e74fe..e3aa62393db 100644 --- a/include/zbxicmpping.h +++ b/include/zbxicmpping.h @@ -18,7 +18,6 @@ **/ #include "common.h" -#include "db.h" typedef struct { diff --git a/src/libs/zbxsysinfo/simple/Makefile.am b/src/libs/zbxsysinfo/simple/Makefile.am index 6a50dc4cbea..c2d230ad491 100644 --- a/src/libs/zbxsysinfo/simple/Makefile.am +++ b/src/libs/zbxsysinfo/simple/Makefile.am @@ -1,5 +1,8 @@ ## Process this file with automake to produce Makefile.in +# reset AM_CPPFLAGS to avoid including $DB_CPPFLAGS +AM_CPPFLAGS = + noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ diff --git a/src/libs/zbxsysinfo/simple/simple.c b/src/libs/zbxsysinfo/simple/simple.c index 3ed4278a136..510f851030d 100644 --- a/src/libs/zbxsysinfo/simple/simple.c +++ b/src/libs/zbxsysinfo/simple/simple.c @@ -27,6 +27,14 @@ #include "ntp.h" #include "simple.h" +#ifdef HAVE_LDAP +# include <ldap.h> +#endif + +#ifdef HAVE_LBER_H +# include <lber.h> +#endif + ZBX_METRIC parameters_simple[] = /* KEY FLAG FUNCTION TEST PARAMETERS */ { |