projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mgetgroups: Move AC_LIBOBJ invocations to module description.
[pspp]
/
m4
/
acl.m4
diff --git
a/m4/acl.m4
b/m4/acl.m4
index 8d6d2c01929293e6827ae0d590abc9cbe71c9779..d6a448aabddade096d99942aad29b2544aaebc3f 100644
(file)
--- a/
m4/acl.m4
+++ b/
m4/acl.m4
@@
-1,7
+1,7
@@
# acl.m4 - check for access control list (ACL) primitives
# acl.m4 - check for access control list (ACL) primitives
-# serial
9
+# serial
13
-# Copyright (C) 2002, 2004-20
09
Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-20
11
Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@
-45,10
+45,10
@@
AC_DEFUN([gl_FUNC_ACL],
AC_REPLACE_FUNCS([acl_entries])
AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
[gl_cv_acl_ACL_FIRST_ENTRY],
AC_REPLACE_FUNCS([acl_entries])
AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
[gl_cv_acl_ACL_FIRST_ENTRY],
- [AC_COMPILE_IFELSE(
+ [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
#include <sys/acl.h>
[[#include <sys/types.h>
#include <sys/acl.h>
-int type = ACL_FIRST_ENTRY;]],
+int type = ACL_FIRST_ENTRY;]]
)]
,
[gl_cv_acl_ACL_FIRST_ENTRY=yes],
[gl_cv_acl_ACL_FIRST_ENTRY=no])])
if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
[gl_cv_acl_ACL_FIRST_ENTRY=yes],
[gl_cv_acl_ACL_FIRST_ENTRY=no])])
if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
@@
-58,10
+58,10
@@
int type = ACL_FIRST_ENTRY;]],
dnl On MacOS X, other types of ACLs are supported.
AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
[gl_cv_acl_ACL_TYPE_EXTENDED],
dnl On MacOS X, other types of ACLs are supported.
AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
[gl_cv_acl_ACL_TYPE_EXTENDED],
- [AC_COMPILE_IFELSE(
+ [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
#include <sys/acl.h>
[[#include <sys/types.h>
#include <sys/acl.h>
-int type = ACL_TYPE_EXTENDED;]],
+int type = ACL_TYPE_EXTENDED;]]
)]
,
[gl_cv_acl_ACL_TYPE_EXTENDED=yes],
[gl_cv_acl_ACL_TYPE_EXTENDED=no])])
if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
[gl_cv_acl_ACL_TYPE_EXTENDED=yes],
[gl_cv_acl_ACL_TYPE_EXTENDED=no])])
if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
@@
-76,8
+76,8
@@
int type = ACL_TYPE_EXTENDED;]],
dnl Test for Solaris API (Solaris, Cygwin).
if test $use_acl = 0; then
dnl Test for Solaris API (Solaris, Cygwin).
if test $use_acl = 0; then
- AC_CHECK_FUNCS([acl])
- if test $ac_cv_func_acl = yes; then
+ AC_CHECK_FUNCS([
f
acl])
+ if test $ac_cv_func_
f
acl = yes; then
AC_SEARCH_LIBS([acl_trivial], [sec],
[if test "$ac_cv_search_acl_trivial" != "none required"; then
LIB_ACL=$ac_cv_search_acl_trivial
AC_SEARCH_LIBS([acl_trivial], [sec],
[if test "$ac_cv_search_acl_trivial" != "none required"; then
LIB_ACL=$ac_cv_search_acl_trivial
@@
-89,11
+89,13
@@
int type = ACL_TYPE_EXTENDED;]],
fi
dnl Test for HP-UX API.
fi
dnl Test for HP-UX API.
- if test $use_acl = 0
|| test "$ac_cv_func_acl" = yes
; then
+ if test $use_acl = 0; then
AC_CHECK_FUNCS([getacl])
if test $ac_cv_func_getacl = yes; then
use_acl=1
fi
AC_CHECK_FUNCS([getacl])
if test $ac_cv_func_getacl = yes; then
use_acl=1
fi
+ dnl Test for HP-UX 11.11 API.
+ AC_CHECK_HEADERS([aclv.h], [], [], [#include <sys/types.h>])
fi
dnl Test for AIX API (AIX 5.3 or newer).
fi
dnl Test for AIX API (AIX 5.3 or newer).
@@
-112,6
+114,14
@@
int type = ACL_TYPE_EXTENDED;]],
fi
fi
fi
fi
+ dnl Test for NonStop Kernel API.
+ if test $use_acl = 0; then
+ AC_CHECK_FUNCS([aclsort])
+ if test $ac_cv_func_aclsort = yes; then
+ use_acl=1
+ fi
+ fi
+
LIBS=$ac_save_LIBS
fi
if test "x$enable_acl$use_acl" = "xyes0"; then
LIBS=$ac_save_LIBS
fi
if test "x$enable_acl$use_acl" = "xyes0"; then
@@
-143,8
+153,10
@@
AC_DEFUN([gl_ACL_GET_FILE],
#include <sys/acl.h>
#include <errno.h>
]],
#include <sys/acl.h>
#include <errno.h>
]],
- [[return !! (!acl_get_file (".", ACL_TYPE_ACCESS)
- && errno == ENOENT);]])],
+ [[if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
+ return 1;
+ return 0;
+ ]])],
[gl_cv_func_working_acl_get_file=yes],
[gl_cv_func_working_acl_get_file=no],
[gl_cv_func_working_acl_get_file=cross-compiling])])
[gl_cv_func_working_acl_get_file=yes],
[gl_cv_func_working_acl_get_file=no],
[gl_cv_func_working_acl_get_file=cross-compiling])])