From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 21 Apr 2017 17:53:59 +0000 (-0400)
Subject: meson: add option to disable libacl support
X-Git-Tag: v234~286^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36f0387efc0d7d3a72a7b0e3c94e513b14505d04;p=thirdparty%2Fsystemd.git

meson: add option to disable libacl support
---

diff --git a/meson.build b/meson.build
index 97fff496e15..4515c0098d1 100644
--- a/meson.build
+++ b/meson.build
@@ -660,6 +660,17 @@ if want_polkit != 'false'
         endif
 endif
 
+want_acl = get_option('acl')
+if want_acl != 'false'
+        libacl = cc.find_library('acl', required : want_acl == 'true')
+        if libacl.found()
+                conf.set('HAVE_ACL', 1)
+                m4_defines += ['-DHAVE_ACL']
+        endif
+else
+        libacl = []
+endif
+
 want_audit = get_option('audit')
 if want_audit != 'false'
         libaudit = dependency('audit', required : want_audit == 'true')
@@ -845,12 +856,6 @@ else
         liblz4 = []
 endif
 
-libacl = cc.find_library('acl', required : false)
-if libacl.found()
-        conf.set('HAVE_ACL', 1)
-        m4_defines += ['-DHAVE_ACL']
-endif
-
 want_glib = get_option('glib')
 if want_glib != 'false'
         libglib =    dependency('glib-2.0',
diff --git a/meson_options.txt b/meson_options.txt
index 132c05ab561..790119cd1f5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -175,6 +175,8 @@ option('polkit', type : 'combo', choices : ['auto', 'true', 'false'],
 option('ima', type : 'boolean',
        description : 'IMA support')
 
+option('acl', type : 'combo', choices : ['auto', 'true', 'false'],
+       description : 'libacl support')
 option('audit', type : 'combo', choices : ['auto', 'true', 'false'],
        description : 'libaudit support')
 option('blkid', type : 'combo', choices : ['auto', 'true', 'false'],