From a3a01d04e02e926c59ec17e1bb30bc99193f1166 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 May 2011 13:23:50 +0200 Subject: [PATCH] fseek: Respect rules for use of AC_LIBOBJ. * m4/fseeko.m4 (gl_FUNC_FSEEKO): Move gl_REPLACE_FSEEK invocation from here... * m4/fseek.m4 (gl_FUNC_FSEEK): ... to here. --- ChangeLog | 7 +++++++ m4/fseek.m4 | 6 ++++-- m4/fseeko.m4 | 6 +----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26333bf24..12b2559d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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... + * m4/fseek.m4 (gl_FUNC_FSEEK): ... to here. + +2011-05-07 Bruno Haible + fseeko: Respect rules for use of AC_LIBOBJ. * m4/fseeko.m4 (gl_REPLACE_FSEEKO): Remove macro. (gl_FUNC_FSEEKO): Inline it here. Move AC_LIBOBJ invocation from diff --git a/m4/fseek.m4 b/m4/fseek.m4 index 23ed7a9fc..c5fffc222 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,4 +1,4 @@ -# fseek.m4 serial 2 +# fseek.m4 serial 3 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, @@ -9,7 +9,9 @@ AC_DEFUN([gl_FUNC_FSEEK], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_FSEEKO]) dnl When fseeko needs fixes, fseek needs them too. - dnl gl_FUNC_FSEEKO takes care of calling gl_REPLACE_FSEEK + if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then + gl_REPLACE_FSEEK + fi ]) AC_DEFUN([gl_REPLACE_FSEEK], diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index b7d53c932..0e2836f53 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,4 +1,4 @@ -# fseeko.m4 serial 13 +# fseeko.m4 serial 14 dnl Copyright (C) 2007-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, @@ -28,10 +28,6 @@ AC_DEFUN([gl_FUNC_FSEEKO], fi ]) fi - if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then - dnl If we are also using the fseek module, then fseek needs replacing, too. - m4_ifdef([gl_REPLACE_FSEEK], [gl_REPLACE_FSEEK]) - fi ]) dnl Tests whether fseeko is available. -- 2.11.0