From 22c1fc783ca3caa4a888be44211ac5337463c472 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Ritschard Date: Wed, 30 Jul 2014 12:17:27 +0200 Subject: [PATCH] correctly generate LOAD_PLUGIN_LOG_LOGSTASH for substitution --- configure.ac | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f4f8d8d..59f05710 100644 --- a/configure.ac +++ b/configure.ac @@ -5033,9 +5033,9 @@ fi with_libi2c="no" if test "x$ac_system" = "xLinux" then -AC_CHECK_DECL(i2c_smbus_read_i2c_block_data, - [with_libi2c="yes"], - [with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"], +AC_CHECK_DECL(i2c_smbus_read_i2c_block_data, + [with_libi2c="yes"], + [with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"], [[#include #include ]]) fi @@ -5367,6 +5367,7 @@ dnl Default configuration file # Load either syslog or logfile LOAD_PLUGIN_SYSLOG="" LOAD_PLUGIN_LOGFILE="" +LOAD_PLUGIN_LOG_LOGSTASH="" AC_MSG_CHECKING([which default log plugin to load]) default_log_plugin="none" @@ -5388,10 +5389,20 @@ then else LOAD_PLUGIN_LOGFILE="##" fi + +if test "x$enable_logfile" = "xyes" +then + LOAD_PLUGIN_LOG_LOGSTASH="#" +else + LOAD_PLUGIN_LOG_LOGSTASH="##" +fi + + AC_MSG_RESULT([$default_log_plugin]) AC_SUBST(LOAD_PLUGIN_SYSLOG) AC_SUBST(LOAD_PLUGIN_LOGFILE) +AC_SUBST(LOAD_PLUGIN_LOG_LOGSTASH) DEFAULT_LOG_LEVEL="info" if test "x$enable_debug" = "xyes" -- 2.11.0