From 42ab7ef4e702ddd3493cf6f2dfbf8db55fca3341 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 6 Dec 2007 16:49:19 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ m4/acl.m4 | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 077a6561a..0b39cccc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-06 Jim Meyering + + 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 Make scripts executable. diff --git a/m4/acl.m4 b/m4/acl.m4 index b5a9aad51..6a1951d3c 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 -- 2.11.0