# HG changeset patch # User Bruno Haible # Date 1320801301 -3600 # Node ID d0e219cc1e4388f42c30d5d3fe1a268c9974bec8 # Parent 50cb94005daaebf1761cf57792a178452114b6dd faccessat: Move AC_LIBOBJ invocation to module description. * m4/faccessat.m4 (gl_PREREQ_FACCESSAT): New macro. (gl_FUNC_FACESSAT): Don't test for access() here. Move AC_LIBOBJ invocation from here... * modules/faccessat (configure.ac): ... to here. Invoke gl_PREREQ_FACCESSAT. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-11-08 Bruno Haible + + faccessat: Move AC_LIBOBJ invocation to module description. + * m4/faccessat.m4 (gl_PREREQ_FACCESSAT): New macro. + (gl_FUNC_FACESSAT): Don't test for access() here. Move AC_LIBOBJ + invocation from here... + * modules/faccessat (configure.ac): ... to here. Invoke + gl_PREREQ_FACCESSAT. + 2011-11-08 Bruno Haible faccessat: Simplify autoconf macro. diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,4 +1,4 @@ -# serial 4 +# serial 5 # See if we need to provide faccessat replacement. dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. @@ -11,11 +11,18 @@ AC_DEFUN([gl_FUNC_FACCESSAT], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare faccessat(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([access]) + AC_CHECK_FUNCS_ONCE([faccessat]) if test $ac_cv_func_faccessat = no; then HAVE_FACCESSAT=0 - AC_LIBOBJ([faccessat]) fi ]) + +# Prerequisites of lib/faccessat.m4. +AC_DEFUN([gl_PREREQ_FACCESSAT], +[ + AC_CHECK_FUNCS_ONCE([access]) +]) diff --git a/modules/faccessat b/modules/faccessat --- a/modules/faccessat +++ b/modules/faccessat @@ -21,6 +21,10 @@ configure.ac: gl_FUNC_FACCESSAT +if test $HAVE_FACCESSAT = 0; then + AC_LIBOBJ([faccessat]) + gl_PREREQ_FACCESSAT +fi gl_MODULE_INDICATOR([faccessat]) gl_UNISTD_MODULE_INDICATOR([faccessat])