diff mbox series

[bluez/bluez] configure.ac: Fix --disable-cups

Message ID 20240416052603.4373-2-polynomial-c@gmx.de (mailing list archive)
State New, archived
Headers show
Series [bluez/bluez] configure.ac: Fix --disable-cups | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Lars Wendler April 16, 2024, 5:26 a.m. UTC 
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
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--
2.44.0

Comments

bluez.test.bot@gmail.com April 16, 2024, 7:01 a.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=844910

---Test result---

Test Summary:
CheckPatch                    PASS      0.23 seconds
GitLint                       PASS      0.19 seconds
BuildEll                      PASS      24.48 seconds
BluezMake                     PASS      1689.88 seconds
MakeCheck                     PASS      12.81 seconds
MakeDistcheck                 PASS      178.27 seconds
CheckValgrind                 PASS      248.88 seconds
CheckSmatch                   PASS      352.63 seconds
bluezmakeextell               PASS      119.54 seconds
IncrementalBuild              PASS      1451.34 seconds
ScanBuild                     PASS      1022.03 seconds



---
Regards,
Linux Bluetooth
diff mbox series

Patch

diff --git a/configure.ac b/configure.ac
index 9ebc250cf..047ec1a7f 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}])