From 7f7e77da36ef75b226431d1ae778b383edb17193 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 May 2011 13:37:56 +0200 Subject: [PATCH] ftello: Respect rules for use of AC_LIBOBJ. * m4/ftello.m4 (gl_REPLACE_FTELLO): Remove macro. (gl_FUNC_FTELLO): Inline it here. Move AC_LIBOBJ invocation from here... * modules/ftello (configure.ac): ... to here. --- ChangeLog | 8 ++++++++ m4/ftello.m4 | 10 +--------- modules/ftello | 3 +++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21c341f2d..c90803333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-07 Bruno Haible + ftello: Respect rules for use of AC_LIBOBJ. + * m4/ftello.m4 (gl_REPLACE_FTELLO): Remove macro. + (gl_FUNC_FTELLO): Inline it here. Move AC_LIBOBJ invocation from + here... + * modules/ftello (configure.ac): ... to here. + +2011-05-07 Bruno Haible + fseeko: Simplify. * m4/fseeko.m4 (gl_HAVE_FSEEKO): Remove macro. (gl_FUNC_FSEEKO): Inline it here. diff --git a/m4/ftello.m4 b/m4/ftello.m4 index 599f8f204..10cf4291b 100644 --- a/m4/ftello.m4 +++ b/m4/ftello.m4 @@ -1,4 +1,4 @@ -# ftello.m4 serial 9 +# ftello.m4 serial 10 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, @@ -124,12 +124,4 @@ main (void) esac fi fi - if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then - gl_REPLACE_FTELLO - fi -]) - -AC_DEFUN([gl_REPLACE_FTELLO], -[ - AC_LIBOBJ([ftello]) ]) diff --git a/modules/ftello b/modules/ftello index b042e8480..6cce8470e 100644 --- a/modules/ftello +++ b/modules/ftello @@ -17,6 +17,9 @@ AC_REQUIRE([AC_FUNC_FSEEKO]) configure.ac: gl_FUNC_FTELLO +if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then + AC_LIBOBJ([ftello]) +fi gl_STDIO_MODULE_INDICATOR([ftello]) Makefile.am: -- 2.11.0