blob: 4720003c252a1cedfa63e40c2959796a5b2e572a [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 26 Jun 2018 17:29:09 +0800
4Subject: [PATCH] disable acl header check
Patrick Williamsb48b7b42016-08-17 15:04:38 -05005
6Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
7
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08008Upstream-Status: pending
9
Patrick Williamsb48b7b42016-08-17 15:04:38 -050010Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080011Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 src/configure.ac | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
Brad Bishop6e60e8b2018-02-01 10:27:11 -050016diff --git a/src/configure.ac b/src/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080017index 107c170..0ee86ad 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050018--- a/src/configure.ac
19+++ b/src/configure.ac
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020@@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050021 sys/systeminfo.h locale.h sys/stream.h termios.h \
22 libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
23 utime.h sys/param.h libintl.h libgen.h \
24- util/debug.h util/msg18n.h frame.h sys/acl.h \
25+ util/debug.h util/msg18n.h frame.h \
26 sys/access.h sys/sysinfo.h wchar.h wctype.h)
27
28 dnl sys/ptem.h depends on sys/stream.h on Solaris
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080029@@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl,
Patrick Williamsb48b7b42016-08-17 15:04:38 -050030 , [enable_acl="yes"])
31 if test "$enable_acl" = "yes"; then
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032 AC_MSG_RESULT(no)
33+ AC_CHECK_HEADERS(sys/acl.h)
34 AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
Patrick Williamsb48b7b42016-08-17 15:04:38 -050035 AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
36 AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080037--
382.7.4
39