From 2dc2ac52b93e3a922337294c1e32f7bed794788f Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 11 Dec 2016 20:38:26 +0000 Subject: Fix `--enable-logging` flag in autotools configure script. We also never really tested this, because we run make distcheck, which does another configure with default flags instead of the ones we passed. Fixes #317. --- configure.ac | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e36900a3..246b6c76 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,6 @@ BUILD_TESTING="yes" TOX_LOGGER="no" TOX_DEBUG="no" -LOGGING_OUTNAM="libtoxcore.log" NCURSES_FOUND="no" LIBCONFIG_FOUND="no" @@ -88,9 +87,7 @@ AC_ARG_ENABLE([logging], if test "x$enableval" = "xyes"; then TOX_LOGGER="yes" - AC_DEFINE([TOX_LOGGER], [], [If logging enabled]) - AC_DEFINE([LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) - AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$LOGGING_OUTNAM"], [Output of logger]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) fi ] ) @@ -114,19 +111,19 @@ AC_ARG_WITH(log-level, AC_MSG_WARN([Logging disabled!]) else if test "x$withval" = "xTRACE"; then - AC_DEFINE([LOGGER_LEVEL], [LOG_TRACE], [LOG_LEVEL value]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_TRACE], [LOG_LEVEL value]) elif test "x$withval" = "xDEBUG"; then - AC_DEFINE([LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_DEBUG], [LOG_LEVEL value]) elif test "x$withval" = "xINFO"; then - AC_DEFINE([LOGGER_LEVEL], [LOG_INFO], [LOG_LEVEL value]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_INFO], [LOG_LEVEL value]) elif test "x$withval" = "xWARNING"; then - AC_DEFINE([LOGGER_LEVEL], [LOG_WARNING], [LOG_LEVEL value]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_WARNING], [LOG_LEVEL value]) elif test "x$withval" = "xERROR"; then - AC_DEFINE([LOGGER_LEVEL], [LOG_ERROR], [LOG_LEVEL value]) + AC_DEFINE([MIN_LOGGER_LEVEL], [LOG_ERROR], [LOG_LEVEL value]) else AC_MSG_WARN([Invalid logger level: $withval. Using default 'DEBUG']) fi @@ -134,18 +131,6 @@ AC_ARG_WITH(log-level, ] ) -AC_ARG_WITH(log-path, - AC_HELP_STRING([--with-log-path=DIR], - [Path of logger output]), - [ - if test "x$TOX_LOGGER" = "xno"; then - AC_MSG_WARN([Logging disabled!]) - else - AC_DEFINE_UNQUOTED([LOGGER_OUTPUT_FILE], ["$withval""/""$LOGGING_OUTNAM"], [Output of logger]) - fi - ] -) - PKG_PROG_PKG_CONFIG AC_ARG_ENABLE([av], -- cgit v1.2.3