From bc61151f00956ced91fb479bf9aa719d96bcbedc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 17 Apr 2021 17:17:06 +0200 Subject: [PATCH] stdio: Fix build error in some configurations (regression 2021-04-11). * m4/stdio_h.m4 (gl_STDIO_H): Move gl_STDIO_MODULE_INDICATOR and gl_MODULE_INDICATOR invocations from here... * modules/stdio (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/stdio_h.m4 | 25 +------------------------ modules/stdio | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452fe94b59..1e4c95524a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-04-17 Bruno Haible + + stdio: Fix build error in some configurations (regression 2021-04-11). + * m4/stdio_h.m4 (gl_STDIO_H): Move gl_STDIO_MODULE_INDICATOR and + gl_MODULE_INDICATOR invocations from here... + * modules/stdio (configure.ac): ... to here. + 2021-04-17 Bruno Haible doc: Update for FreeBSD 11.0, 12.0, 13.0. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 6846ca6ed9..d9820e4754 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 54 +# stdio_h.m4 serial 55 dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -40,17 +40,6 @@ AC_DEFUN_ONCE([gl_STDIO_H], attribute "__gnu_printf__" instead of "__printf__"]) fi - dnl No need to create extra modules for these functions. Everyone who uses - dnl likely needs them. - gl_STDIO_MODULE_INDICATOR([fscanf]) - gl_MODULE_INDICATOR([fscanf]) - gl_STDIO_MODULE_INDICATOR([scanf]) - gl_MODULE_INDICATOR([scanf]) - gl_STDIO_MODULE_INDICATOR([fgetc]) - gl_STDIO_MODULE_INDICATOR([getc]) - gl_STDIO_MODULE_INDICATOR([getchar]) - gl_STDIO_MODULE_INDICATOR([fgets]) - gl_STDIO_MODULE_INDICATOR([fread]) dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" dnl "expected source file, required through AC_LIBSOURCES, not found". It is dnl also an optimization, to avoid performing a configure check whose result @@ -64,18 +53,6 @@ AC_DEFUN_ONCE([gl_STDIO_H], fi ]) - dnl No need to create extra modules for these functions. Everyone who uses - dnl likely needs them. - gl_STDIO_MODULE_INDICATOR([fprintf]) - gl_STDIO_MODULE_INDICATOR([printf]) - gl_STDIO_MODULE_INDICATOR([vfprintf]) - gl_STDIO_MODULE_INDICATOR([vprintf]) - gl_STDIO_MODULE_INDICATOR([fputc]) - gl_STDIO_MODULE_INDICATOR([putc]) - gl_STDIO_MODULE_INDICATOR([putchar]) - gl_STDIO_MODULE_INDICATOR([fputs]) - gl_STDIO_MODULE_INDICATOR([puts]) - gl_STDIO_MODULE_INDICATOR([fwrite]) dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" dnl "expected source file, required through AC_LIBSOURCES, not found". It is dnl also an optimization, to avoid performing a configure check whose result diff --git a/modules/stdio b/modules/stdio index 18c24d71d1..e13b689375 100644 --- a/modules/stdio +++ b/modules/stdio @@ -19,6 +19,31 @@ configure.ac: gl_STDIO_H gl_STDIO_H_REQUIRE_DEFAULTS +dnl No need to create extra modules for these functions. Everyone who uses +dnl likely needs them. +gl_STDIO_MODULE_INDICATOR([fscanf]) +gl_MODULE_INDICATOR([fscanf]) +gl_STDIO_MODULE_INDICATOR([scanf]) +gl_MODULE_INDICATOR([scanf]) +gl_STDIO_MODULE_INDICATOR([fgetc]) +gl_STDIO_MODULE_INDICATOR([getc]) +gl_STDIO_MODULE_INDICATOR([getchar]) +gl_STDIO_MODULE_INDICATOR([fgets]) +gl_STDIO_MODULE_INDICATOR([fread]) + +dnl No need to create extra modules for these functions. Everyone who uses +dnl likely needs them. +gl_STDIO_MODULE_INDICATOR([fprintf]) +gl_STDIO_MODULE_INDICATOR([printf]) +gl_STDIO_MODULE_INDICATOR([vfprintf]) +gl_STDIO_MODULE_INDICATOR([vprintf]) +gl_STDIO_MODULE_INDICATOR([fputc]) +gl_STDIO_MODULE_INDICATOR([putc]) +gl_STDIO_MODULE_INDICATOR([putchar]) +gl_STDIO_MODULE_INDICATOR([fputs]) +gl_STDIO_MODULE_INDICATOR([puts]) +gl_STDIO_MODULE_INDICATOR([fwrite]) + Makefile.am: BUILT_SOURCES += stdio.h -- 2.39.5