git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From b30c530aaf5068a652a479f3e46c74eb1716861a Mon Sep 17 00:00:00 2001
   2 From: "Maxin B. John" <maxin.john@intel.com>
   3 Date: Thu, 2 Jun 2016 16:08:02 +0300
   4 Subject: [PATCH] configure.ac: check acl/libacl.h and sys/acl.h based on
   5  requirement
   6
   7 acl/libacl.h and sys/acl.h check should not happen when we explicitly
   8 disable it with --disable-acl.
   9
  10 Similarly, update attr/xattr.h for --disable-xattr option.
  11
  12 Update the help texts to reflect what it really does.
  13
  14 Upstream-Status: Accepted
  15
  16 Signed-off-by: Maxin B. John <maxin.john@intel.com>
  17 ---
  18  configure.ac | 9 +++++----
  19  1 file changed, 5 insertions(+), 4 deletions(-)
  20
  21 diff --git a/configure.ac b/configure.ac
  22 index cb6943f..0638182 100644
  23 --- a/configure.ac
  24 +++ b/configure.ac
  25 @@ -252,7 +252,7 @@ esac
  26  # Checks for header files.
  27  AC_HEADER_DIRENT
  28  AC_HEADER_SYS_WAIT
  29 -AC_CHECK_HEADERS([acl/libacl.h attr/xattr.h copyfile.h ctype.h])
  30 +AC_CHECK_HEADERS([copyfile.h ctype.h])
  31  AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h grp.h])
  32
  33  AC_CACHE_CHECK([whether EXT2_IOC_GETFLAGS is usable],
  34 @@ -272,7 +272,7 @@ AC_CHECK_HEADERS([linux/fiemap.h linux/fs.h linux/magic.h linux/types.h])
  35  AC_CHECK_HEADERS([locale.h paths.h poll.h pthread.h pwd.h])
  36  AC_CHECK_HEADERS([readpassphrase.h signal.h spawn.h])
  37  AC_CHECK_HEADERS([stdarg.h stdint.h stdlib.h string.h])
  38 -AC_CHECK_HEADERS([sys/acl.h sys/cdefs.h sys/extattr.h])
  39 +AC_CHECK_HEADERS([sys/cdefs.h sys/extattr.h])
  40  AC_CHECK_HEADERS([sys/ioctl.h sys/mkdev.h sys/mount.h])
  41  AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/statfs.h sys/statvfs.h])
  42  AC_CHECK_HEADERS([sys/time.h sys/utime.h sys/utsname.h sys/vfs.h])
  43 @@ -644,7 +644,7 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,,,
  44  # Check for Extended Attributes support
  45  AC_ARG_ENABLE([xattr],
  46                 AS_HELP_STRING([--disable-xattr],
  47 -               [Enable Extended Attributes support (default: check)]))
  48 +               [Disable Extended Attributes support (default: check)]))
  49
  50  if test "x$enable_xattr" != "xno"; then
  51         AC_CHECK_HEADERS([attr/xattr.h])
  52 @@ -670,9 +670,10 @@ fi
  53  #
  54  AC_ARG_ENABLE([acl],
  55                 AS_HELP_STRING([--disable-acl],
  56 -               [Enable ACL support (default: check)]))
  57 +               [Disable ACL support (default: check)]))
  58
  59  if test "x$enable_acl" != "xno"; then
  60 +   AC_CHECK_HEADERS([acl/libacl.h])
  61     AC_CHECK_HEADERS([sys/acl.h])
  62     AC_CHECK_LIB([acl],[acl_get_file])
  63     AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file])
  64 --
  65 2.4.0
  66