From c58338c4b6b379816dcaac81f38bab15dab6bd04 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Fri, 11 Aug 2017 13:54:21 +0200 Subject: [PATCH] Add help text on autodetecting systemd support Closes #5524 (cherry picked from commit 56d30a9c8a1c1754b478de79e823e015e103b5b0) --- m4/ax_arg_default_enable_disable.m4 | 4 ++-- m4/systemd.m4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/ax_arg_default_enable_disable.m4 b/m4/ax_arg_default_enable_disable.m4 index bd672ab8b..66d99abfd 100644 --- a/m4/ax_arg_default_enable_disable.m4 +++ b/m4/ax_arg_default_enable_disable.m4 @@ -1,10 +1,10 @@ AC_DEFUN([AX_ARG_DEFAULT_ENABLE], [ -AC_ARG_ENABLE([$1], AS_HELP_STRING([--disable-$1], [$2 (default is ENABLED)])) +AC_ARG_ENABLE([$1], AS_HELP_STRING([--disable-$1], [$2 (default is ENABLED$3)])) AX_PARSE_VALUE([$1], [y]) ]) AC_DEFUN([AX_ARG_DEFAULT_DISABLE], [ -AC_ARG_ENABLE([$1], AS_HELP_STRING([--enable-$1], [$2 (default is DISABLED)])) +AC_ARG_ENABLE([$1], AS_HELP_STRING([--enable-$1], [$2 (default is DISABLED$3)])) AX_PARSE_VALUE([$1], [n]) ]) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 68d1cda00..ec2a19538 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -36,7 +36,7 @@ AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ - AX_ARG_DEFAULT_DISABLE([systemd], [Enable systemd support]) + AX_ARG_DEFAULT_DISABLE([systemd], [Enable systemd support], [$1]) AX_SYSTEMD_OPTIONS() ]) @@ -124,7 +124,7 @@ dnl Systemd will be disabled by default but if your build system is detected dnl to have systemd build libraries it will be enabled. You can always force dnl disable with --disable-systemd AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ - AX_ALLOW_SYSTEMD_OPTS() + AX_ALLOW_SYSTEMD_OPTS([, but will be enabled when libraries are found]) AX_CHECK_SYSTEMD_DETECT_AND_ENABLE() AX_CHECK_SYSTEMD() ]) -- 2.40.0