From 8866a241ddbf4a459347b7147e325f539e4c07fe Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 14 Oct 2013 14:25:06 -0700
Subject: [PATCH] acl: allow cross-compilation to Gentoo

Problem reported by Gabriel Marcano in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-10/msg00058.html>.
* m4/acl.m4 (gl_ACL_GET_FILE): When cross-compiling,
test only whether it links.
---
 ChangeLog |  8 ++++++++
 m4/acl.m4 | 21 ++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad2b14148..c70f1fed8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	acl: allow cross-compilation to Gentoo
+	Problem reported by Gabriel Marcano in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-10/msg00058.html>.
+	* m4/acl.m4 (gl_ACL_GET_FILE): When cross-compiling,
+	test only whether it links.
+
 2013-10-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	mgetgroups: remove dependency on realloc-gnu
diff --git a/m4/acl.m4 b/m4/acl.m4
index 5b1fb65e6..24b6e4969 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 15
+# serial 16
 
 # Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -141,12 +141,14 @@ int type = ACL_TYPE_EXTENDED;]])],
 # -------------------------------------
 # If 'acl_get_file' works (does not have a particular bug),
 # run IF-WORKS, otherwise, IF-NOT.
-# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL,
-# but sets errno = ENOENT for an existing file or directory.
+# When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file
+# returns NULL, but sets errno = ENOENT for an existing file or directory.
+# When cross-compiling, assume that this old bug no longer applies.
 AC_DEFUN([gl_ACL_GET_FILE],
 [
   AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
-    [AC_RUN_IFELSE(
+    [gl_cv_func_working_acl_get_file=no
+     AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>
            #include <sys/acl.h>
@@ -156,9 +158,10 @@ AC_DEFUN([gl_ACL_GET_FILE],
               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])])
-
-  AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
+       [if test $cross_compiling = yes; then
+          gl_cv_func_working_acl_get_file="guessing yes"
+        elif ./conftest$ac_exeext; then
+          gl_cv_func_working_acl_get_file=yes
+        fi])])
+  AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2])
 ])
-- 
2.11.0