>From af976e7799ddeabba5e2ec18dcb2339c8b11f5a7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 9 Jan 2022 15:40:14 +0100 Subject: [PATCH 1/3] fchdir: Move AC_LIBOBJ invocation to the module description. * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke AC_LIBOBJ and gl_PREREQ_FCHDIR. * modules/fchdir (configure.ac): Invoke AC_LIBOBJ and gl_PREREQ_FCHDIR. --- ChangeLog | 7 +++++++ m4/fchdir.m4 | 4 +--- modules/fchdir | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e330c90f70..b8b0b0fc3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-01-09 Bruno Haible + + fchdir: Move AC_LIBOBJ invocation to the module description. + * m4/fchdir.m4 (gl_FUNC_FCHDIR): Don't invoke AC_LIBOBJ and + gl_PREREQ_FCHDIR. + * modules/fchdir (configure.ac): Invoke AC_LIBOBJ and gl_PREREQ_FCHDIR. + 2022-01-09 Bruno Haible Remove influence of Automake conditionals on conditional dependencies. diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index ae5e1d3361..f85549a3ed 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,4 +1,4 @@ -# fchdir.m4 serial 26 +# fchdir.m4 serial 27 dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,8 +17,6 @@ AC_DEFUN([gl_FUNC_FCHDIR], AC_REQUIRE([gl_TEST_FCHDIR]) if test $HAVE_FCHDIR = 0; then - AC_LIBOBJ([fchdir]) - gl_PREREQ_FCHDIR AC_DEFINE([REPLACE_FCHDIR], [1], [Define to 1 if gnulib's fchdir() replacement is used.]) dnl We must also replace anything that can manipulate a directory fd, diff --git a/modules/fchdir b/modules/fchdir index e58c73523a..967e648b06 100644 --- a/modules/fchdir +++ b/modules/fchdir @@ -30,6 +30,10 @@ sys_stat [test $HAVE_FCHDIR = 0] configure.ac: gl_FUNC_FCHDIR +if test $HAVE_FCHDIR = 0; then + AC_LIBOBJ([fchdir]) + gl_PREREQ_FCHDIR +fi gl_UNISTD_MODULE_INDICATOR([fchdir]) Makefile.am: -- 2.25.1