diff options
author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-09-10 13:24:03 +0300 |
---|---|---|
committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-09-11 09:06:57 +0300 |
commit | eb2d42ea3383c372917b59d2166cba757b30c446 (patch) | |
tree | a19aee2217657ef4af4fc9936f08bbddeb74e496 /build-backend.xml | |
parent | 062610a53f3eabd96d6344d56c69b00195c6ea3a (diff) |
A.F.....S. [ZBXNEXT-5416] removed "Jabber" and "Ez texting" media types from server side, UI and API
Diffstat (limited to 'build-backend.xml')
-rw-r--r-- | build-backend.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build-backend.xml b/build-backend.xml index 351c3076a19..98d26d914c0 100644 --- a/build-backend.xml +++ b/build-backend.xml @@ -29,9 +29,9 @@ <property name="conf2" value="--enable-server ${with.db}"/> <property name="conf3" value="--enable-proxy ${with.db}"/> <property name="conf4" value="--enable-server --enable-agent --enable-proxy ${with.db}"/> - <property name="conf5" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl"/> - <property name="conf6" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> - <property name="conf7" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-gnutls --with-ldap --with-libcurl"/> + <property name="conf5" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl"/> + <property name="conf6" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> + <property name="conf7" value="--enable-server --enable-agent --enable-proxy ${with.db} --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-gnutls --with-ldap --with-libcurl"/> </target> <!-- Cppcheck static analyzer target --> @@ -39,7 +39,7 @@ <exec executable="./bootstrap.sh" failonerror="on"/> <exec executable="scan-build" failonerror="on"> <arg line="./configure"/> - <arg line="--enable-server --enable-agent --enable-proxy --with-mysql --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-libevent --with-ldap --with-libcurl"/> + <arg line="--enable-server --enable-agent --enable-proxy --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-libevent --with-ldap --with-libcurl"/> </exec> <exec executable="cppcheck" error="${SCANFILE}" failonerror="on"> <arg line="--enable=all"/> @@ -212,28 +212,28 @@ <target name="make-db-mysql" unless="${with.mysql}"> <!-- Build Zabbix with postgresql database --> <sequential> - <make args="--enable-server --enable-agent --enable-proxy --with-mysql --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> + <make args="--enable-server --enable-agent --enable-proxy --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> </sequential> </target> <target name="make-db-postgresql" unless="${with.postgresql}"> <!-- Build Zabbix with postgresql database --> <sequential> - <make args="--enable-server --enable-agent --enable-proxy --with-postgresql --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> + <make args="--enable-server --enable-agent --enable-proxy --with-postgresql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl"/> </sequential> </target> <target name="make-db-oracle" unless="${with.oracle}"> <!-- Build Zabbix with oracle database --> <sequential> - <make args="--enable-server --enable-agent --enable-proxy --with-oracle --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl --with-oracle-include=/usr/include/oracle/12.1/client64 --with-oracle-lib=/usr/lib/oracle/12.1/client64/lib"/> + <make args="--enable-server --enable-agent --enable-proxy --with-oracle --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl --with-oracle-include=/usr/include/oracle/12.1/client64 --with-oracle-lib=/usr/lib/oracle/12.1/client64/lib"/> </sequential> </target> <target name="make-db-db2" unless="${with.db2}"> <!-- Build Zabbix with ibm db2 database --> <sequential> - <make args="--enable-server --enable-agent --enable-proxy --with-ibm-db2 --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl --with-ibm-db2-include=/opt/ibm/db2/V11.1/include --with-ibm-db2-lib=/opt/ibm/db2/V11.1/lib64"/> + <make args="--enable-server --enable-agent --enable-proxy --with-ibm-db2 --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-openssl --with-ldap --with-libcurl --with-ibm-db2-include=/opt/ibm/db2/V11.1/include --with-ibm-db2-lib=/opt/ibm/db2/V11.1/lib64"/> </sequential> </target> @@ -283,10 +283,10 @@ <!-- Zabbix various configuration parameters for cmocka tests --> <!-- Configuration option name must consist of prefix 'cmocka-', configuration order number and configuration title: cmocka-<number>-<title> --> - <property name="cmocka-1-default" value="-q CFLAGS='-Wall -Wextra -Wdeclaration-after-statement -Wpointer-arith -Wno-maybe-uninitialized -Wformat -Wmissing-prototypes' --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> + <property name="cmocka-1-default" value="-q CFLAGS='-Wall -Wextra -Wdeclaration-after-statement -Wpointer-arith -Wno-maybe-uninitialized -Wformat -Wmissing-prototypes' --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> <property name="cmocka-2-agent-only" value="-q --enable-agent"/> <property name="cmocka-3-server-only" value="-q --enable-server --with-mysql"/> - <property name="cmocka-4-sanitizer" value="CC=clang CFLAGS='-Wall -Wextra -Wenum-conversion -g -O2 -fsanitize=leak,address' LDFLAGS='-fsanitize=leak,address' -q --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-jabber --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> + <property name="cmocka-4-sanitizer" value="CC=clang CFLAGS='-Wall -Wextra -Wenum-conversion -g -O2 -fsanitize=leak,address' LDFLAGS='-fsanitize=leak,address' -q --enable-server --enable-agent --enable-proxy --enable-ipv6 --with-mysql --with-libxml2 --with-unixodbc --with-net-snmp --with-ssh2 --with-openipmi --with-libevent --with-mbedtls --with-ldap --with-libcurl --with-iconv --with-libpcre"/> </target> <target name="cmocka-tests" depends="init-cmocka-test-conf-options"> |