laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/42203?usp=email ) Change subject: fix --disable-log-macros ...................................................................... fix --disable-log-macros Before 9197c1ac, the AC_ARG_ENABLE(log_macros, ...) action was hardcoded to [log_macros="yes"], so *any* use of the flag --enable-log-macros or --disable-log-macros would set log_macros="yes" -> AC_DEFINE([LIBOSMOCORE_NO_LOGGING]). The commit changed this to the standard [log_macros=$enableval], but broke the conditional test, so - AC_ARG_ENABLE sets $enableval to "no" for --disable-* flags -> log_macros is now "no" -> test fails -> LIBOSMOCORE_NO_LOGGING is never defined... The opposite of what it should do... Change-Id: I809ab2f61e72428ba21061055296eb83d6d710ab --- M configure.ac 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/configure.ac b/configure.ac index b32f304..b5f858f 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,7 @@ ENABLE_CTRL_DEFAULT="yes" ENABLE_PSEUDOTALLOC_DEFAULT="no" ENABLE_EMBEDDED_DEFAULT="no" -ENABLE_LIBOSMOCORE_NO_LOGGING_DEFAULT="no" +ENABLE_LOG_MACROS_DEFAULT="yes" ENABLE_SANITIZE_DEFAULT="no" ENABLE_WERROR_DEFAULT="no" ENABLE_EXT_TESTS_DEFAULT="no" @@ -261,6 +261,7 @@ if test x"$embedded" = x"yes" then AC_DEFINE([EMBEDDED],[1],[Select building for embedded use]) + ENABLE_LOG_MACROS_DEFAULT="no" ENABLE_PLUGIN_DEFAULT="no" ENABLE_MSGFILE_DEFAULT="no" ENABLE_SERIAL_DEFAULT="no" @@ -507,8 +508,8 @@ [--disable-log-macros], [Disable logging macros that are also used internally to print information] )], - [log_macros=$enableval], [log_macros=$ENABLE_LIBOSMOCORE_NO_LOGGING_DEFAULT]) -if test x"$log_macros" == x"yes" + [log_macros=$enableval], [log_macros=$ENABLE_LOG_MACROS_DEFAULT]) +if test x"$log_macros" != x"yes" then AC_DEFINE([LIBOSMOCORE_NO_LOGGING],[1],[Disable logging macros]) fi -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/42203?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I809ab2f61e72428ba21061055296eb83d6d710ab Gerrit-Change-Number: 42203 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>