From: Jim Meyering <meyering@redhat.com>
Date: Thu, 6 Dec 2007 15:49:19 +0000 (+0100)
Subject: Avoid a configure-time syntax error in gl_FUNC_ACL.
X-Git-Tag: v0.1~7941
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=42ab7ef4e702ddd3493cf6f2dfbf8db55fca3341;p=gnulib.git

Avoid a configure-time syntax error in gl_FUNC_ACL.

* m4/acl.m4 (gl_FUNC_ACL): Be careful to check for the acl_trivial
function in each branch, before testing the cache variable.
---

diff --git a/ChangeLog b/ChangeLog
index 077a6561ab..0b39cccc2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-06  Jim Meyering  <meyering@redhat.com>
+
+	Avoid a configure-time syntax error in gl_FUNC_ACL.
+	* m4/acl.m4 (gl_FUNC_ACL): Be careful to check for the acl_trivial
+	function in each branch, before testing the cache variable.
+
 2007-12-04  Eric Blake  <ebb9@byu.net>
 
 	Make scripts executable.
diff --git a/m4/acl.m4 b/m4/acl.m4
index b5a9aad515..6a1951d3c9 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -24,7 +24,8 @@ AC_DEFUN([gl_FUNC_ACL],
       [test "$ac_cv_search_acl_trivial" = "none required" ||
        LIB_ACL=$ac_cv_search_acl_trivial
        AC_CHECK_FUNCS([acl_trivial])],
-      [if test $ac_cv_func_acl_trivial != yes; then
+      [AC_CHECK_FUNCS([acl_trivial])
+       if test $ac_cv_func_acl_trivial != yes; then
 	 AC_SEARCH_LIBS([acl_get_file], [acl],
 	   [test "$ac_cv_search_acl_get_file" = "none required" ||
 	    LIB_ACL=$ac_cv_search_acl_get_file