From a7c988589e2875950db85c0cc6cc34b721e018c2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 May 2011 13:26:48 +0200 Subject: [PATCH] fseek: Move AC_LIBOBJ invocations to module description. * m4/fseek.m4 (gl_REPLACE_FSEEK): Remove macro. (gl_FUNC_FSEEK): Inline it here. Move AC_LIBOBJ invocation from here... * modules/fseek (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/fseek.m4 | 11 ++--------- modules/fseek | 3 +++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b2559d7..2529a9514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-07 Bruno Haible + fseek: Move AC_LIBOBJ invocations to module description. + * m4/fseek.m4 (gl_REPLACE_FSEEK): Remove macro. + (gl_FUNC_FSEEK): Inline it here. Move AC_LIBOBJ invocation from here... + * modules/fseek (configure.ac): ... to here. + +2011-05-07 Bruno Haible + fseek: Respect rules for use of AC_LIBOBJ. * m4/fseeko.m4 (gl_FUNC_FSEEKO): Move gl_REPLACE_FSEEK invocation from here... diff --git a/m4/fseek.m4 b/m4/fseek.m4 index c5fffc222..135a22bdc 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,4 +1,4 @@ -# fseek.m4 serial 3 +# fseek.m4 serial 4 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,13 +10,6 @@ AC_DEFUN([gl_FUNC_FSEEK], AC_REQUIRE([gl_FUNC_FSEEKO]) dnl When fseeko needs fixes, fseek needs them too. if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then - gl_REPLACE_FSEEK + REPLACE_FSEEK=1 fi ]) - -AC_DEFUN([gl_REPLACE_FSEEK], -[ - AC_LIBOBJ([fseek]) - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - REPLACE_FSEEK=1 -]) diff --git a/modules/fseek b/modules/fseek index 98c6d3f57..ef0d4bb8d 100644 --- a/modules/fseek +++ b/modules/fseek @@ -11,6 +11,9 @@ fseeko [test $REPLACE_FSEEK = 1] configure.ac: gl_FUNC_FSEEK +if test $REPLACE_FSEEK = 1; then + AC_LIBOBJ([fseek]) +fi gl_STDIO_MODULE_INDICATOR([fseek]) Makefile.am: -- 2.11.0