From 259d3848ffdd0f6415ae611d93c24e2231f437cb Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Mon, 27 May 2024 08:26:41 +0900 Subject: [PATCH] align meson include definitions with 2.x --- meson.build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 78570b6f3e..58ef83cdcd 100644 --- a/meson.build +++ b/meson.build @@ -76,16 +76,11 @@ uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"' # Includes # ############ -root_includes = include_directories( - '.', - 'include', - 'etc/afpd', -) - if host_os in ['dragonfly', 'freebsd', 'openbsd'] root_includes = include_directories( '.', 'include', + 'sys', 'etc/afpd', '/usr/local/include', ) @@ -93,6 +88,7 @@ elif host_os == 'netbsd' root_includes = include_directories( '.', 'include', + 'sys', 'etc/afpd', '/usr/pkg/include', ) @@ -100,6 +96,7 @@ elif host_os == 'omnios' root_includes = include_directories( '.', 'include', + 'sys', 'etc/afpd', '/opt/local/include', ) @@ -108,6 +105,7 @@ else '.', 'include', 'etc/afpd', + 'sys', ) endif @@ -199,6 +197,7 @@ check_headers = [ 'pam/pam_appl.h', 'rpc/pmap/prot.h', 'rpc/rpc.h', + 'rpcsvc/rquota.h', 'security/pam_appl.h', 'sgtty.h', 'statfs.h',