Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktors Tjarve <viktors.tjarve@zabbix.com>2019-11-15 14:40:56 +0300
committerViktors Tjarve <viktors.tjarve@zabbix.com>2019-11-15 15:28:21 +0300
commitc24e69c743048bf48b4172f6440de83d01abba1c (patch)
tree586b1e360fd55af438f845e5382213e906753dd3 /build-backend.xml
parent25d53757edc7177294c638a9799edde6fc359540 (diff)
.......... [DEV-1372] separated agent2 build from target 'init-conf-options' properties into a new 'init-conf-options-2' target
* commit '9c54a68640d9ca7688c5465fb81e806d93ec00f5': .......... [DEV-1372] separated agent2 build from target 'init-conf-options' properties into a new 'init-conf-options-2' target (cherry picked from commit 925c1f8b65d6b4ce1c0fcd986ff9e2be2ea03f07)
Diffstat (limited to 'build-backend.xml')
-rw-r--r--build-backend.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/build-backend.xml b/build-backend.xml
index 449a02ec1e9..7a69a536b9d 100644
--- a/build-backend.xml
+++ b/build-backend.xml
@@ -32,6 +32,10 @@
<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>
+
+ <!-- Additional Zabbix configuration parameters -->
+ <target name="init-conf-options-2">
<property name="conf8" value="--enable-agent2"/>
</target>
@@ -304,7 +308,7 @@
</exec>
</target>
- <target name="make-gcc" depends="init-conf-options">
+ <target name="make-gcc" depends="init-conf-options,init-conf-options-2">
<!-- Build Zabbix with various configuration parameters -->
<propertyselector property="conf.list" delimiter="," match="conf(\d+)"/>
<sortlist property="conf.list" delimiter="," value="${conf.list}" override="true"/>