diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2022-02-18 13:27:53 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2022-02-18 13:27:53 +0300 |
| commit | 445763931bafb7ec97d7d5f4fddfbbd655e25116 (patch) | |
| tree | 654e4c3dd9b214b23bacb09271242b971632e654 /configure.ac | |
| parent | fef57d6f5d45f9fe9bffd65fd402f908b08c2802 (diff) | |
| parent | f1616eca99189afcd8e57d2ad86a0dd0506bf2f2 (diff) | |
.......... [ZBXNEXT-7402] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-7402-5.5
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8a6a299eedb..85a7ffb75ee 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([Zabbix],[6.0.0rc1]) +AC_INIT([Zabbix],[6.2.0alpha1]) AC_CONFIG_SRCDIR(src/zabbix_server/server.c) AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99]) @@ -1963,7 +1963,7 @@ if test "x$HAVE_START_GROUP" = "xyes"; then fi if test "x$agent2" = "xyes"; then - CGO_CFLAGS=$TLS_CFLAGS + CGO_CFLAGS="$TLS_CFLAGS $LIBPCRE_CFLAGS $LIBPCRE2_CFLAGS" CGO_LDFLAGS="$AGENT2_LDFLAGS $LD_START_GROUP \ \${abs_top_builddir}/src/zabbix_agent/logfiles/libzbxlogfiles.a \ \${abs_top_builddir}/src/libs/zbxcomms/libzbxcomms.a \ @@ -2052,7 +2052,7 @@ dnl * Output configuration results * dnl * * dnl ***************************************************************** -m4_ifdef([CONF_TESTS],[CONF_TESTS(ZBXCMOCKA)]) +m4_ifdef([CONF_TESTS],[CONF_TESTS]) AC_OUTPUT([ Makefile |