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 077a656..0b39ccc 100644 (file)
--- 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 b5a9aad..6a1951d 100644 (file)
--- 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