From d9af069397d09c2695f14d1933084a9c83f8c178 Mon Sep 17 00:00:00 2001 From: Klaus Wenninger Date: Thu, 9 Dec 2021 18:38:54 +0100 Subject: [PATCH] build: configure: have --with-runstatedir overrule --runstatedir and log that there was runstatedir defined already --- configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f0ba91a..43cd442 100644 --- a/configure.ac +++ b/configure.ac @@ -198,7 +198,7 @@ dnl have an older version, they can use our --with-runstatedir. sbd_runstatedir="" AC_ARG_WITH([runstatedir], [AS_HELP_STRING([--with-runstatedir=DIR], - [modifiable per-process data @<:@LOCALSTATEDIR/run@:>@ (ignored if --runstatedir is available)])], + [modifiable per-process data @<:@LOCALSTATEDIR/run@:>@])], [ sbd_runstatedir="$withval" ] ) @@ -343,7 +343,13 @@ expand_path_option oldincludedir expand_path_option infodir expand_path_option mandir -AS_IF([test x"${runstatedir}" = x""], [runstatedir="${sbd_runstatedir}"]) +AS_IF([test x"${runstatedir}" = x""], [runstatedir="${sbd_runstatedir}"], + [test x"${sbd_runstatedir}" != x""], [ + echo "--with-runstatedir=${sbd_runstatedir} is taking precedence" + echo "over runstatedir=${runstatedir}." + echo "Consider using --runstatedir=${sbd_runstatedir} directly or let it" + echo "go with the default." + runstatedir="${sbd_runstatedir}"]) expand_path_option runstatedir "${localstatedir}/run" AC_SUBST(runstatedir)