0001-configure.ac-Fix-disable-cups.patch 1.5 KB

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