Save work on snap support changes.

diff --git a/config-scripts/cups-snap.m4 b/config-scripts/cups-container.m4
similarity index 93%
rename from config-scripts/cups-snap.m4
rename to config-scripts/cups-container.m4
index cff05f2590666828e28a796affe832e671d0db11..2d865b99c8b24eaa9ca2c45621a0e6aa9598ca68 100644 (file)
--- a/config-scripts/cups-snap.m4
+++ b/config-scripts/cups-container.m4
@@ -1,5 +1,5 @@
 dnl
-dnl Support for packaging CUPS in a Snap and have it work with client Snaps.
+dnl Support for packaging CUPS in different kinds of containers.
 dnl
 dnl Copyright © 2021 by OpenPrinting
 dnl
@@ -7,6 +7,12 @@ dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more
 dnl information.
 dnl
 
+AC_ARG_WITH([container], AS_HELP_STRING([--with-container=...], [configure to use in container ('none', 'snap')]))
+AC_ARG_WITH([container_name], AS_HELP_STRING([--with-container-name=...], [specify the container name (default='cups')]))
+
+
+
+
 AC_ARG_ENABLE([snapped_cupsd], AS_HELP_STRING([--enable-snapped-cupsd], [enable support for packaging CUPS in a Snap]))
 AC_ARG_ENABLE([snapped_clients], AS_HELP_STRING([--enable-snapped-clients], [enable support for CUPS controlling admin access from snapped clients]))
 AC_ARG_WITH([our-snap-name], AS_HELP_STRING([--with-our-snap-name], [Set name of the Snap we are snapped in, only needed with --enable-snapped-cupsd, default=cups]), [

diff --git a/config.h.in b/config.h.in
index 7f91b82a6ca3a9cb7a658af3d6aca858626d3ad2..c9879ddba36cb9b2c3e51cf408170fd52777503f 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -650,20 +650,6 @@
 #undef HAVE_SYS_STATVFS_H
 #undef HAVE_SYS_VFS_H
 
-/*
- * Do we want Snap packaging support and have the needed libraries and
- * utilities?
- */
-
-#undef HAVE_APPARMOR
-#undef HAVE_SNAPDGLIB
-#undef HAVE_SNAPD_CLIENT_RUN_SNAPCTL2_SYNC
-#undef HAVE_SNAPCTL_IS_CONNECTED
-#undef OUR_SNAP_NAME
-#undef SNAPCTL
-#undef CUPS_CONTROL_SLOT
-#undef SUPPORT_SNAPPED_CUPSD
-#undef SUPPORT_SNAPPED_CLIENTS
 
 /*
  * Location of macOS localization bundle, if any.
@@ -696,4 +682,21 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #  endif /* __GNUC__ || __STDC_VERSION__ */
 #endif /* !HAVE_ABS && !abs */
 
+
+/*
+ * Do we have snap container support enabled?
+ */
+
+#undef CUPS_SNAP_NAME
+#undef CUPS_SNAP_CONTROL_SLOT
+
+#undef HAVE_APPARMOR
+#undef HAVE_SNAPDGLIB
+#undef HAVE_SNAPD_CLIENT_RUN_SNAPCTL2_SYNC
+#undef HAVE_SNAPCTL_IS_CONNECTED
+#undef SNAPCTL
+#undef SUPPORT_SNAPPED_CUPSD
+#undef SUPPORT_SNAPPED_CLIENTS
+
+
 #endif /* !_CUPS_CONFIG_H_ */

diff --git a/configure.ac b/configure.ac
index 62aa6642e27819fde8f05622adc74a61babc98da..4c3c6fa3b9d2cff2b97f8f06d82ba6fec9b0cee4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ sinclude(config-scripts/cups-tls.m4)
 sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
-sinclude(config-scripts/cups-snap.m4)
+sinclude(config-scripts/cups-container.m4)
 sinclude(config-scripts/cups-startup.m4)
 sinclude(config-scripts/cups-defaults.m4)