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 <eblake@redhat.com>
(cherry picked from commit 2901094a21129406fae6755b8039c772774cab99)

diff --git a/ChangeLog b/ChangeLog
index c65c0a3..f6d1967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-26  Eric Blake  <eblake@redhat.com>
+
+       acl: fix compilation test
+       * m4/acl.m4 (gl_FUNC_ALL): Use correct format for
+       AC_COMPILE_IFELSE.
+
 2010-08-26  Jim Meyering  <meyering@redhat.com>
 
        stat-time: relax license LGPL

diff --git a/NEWS.stable b/NEWS.stable
index 9c157be..5d03f57 100644 (file)
--- 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 03c0f10..6033d06 100644 (file)
--- 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 <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
@@ -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 <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