From 15032315f35c44820952a9750baf58c2b4090b3f Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Sat, 24 Feb 2024 19:35:50 +0100 Subject: [PATCH] cups: Use pkg-config to find cups backend dir Some distributions(Gentoo) patch cups backend path to something else than libdir. Use pkg-config to find backend path for cups. --- Makefile.tools | 3 ++- configure.ac | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.tools b/Makefile.tools index 044342e29..c17244677 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -538,7 +538,8 @@ endif endif if CUPS -cupsdir = $(libdir)/cups/backend + +cupsdir = $(CUPSDIR) cups_PROGRAMS = profiles/cups/bluetooth diff --git a/configure.ac b/configure.ac index 6248eb0ea..af0e9900e 100644 --- a/configure.ac +++ b/configure.ac @@ -246,6 +246,9 @@ AC_SUBST(UDEV_DIR, [${path_udevdir}]) AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups], [disable CUPS printer support]), [enable_cups=${enableval}]) AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no") +if (test "${enable_cups}" != "no"); then + AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend) +fi AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh], [enable Mesh profile support]), [enable_mesh=${enableval}]) -- 2.47.3