From 832c51e43994ad36581aa8731f1caee8d7049ed7 Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <daniel@mindani.net>
Date: Sun, 24 Nov 2024 14:00:06 +0100
Subject: [PATCH] meson: Don't define spooldir when building without papd

---
 meson.build    | 14 +++++++-------
 meson_config.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index f46cd34a29..f2c5e4eff0 100644
--- a/meson.build
+++ b/meson.build
@@ -86,13 +86,6 @@ if statedir_override != ''
     localstatedir = statedir_override
 endif
 
-spooldir = get_option('localstatedir') / 'spool' / 'netatalk'
-
-spooldir_override = get_option('with-spooldir')
-if spooldir_override != ''
-    spooldir = spooldir_override
-endif
-
 if host_os == 'darwin'
     homedir = '/Users'
 elif host_os == 'sunos'
@@ -960,6 +953,13 @@ if not (get_option('with-appletalk') or get_option('with-cups'))
     spooldir_required = false
     cdata.set('DISABLE_SPOOL', 1)
 else
+    spooldir = get_option('localstatedir') / 'spool' / 'netatalk'
+
+    spooldir_override = get_option('with-spooldir')
+    if spooldir_override != ''
+        spooldir = spooldir_override
+    endif
+
     have_cups = cups.found() and cups_config.found()
     if have_cups
         spooldir_required = true
diff --git a/meson_config.h b/meson_config.h
index c712aa368e..5982e84bf9 100644
--- a/meson_config.h
+++ b/meson_config.h
@@ -43,7 +43,7 @@
 /* Define if shell check should be disabled */
 #mesondefine DISABLE_SHELLCHECK
 
-/* Define to enable spooldir support */
+/* Define to disable spooldir support */
 #mesondefine DISABLE_SPOOL
 
 /* BSD compatibility macro */