1From cb0de49bc6f8a6bf8f01a24599b499aa4bf18032 Mon Sep 17 00:00:00 2001
2From: Lars Wendler <polynomial-c@gmx.de>
3Date: Tue, 16 Apr 2024 07:26:04 +0200
4Subject: [PATCH] configure.ac: Fix --disable-cups
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9or else we get:
10  configure: error: conditional "CUPS_SERVERBIN" was never defined.
11  Usually this means the macro was only invoked conditionally.
12
13Fixes: https://github.com/bluez/bluez/issues/773
14
15Upstream: https://patchwork.kernel.org/project/bluetooth/list/?series=844910
16Signed-off-by: Jan Čermák <sairon@sairon.cz>
17---
18 configure.ac | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index 9dea70d..dbba759 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -249,12 +249,12 @@ AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
26 if (test "${enable_cups}" != "no"); then
27 	AC_MSG_CHECKING([cups directory])
28 	cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin`
29-	AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "")
30-	if (test "${cups_serverbin}" != ""); then
31-		AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin})
32-	fi
33 	AC_MSG_RESULT([${cups_serverbin}])
34 fi
35+AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "")
36+AS_IF([test "${cups_serverbin}" != ""],[
37+	AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin})
38+])
39
40 AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
41 		[enable Mesh profile support]), [enable_mesh=${enableval}])
42