From cb0de49bc6f8a6bf8f01a24599b499aa4bf18032 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 16 Apr 2024 07:26:04 +0200 Subject: [PATCH] configure.ac: Fix --disable-cups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit or else we get: configure: error: conditional "CUPS_SERVERBIN" was never defined. Usually this means the macro was only invoked conditionally. Fixes: https://github.com/bluez/bluez/issues/773 Upstream: https://patchwork.kernel.org/project/bluetooth/list/?series=844910 Signed-off-by: Jan Čermák --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9dea70d..dbba759 100644 --- a/configure.ac +++ b/configure.ac @@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") if (test "${enable_cups}" != "no"); then AC_MSG_CHECKING([cups directory]) cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin` - AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") - if (test "${cups_serverbin}" != ""); then - AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) - fi AC_MSG_RESULT([${cups_serverbin}]) fi +AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "") +AS_IF([test "${cups_serverbin}" != ""],[ + AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin}) +]) AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], [enable Mesh profile support]), [enable_mesh=${enableval}])