| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Tue, 26 Jun 2018 17:29:09 +0800 |
| 4 | Subject: [PATCH] disable acl header check |
| 5 | |
| 6 | Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. |
| 7 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 8 | Upstream-Status: Pending |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 9 | |
| 10 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 12 | --- |
| 13 | src/configure.ac | 3 ++- |
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 16 | Index: git/src/configure.ac |
| 17 | =================================================================== |
| 18 | --- git.orig/src/configure.ac |
| 19 | +++ git/src/configure.ac |
| 20 | @@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | 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 sys/ptms.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 |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 29 | @@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl, |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 30 | , [enable_acl="yes"]) |
| 31 | if test "$enable_acl" = "yes"; then |
| 32 | AC_MSG_RESULT(no) |
| 33 | + AC_CHECK_HEADERS(sys/acl.h) |
| 34 | AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], |
| 35 | AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" |
| 36 | AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) |