>From ff028b4093b396029978a39d30137ab5ac91926f Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 9 Jan 2022 15:40:18 +0100
Subject: [PATCH 2/3] stdio: Move AC_LIBOBJ invocations to the module
 description.

* m4/stdio_h.m4 (gl_STDIO_H): Don't invoke AC_LIBOBJ.
* modules/stdio (configure.ac): Invoke AC_LIBOBJ here.
---
 ChangeLog     | 6 ++++++
 m4/stdio_h.m4 | 5 +----
 modules/stdio | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8b0b0fc3b..2397dd79b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-09  Bruno Haible  <bruno@clisp.org>
+
+	stdio: Move AC_LIBOBJ invocations to the module description.
+	* m4/stdio_h.m4 (gl_STDIO_H): Don't invoke AC_LIBOBJ.
+	* modules/stdio (configure.ac): Invoke AC_LIBOBJ here.
+
 2022-01-09  Bruno Haible  <bruno@clisp.org>
 
 	fchdir: Move AC_LIBOBJ invocation to the module description.
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index cc80e77365..09f56be544 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 57
+# stdio_h.m4 serial 58
 dnl Copyright (C) 2007-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,
@@ -49,7 +49,6 @@ AC_DEFUN_ONCE([gl_STDIO_H],
     gl_NONBLOCKING_IO
     if test $gl_cv_have_nonblocking != yes; then
       REPLACE_STDIO_READ_FUNCS=1
-      AC_LIBOBJ([stdio-read])
     fi
   ])
 
@@ -62,7 +61,6 @@ AC_DEFUN_ONCE([gl_STDIO_H],
     gl_SIGNAL_SIGPIPE
     if test $gl_cv_header_signal_h_SIGPIPE != yes; then
       REPLACE_STDIO_WRITE_FUNCS=1
-      AC_LIBOBJ([stdio-write])
     fi
   ])
   dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c"
@@ -74,7 +72,6 @@ AC_DEFUN_ONCE([gl_STDIO_H],
     gl_NONBLOCKING_IO
     if test $gl_cv_have_nonblocking != yes; then
       REPLACE_STDIO_WRITE_FUNCS=1
-      AC_LIBOBJ([stdio-write])
     fi
   ])
 
diff --git a/modules/stdio b/modules/stdio
index 0f250558dc..61b89e0c86 100644
--- a/modules/stdio
+++ b/modules/stdio
@@ -20,6 +20,12 @@ configure.ac:
 gl_STDIO_H
 gl_STDIO_H_REQUIRE_DEFAULTS
 AC_PROG_MKDIR_P
+if test $REPLACE_STDIO_READ_FUNCS = 1; then
+  AC_LIBOBJ([stdio-read])
+fi
+if test $REPLACE_STDIO_WRITE_FUNCS = 1; then
+  AC_LIBOBJ([stdio-write])
+fi
 
 dnl No need to create extra modules for these functions. Everyone who uses
 dnl <stdio.h> likely needs them.
-- 
2.25.1