diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2020-01-06 16:06:37 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2020-01-06 16:11:06 +0300 |
| commit | 2da0c6383f0d44f7583e8ba1c8d61fa42cd4100c (patch) | |
| tree | e79be7b9df67bdb62b131493a15dab6375ecde74 /configure.ac | |
| parent | 0410d8deef7cd2a0063803e540e0ba17fe139b3e (diff) | |
...G...... [ZBXNEXT-5671] added zabbix_js command line utility for javascript testing
* commit 'a6fde3046f174703d4e71fb2dd8f91549a8580ce':
.......... [DEV-1279] fixed compilation of Zabbix agent without Zabbix server and Zabbix proxy
.......... [DEV-1279] improved usage message
.......... [DEV-1279] added version information
.......... [DEV-1279] improved help message to include standard input
.......... [DEV-1279] fixed semaphore leak
.......... [DEV-1279] avoid NULL pointer dereference when script file is empty
.......... [DEV-1279] avoid NULL pointer dereference when file is empty
.......... [DEV-1279] removed redundant check
.......... [DEV-1279] added ability to display help message; added example to help message
.......... [DEV-1279] fixed compilation with TLS
.......... [DEV-1279] fixed rebase and added ZBX_FALLTHROUGH to switch case
.......... [DEV-1279] removed extra space from help message
...G...... [DEV-1279] added timeout option
...G...... [DEV-1279] renamed zabbix_es to zabbix_js
.......... [DEV-1279] add zabbix_es utility for embedded script testing
(cherry picked from commit f2584a23004de5c97790a9909a08efe6eb96e6d0)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c30c9fb8941..9c3432aa7f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1600,6 +1600,15 @@ PROXY_LIBS="$PROXY_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" AGENT_LDFLAGS="$AGENT_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS" AGENT_LIBS="$AGENT_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" +ZBXGET_LDFLAGS="$ZBXGET_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS" +ZBXGET_LIBS="$ZBXGET_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" + +SENDER_LDFLAGS="$SENDER_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS" +SENDER_LIBS="$SENDER_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" + +ZBXJS_LDFLAGS="$ZBXJS_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS" +ZBXJS_LIBS="$ZBXJS_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" + AM_CONDITIONAL(HAVE_IPMI, [test "x$have_ipmi" = "xyes"]) AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes") @@ -1708,6 +1717,9 @@ ZBXGET_LIBS="$ZBXGET_LIBS $TLS_LIBS" SENDER_LDFLAGS="$SENDER_LDFLAGS $TLS_LDFLAGS" SENDER_LIBS="$SENDER_LIBS $TLS_LIBS" +ZBXJS_LDFLAGS="$ZLIB_LDFLAGS $TLS_LDFLAGS" +ZBXJS_LIBS="$ZBXJS_LIBS $TLS_LIBS" + if test "x$agent2" = "xyes"; then AC_CHECK_PROGS([GO], [go], [no]) if test "x$GO" = "xno"; then @@ -1776,6 +1788,9 @@ ZBXGET_LIBS="$ZBXGET_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" SENDER_LDFLAGS="$SENDER_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS" SENDER_LIBS="$SENDER_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS" +ZBXJS_LDFLAGS="$ZBXJS_LDFLAGS $LIBCURL_LDFLAGS" +ZBXJS_LIBS="$ZBXJS_LIBS $LIBCURL_LIBS" + dnl Check for libpcre, used by Zabbix for regular expressions if test "x$server" = "xyes" || test "x$proxy" = "xyes" || test "x$agent" = "xyes" || test "x$agent2" = "xyes"; then LIBPCRE_CHECK_CONFIG([no]) @@ -1862,6 +1877,9 @@ AC_SUBST(ZBXGET_LIBS) AC_SUBST(SENDER_LDFLAGS) AC_SUBST(SENDER_LIBS) +AC_SUBST(ZBXJS_LDFLAGS) +AC_SUBST(ZBXJS_LIBS) + AC_SUBST(SERVER_CONFIG_FILE) AC_SUBST(PROXY_CONFIG_FILE) AC_SUBST(AGENT_CONFIG_FILE) @@ -1972,6 +1990,7 @@ AC_OUTPUT([ src/zabbix_agent/Makefile src/zabbix_agent/logfiles/Makefile src/zabbix_get/Makefile + src/zabbix_js/Makefile src/zabbix_sender/Makefile src/zabbix_server/Makefile src/zabbix_server/alerter/Makefile |