From 960ca7460bd00878ac7889055f3f1fae2db0dde7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 May 2011 13:30:25 +0200 Subject: [PATCH] fseeko: Simplify. * m4/fseeko.m4 (gl_HAVE_FSEEKO): Remove macro. (gl_FUNC_FSEEKO): Inline it here. --- ChangeLog | 6 ++++++ m4/fseeko.m4 | 31 ++++++++++++------------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2529a9514..21c341f2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-07 Bruno Haible + fseeko: Simplify. + * m4/fseeko.m4 (gl_HAVE_FSEEKO): Remove macro. + (gl_FUNC_FSEEKO): Inline it here. + +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... diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index 0e2836f53..391948d4e 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,4 +1,4 @@ -# fseeko.m4 serial 14 +# fseeko.m4 serial 15 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, @@ -7,8 +7,18 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FSEEKO], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AC_REQUIRE([gl_HAVE_FSEEKO]) AC_REQUIRE([gl_STDIN_LARGE_OFFSET]) + AC_REQUIRE([AC_PROG_CC]) + + dnl Persuade glibc to declare fseeko(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CACHE_CHECK([for fseeko], [gl_cv_func_fseeko], + [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +]], [fseeko (stdin, 0, 0);])], + [gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no]) + ]) AC_CHECK_DECLS_ONCE([fseeko]) if test $ac_cv_have_decl_fseeko = no; then @@ -30,23 +40,6 @@ AC_DEFUN([gl_FUNC_FSEEKO], fi ]) -dnl Tests whether fseeko is available. -dnl Result is gl_cv_func_fseeko. -AC_DEFUN([gl_HAVE_FSEEKO], -[ - AC_REQUIRE([AC_PROG_CC]) - - dnl Persuade glibc to declare fseeko(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - - AC_CACHE_CHECK([for fseeko], [gl_cv_func_fseeko], - [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -]], [fseeko (stdin, 0, 0);])], - [gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no]) - ]) -]) - dnl Code shared by fseeko and ftello. Determine if large files are supported, dnl but stdin does not start as a large file by default. AC_DEFUN([gl_STDIN_LARGE_OFFSET], -- 2.11.0