diff mbox series

[BlueZ,v2] configure.ac: Fix --disable-cups

Message ID 20240705114235.553566-1-gudni.m.g@gmail.com (mailing list archive)
State Accepted
Commit 337cca13037fc6f8a1db72146f12019260b892e6
Headers show
Series [BlueZ,v2] 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

Guðni Már Gilbert July 5, 2024, 11:42 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

Credits go to Lars Wendler
---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

bluez.test.bot@gmail.com July 5, 2024, 1:49 p.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=868786

---Test result---

Test Summary:
CheckPatch                    PASS      0.40 seconds
GitLint                       PASS      0.30 seconds
BuildEll                      PASS      24.54 seconds
BluezMake                     PASS      1675.55 seconds
MakeCheck                     PASS      13.38 seconds
MakeDistcheck                 PASS      181.72 seconds
CheckValgrind                 PASS      252.54 seconds
CheckSmatch                   PASS      355.39 seconds
bluezmakeextell               PASS      119.53 seconds
IncrementalBuild              PASS      1377.58 seconds
ScanBuild                     PASS      993.72 seconds



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org July 8, 2024, 8:30 p.m. UTC | #2 
Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Fri,  5 Jul 2024 11:42:35 +0000 you wrote:
> 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
> 
> Credits go to Lars Wendler
> 
> [...]

Here is the summary with links:
  - [BlueZ,v2] configure.ac: Fix --disable-cups
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=337cca13037f

You are awesome, thank you!
diff mbox series

Patch

diff --git a/configure.ac b/configure.ac
index 1d88daa0b..5619edf4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,12 +253,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}])