From 90aa7a12aa791d0f3b8bb79003778c81460d60cb Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sun, 29 Aug 2010 17:35:06 +0100 Subject: [PATCH] acl: fix compilation test Detected by pending patch to upcoming autoconf 2.68. * m4/acl.m4 (gl_FUNC_ALL): Use correct format for AC_COMPILE_IFELSE. Signed-off-by: Eric Blake (cherry picked from commit 2901094a21129406fae6755b8039c772774cab99) --- ChangeLog | 6 ++++++ NEWS.stable | 1 + m4/acl.m4 | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c65c0a395..f6d1967a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-26 Eric Blake + + acl: fix compilation test + * m4/acl.m4 (gl_FUNC_ALL): Use correct format for + AC_COMPILE_IFELSE. + 2010-08-26 Jim Meyering stat-time: relax license LGPL diff --git a/NEWS.stable b/NEWS.stable index 9c157be6b..5d03f5789 100644 --- a/NEWS.stable +++ b/NEWS.stable @@ -25,6 +25,7 @@ with the following additional commits: * [0a05120]->[a83a25f] poll: return immediately on POLLHUP. * [fc9e09a]->[63b29c2] autoupdate * [20e165d]->[6a0e461] stat-time: relax license LGPL + * [2901094]->[] acl: fix compilation test __NEXTCOMMITMARKER__ ---------------------------------------------------------------------- diff --git a/m4/acl.m4 b/m4/acl.m4 index 03c0f107c..6033d06e4 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 9 +# serial 10 # Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -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_COMPILE_IFELSE( + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include #include -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 @@ -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], - [AC_COMPILE_IFELSE( + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include #include -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 -- 2.11.0