From: Till Kamppeter <till.kamppeter@gmail.com>
Date: Tue, 9 Mar 2021 13:36:01 +0000 (+0100)
Subject: The CUPS Snap uses "cups--control" and not "admin" any more as admin slot
X-Git-Tag: v2.4b1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e12b76b3d3c1e89cc2949d55d3c176f5ca63f03;p=thirdparty%2Fcups.git

The CUPS Snap uses "cups--control" and not "admin" any more as admin slot

Renamed the default for "--with-cups-control-slot" from "admin" to
"cups-control".
---

diff --git a/config-scripts/cups-snap.m4 b/config-scripts/cups-snap.m4
index 142ce6cea5..f3c539d05c 100644
--- a/config-scripts/cups-snap.m4
+++ b/config-scripts/cups-snap.m4
@@ -15,10 +15,10 @@ AC_ARG_WITH([snapctl], AS_HELP_STRING([--with-snapctl], [Set path for snapctl, o
     SNAPCTL="/usr/bin/snapctl"
 ])
 AC_DEFINE_UNQUOTED([SNAPCTL], ["$SNAPCTL"], [Location of snapctl program.])
-AC_ARG_WITH([cups_control_slot], AS_HELP_STRING([--with-cups-control-slot], [Name for cups-control slot as defined in snapcraft.yaml, only needed with --enable-snapped-cupsd, default=admin]), [
+AC_ARG_WITH([cups_control_slot], AS_HELP_STRING([--with-cups-control-slot], [Name for cups-control slot as defined in snapcraft.yaml, only needed with --enable-snapped-cupsd, default=cups-control]), [
     CUPS_CONTROL_SLOT="$withval"
 ], [
-    CUPS_CONTROL_SLOT="admin"
+    CUPS_CONTROL_SLOT="cups-control"
 ])
 AC_DEFINE_UNQUOTED([CUPS_CONTROL_SLOT], ["$CUPS_CONTROL_SLOT"], ["cups-control" slot name for snap.])