Skip to content

Commit

Permalink
meson: Don't define spooldir when building without papd
Browse files Browse the repository at this point in the history
  • Loading branch information
rdmark committed Nov 24, 2024
1 parent 9a3abaa commit dbaebdf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -955,11 +948,18 @@ libevent = dependency(
cups = dependency('cups', required: false)
cups_config = find_program('cups-config', required: false)

if not (get_option('with-appletalk') or get_option('with-cups'))
if not get_option('with-appletalk')
have_cups = false
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
Expand Down
2 changes: 1 addition & 1 deletion meson_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit dbaebdf

Please sign in to comment.