2019-01-15 17:34:27 +00:00
|
|
|
From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Wenzong Fan <wenzong.fan@windriver.com>
|
|
|
|
|
Date: Tue, 26 Jun 2018 17:29:09 +0800
|
|
|
|
|
Subject: [PATCH] disable acl header check
|
2017-12-04 21:33:20 +00:00
|
|
|
|
|
|
|
|
Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
|
|
|
|
|
|
2019-01-15 17:34:27 +00:00
|
|
|
Upstream-Status: pending
|
|
|
|
|
|
2017-12-04 21:33:20 +00:00
|
|
|
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
2019-01-15 17:34:27 +00:00
|
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
|
|
|
---
|
|
|
|
|
src/configure.ac | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
2017-12-04 21:33:20 +00:00
|
|
|
diff --git a/src/configure.ac b/src/configure.ac
|
2019-01-15 17:34:27 +00:00
|
|
|
index 107c170..0ee86ad 100644
|
2017-12-04 21:33:20 +00:00
|
|
|
--- a/src/configure.ac
|
|
|
|
|
+++ b/src/configure.ac
|
2019-01-15 17:34:27 +00:00
|
|
|
@@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \
|
2017-12-04 21:33:20 +00:00
|
|
|
sys/systeminfo.h locale.h sys/stream.h termios.h \
|
|
|
|
|
libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
|
|
|
|
|
utime.h sys/param.h libintl.h libgen.h \
|
|
|
|
|
- util/debug.h util/msg18n.h frame.h sys/acl.h \
|
|
|
|
|
+ util/debug.h util/msg18n.h frame.h \
|
|
|
|
|
sys/access.h sys/sysinfo.h wchar.h wctype.h)
|
|
|
|
|
|
|
|
|
|
dnl sys/ptem.h depends on sys/stream.h on Solaris
|
2019-01-15 17:34:27 +00:00
|
|
|
@@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl,
|
2017-12-04 21:33:20 +00:00
|
|
|
, [enable_acl="yes"])
|
|
|
|
|
if test "$enable_acl" = "yes"; then
|
2019-01-15 17:34:27 +00:00
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
|
+ AC_CHECK_HEADERS(sys/acl.h)
|
|
|
|
|
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
|
2017-12-04 21:33:20 +00:00
|
|
|
AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
|
|
|
|
|
AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
|
2019-01-15 17:34:27 +00:00
|
|
|
--
|
|
|
|
|
2.7.4
|
|
|
|
|
|
